replaced ng-include for orig navbar with navbar element in remaining views, updated navbar controller