tidy up of layout