Tidy up some more layouts