Navbar Edits

A few navbar edits, we'll need more before it's perfect.