more work on navbar
more work on navbar