more fixes to layout