minor change to navbar and edit view
Merge pull request #16 from edouardpo/minor-changes-to-navbar-and-edit-view

minor change to navbar and edit view
solved conflicts for merginf to master