Fixes several styling issues
Merge pull request #115 from lukecampbell/154x-r2

OOIION-1540 OOIION-1541 Fixes several styling issues