Some fixes to layout