Clean up layouts

This is a bit of a reset, I've removed some of the menu and layouts to clean them back to basics so I can take another look at how I want them to work.