fixed navbar
futher work on navbar, should be finished?
Merge branch 'dev' of github.com:GUTeamU/DIM3 into dev