Lots of layout tweaks