Cleaned up code, started OOP conversion of Navbar.