More Navigation Changes

More changes to the menu structure