I finally got this to work for me but had to move where I put things.
The first part of the code had to go under <div class="buttons-row"> not <div class="buttons-row nopad">
Then for the price I had to swith this to just after {elseif $is_matrix_view}
Everything works great now.
Thanks for all your work on theis one Gregory.