fixes to layout