diff --git a/app/templates/SilverStripe/UserForms/Model/EditableFormField/EditableFormField_holder.ss b/app/templates/SilverStripe/UserForms/Model/EditableFormField/EditableFormField_holder.ss
new file mode 100644
index 0000000..a2f2c49
--- /dev/null
+++ b/app/templates/SilverStripe/UserForms/Model/EditableFormField/EditableFormField_holder.ss
@@ -0,0 +1,16 @@
+<div id="$Name" class="form__field field<% if $extraClass %> $extraClass<% end_if %>">
+	<% if $Title %><label class="field__label field__label-left left" for="$ID">$Title</label><% end_if %>
+
+	<div class="field__content middleColumn">
+		$Field
+	</div>
+
+	<% if $Title && $RightTitle %>
+		<div class="field__label field__label-right right">$RightTitle</div>
+	<% else_if $RightTitle %>
+		<label class="field__label field__label-right right" for="$ID">$RightTitle</label>
+	<% end_if %>
+
+	<% if $Message %><span class="field__alert alert alert-{$MessageType} message $MessageType">$Message</span><% end_if %>
+	<% if $Description %><span class="field__description description">$Description</span><% end_if %>
+</div>
diff --git a/app/templates/SilverStripe/UserForms/Model/EditableFormField/EditableTextareaField.ss b/app/templates/SilverStripe/UserForms/Model/EditableFormField/EditableTextareaField.ss
new file mode 100644
index 0000000..968e1d1
--- /dev/null
+++ b/app/templates/SilverStripe/UserForms/Model/EditableFormField/EditableTextareaField.ss
@@ -0,0 +1,4 @@
+<textarea $AttributesHTML
+	<% if $RightTitle %>aria-describedby="{$Name}_right_title"<% end_if %>
+	placeholder="<% if $Placeholder %>{$Placeholder}<% else %>{$Title}<% end_if %>"
+>$Value</textarea>