navbar in a separate file
Merge origin/master