navbar stuff
more navbar changes
navbar almost complete