A bit more structural cleanup to add a bit of left and right padding.
Merge branch 'source'