Fixes to layout and stuff