More fixes to layout