refactoring navbar directives and gulp task adjusts