general fixes to layout