Improvements to customer end forms.

Little bit hacky at this stage, but I'll clean it up later.