Admin navigation

Admin navigation and a whole boatload of related issues.