fixing up some of the navbar styling
merging