Address form

I have the usual address form on the checkout page. I have edited some fields, some were not needed and some needed some change.
When I click on the edit-button (front-end) I can see all my edited fields in the correct way. But they are not showing on the checkout page. I must have missed to change something?
It is the same problem with the order e-mail, here I don't see all fields, just the ones I didn't edit.....

So, popup whos all fields
E-mail and checkout page only shows two fields. Any suggestions?

Hi,

Can you give us a screenshot of your fields configuration ?

Are you using Joomla 2.5 or 3.x ?

Joomla 3.0

Here I want the same fields in the same ordering. Yellow marked is what I want in red marking!

Thanks, I think I was looking in another file, this was easy to change when I found the right file