Started refactoring to better handle multiple menus
More refactoring for multiple menus