More refactoring in the templates.
More refactoring in the templates.

yorkulibraries/FedoraConnector,yorkulibraries/FedoraConnector,scholarslab/FedoraConnector,scholarslab/FedoraConnector,yorkulibraries/FedoraConnector,scholarslab/FedoraConnector