tidy up text + layout