Added global padding helpers, updated templates
Grr.