Various style fixes
Merge branch 'pr-3' into alloyeditor.com