Further Navbar Fixes, finally got the mark-up set up properly