Made navbar a bit more MVC and DRY.
ok