Final fixes to layout