adjustments in templates/forms/models