adjusted layout to address fields