refactored JMenus