reformat djstripe template and other tweaks