change menus
Merge pull request #49 from theodi/fix-navigation

change menus