Tidy up the screens that are easy to do