Further tidy-up of the top area of the main screen.