closes #21 refactored menus