refactoring. added menus