Tweak the layout to display all fields