tidy up some layout