Fix and tidy up main menu screen