removed extra divider in navbar to save space
Merge branch 'develop' into testing