Navbar Regrouping

Layout change. Slightly more intuitive menu structure. Adds a few links we've had to remember or search the code for.