starting to refactor templates
refactored the templates in delivery so they extend the delivery_base