Changes for Menu interface refacvtoring
Merge pull request #178 from dantleech/menu-interface

[WIP] Changes for Menu interface refactoring