More Navbar Changes

Edited the flow of the navbar a bit more. Changed the categories to
make the navbar flow more efficiently.