changes to navbar
code organized