Add main_navbar to some views
Merge branch 'dev2' into dev