Tidied up main menu