Fixing some oversights in the merge
Fixed font styling.