Tweak template to be slightly more consistent with spacing