Tidy up and fix layout on start