Updated navigation bar
Merge origin/master