Freeform cart v4

Reformatting changes.
Actually, those are there to make it play well with the JS template stuff. It needs the second %