Fixing up some of the menu links and splitting out locations into an anonymous and manager version.