further work on menu items
refactoring