Refactored menu to a better naming scheme