updated navbar
Merge branch 'master' of https://github.com/halibegic/Merlin