navbar changes
Merge branch 'final_updates' of https://github.com/pazzissima/wdi-group-project into pazzissima-final_updates