Menu item refactoring and using it in main menu