Navbar and modals fix

Rewrote navbar from the ground up