Different layout Invoice and order, invoice number

[Bensquest]

I am trying to change the layout for the invoice. I know where to find the files ( /shop/components/com_virtuemart/views/invoice/tmpl) and was able to change the layout for the printed invoice (the print icon in the backend  orders list). When selecting the two other icons eg orders the layout will be the old one. So nothing changes there. Placing a new order and send a test to a test customer shows the invoice with the wrong layout.
What is going on? I saw that allready made invoices are saved.

Another problem is that my invoice will not show the invoice number but the order does. Can someone tell me how to put this in the code?

Help will be very appriciated.