Updating some minor styles
Merge branch 'develop'