Reorganize main menu a bit