SugarCRM 5.5.0, Leads > Edit: address doesn't match layout

[tierndog]

SugarCRM 5.5.0 Community Edition

I changed the layout for the Edit screen under Leads, and the address section doesn't look anything like what I specified. I'm getting duplicate lines.

How my address layout looks (note that I edited the labels);

Street | Alt Street
City | Alt City
State | Alt State
Postcode | Alt Postcode
Country | Alt Country

Here's what's showing up:

Primary Address | Other Address
City | Alt City
State | Alt State
Postcode | Alt Postcode
Country | Alt Country
City | Alt City
State | Alt State
Postcode | Alt Postcode
Country | Alt Country

The last four lines are tabbed over to the right. What's up with the duplication and tabbing?

[nemesuisse]

There's something wrong with addresses (SugarCRM 5.5.0 CE too).

I tried to modify contacts edit/view panels and it seems that the field "Primary Address" creates an aggregation of "Primary Address street", "Primary Address city", "Primary Address state", "Primary Address postal code" and "Primary Address country". In this order.