Delivery/billing addresses problem

[czaska]

Hello, so i'm fighting with this problem for 2 days already,

after custmizing authentication.tpl file to the form i want to "print" in later orders and on invoice, i have a problem with proper address showing.

 

Soo, after my adjustements it looks like this:

So there is a part for single customer and additional part for companies with company  name, VAT number etc.

as you can see in next step after accepting those addresses, this is what i get:

 

even though i deleted from authentication.tpl labels for name and lastname, i'm still getting name and lastname printed above the address. And then what's even worse, the name of company stopped to be there in billing address even if it's still filled in form.

This is how my address fom looks like:

and in both addresses there is somthing wrong....

Can anyone help me/give m tips how to:

in delivery address leave name, lastname, adress and number

and in billing invoice: company, address, vat number, number

it's really important form me on this step when my shop  is almost done, so any help would be awesome :C of course if there is a need, i can post authentication file so someone can take a quick look where is a problem.

 

Thank you in advance!!!