A few more navbar enhancements and cleanups