Navigation Bar Changed also  settings menu
Merge branch 'navbar'