Lots of layout updates

Yay!