Correct naming for delivery date, and minor style fixes

* AFAIK, Oscar doesn't have functionality for delivery dates. Changed
  the wording to be consistent with the field name and wording in other
  templates.
* Line length fixes
* Refactored imports