Menu Updates

This pull request reflects a patch submitted by @knowncitizen that includes menu fixes for easier navigation of non-organization based sections of the application.  There were broken spec tests that required a small fix on top of the patch.