Navbar Reorganization

Navbar reorganized so not everything is stacked in MORE. Still needs to be cleaned so that stylistically consistent, but functionality is about right.