Change menu and navigation to handle new menu layout
Merge pull request #332 from weissjeffm/new-menu

Change menu and navigation to handle new menu layout