Move navbar into separated directive
Merge branch 'NavigationDirective'