Small main menu improvements