Tidy up display and text