Fix padding
Fix tagged heading border color
A little less noisy commenting
Merge branch 'dev' into stage
Merge branch 'stage'