Fix main menu choice prompt and validation checking