Fixed topnavbar directive to change based on current view
Fixed bug from previous commmit
Fixed linting