Cleaning up menus and adding menus to EDitZone