Formatting tweaks, fixes silverstripe/silverstripe-cms#641