Tidy up of display in line with UX review