refactored menu item stuff