Merge pull request #353 from mhotan/phase_4_dev

Updates to menu items and menus to actually work