Invoice Customization, removing a couple columns

[Danger]

Would like to customize how the invoice looks when viewed/printed out, see picture:


As you can see I highlighted the columns I want to remove in red. I would also like to move and have the tax total calculated under the subtotal.

I have looked at the invoice.php file and figure I can remove the columns I don't want easily enough, not sure how to change the column headings I want to keep though, nor how to move the tax subtotal to where I want it calculated.

I know I have the tax percent at 0.00% as we are not charging any tax... yet. I would like it ready though for when/if we actually make enough sales to have to charge taxes.

Help is greatly appreciated.

[Danger]

Bah, should have looked harder, I see that this has been at least partially answered in other threads.

[Danger]

After taking a look a a couple other threads on this same subject I was able to make the invoice appear exactly as I want it to... except I am not sure how to go about adding in the tax where I want it and have it calculated on the subtotal only.

Basically I want it to do 2 things, put the percentage after the word Tax and the total calculated tax amount.

So it would be:
Subtotal: $36.00
Tax (12%): $ 4.32
----------
Total: $40.32

[Danger]

Never mind, I am a complete and utter dumb . I just realized that the tax does appear exactly as I want it IF I enable the tax on a product.