diff --git a/code/model/editableformfields/EditableCheckboxGroupField.php b/code/model/editableformfields/EditableCheckboxGroupField.php
index 4e5bdd2..c7a6d45 100755
--- a/code/model/editableformfields/EditableCheckboxGroupField.php
+++ b/code/model/editableformfields/EditableCheckboxGroupField.php
@@ -15,7 +15,7 @@ class EditableCheckboxGroupField extends EditableMultipleOptionField {
 	
 	public function getFormField() {
 		$field = new UserFormsCheckboxSetField($this->Name, $this->EscapedTitle, $this->getOptionsMap());
-		$field->setTemplate('forms/UserFormsCheckboxSetField');
+		$field->setFieldHolderTemplate('UserFormsMultipleOptionField_holder');
 
 		// Set the default checked items
 		$defaultCheckedItems = $this->getDefaultOptions();
diff --git a/code/model/editableformfields/EditableRadioField.php b/code/model/editableformfields/EditableRadioField.php
index bbfa1eb..8fc936d 100755
--- a/code/model/editableformfields/EditableRadioField.php
+++ b/code/model/editableformfields/EditableRadioField.php
@@ -26,6 +26,7 @@ class EditableRadioField extends EditableMultipleOptionField {
 	
 	public function getFormField() {
 		$field = OptionsetField::create($this->Name, $this->EscapedTitle, $this->getOptionsMap());
+		$field->setFieldHolderTemplate('UserFormsMultipleOptionField_holder');
 
 		// Set default item
 		$defaultOption = $this->getDefaultOptions()->first();
diff --git a/templates/UserFormsMultipleOptionField_holder.ss b/templates/UserFormsMultipleOptionField_holder.ss
new file mode 100644
index 0000000..9f90702
--- /dev/null
+++ b/templates/UserFormsMultipleOptionField_holder.ss
@@ -0,0 +1,17 @@
+<fieldset id="$Name" class="field<% if $extraClass %> $extraClass<% end_if %>">
+	<% if $Title %><legend class="left">$Title</legend><% end_if %>
+
+	<div class="middleColumn">
+		$Field
+	</div>
+
+	<% if $RightTitle %>
+	<aside class="right" role="complementary">
+		<p>$RightTitle</p>
+	</aside>
+	<% end_if %>
+
+	<% if $Message %><span class="message $MessageType">$Message</span><% end_if %>
+
+	<% if $Description %><span class="description">$Description</span><% end_if %>
+</fieldset>