Hotfix for changed menus
Merge branch 'master' of github.com:rice-apps/servery-app