Small changes to font colors and spacing
Merge branch 'feature_115'