Updated navbar
Merge branch 'edit-navbar'