Updating nav bar in frontend
Merge branch 'devel' into frontend