Navbar fixes

I noticed the navbar didn't have some of my fixes. I don't know why they didn't push, but this should fix a few things.