Fixes several styling issues
Merge pull request #114 from lukecampbell/154x

OOIION-1540 OOIION-1541 Fixes several styling issues