added a missing less variable that reduces the navbar heights
minor style updates/merge conflict resolutions so style-branch has changes more consistent with master