diff --git a/app/src/Extensions/CompositeFieldExtension.php b/app/src/Extensions/CompositeFieldExtension.php
index b29797b..f0b8313 100644
--- a/app/src/Extensions/CompositeFieldExtension.php
+++ b/app/src/Extensions/CompositeFieldExtension.php
@@ -11,10 +11,16 @@ use SilverStripe\ORM\DataExtension;
 
 class CompositeFieldExtension extends CompositeField
 {
+    public function extraClass()
+    {
+        return 'composite '.parent::extraClass();
+    }
+
     public function getAttributes()
     {
         $attrs = parent::getAttributes();
         unset($attrs['name'], $attrs['type'], $attrs['disabled'], $attrs['readonly'], $attrs['autofocus']);
+
         return $attrs;
     }
 }
diff --git a/app/templates/SilverStripe/Forms/CompositeField_holder.ss b/app/templates/SilverStripe/Forms/CompositeField_holder.ss
new file mode 100644
index 0000000..59fb7a2
--- /dev/null
+++ b/app/templates/SilverStripe/Forms/CompositeField_holder.ss
@@ -0,0 +1,7 @@
+<$Tag $AttributesHTML>
+	<% if $Tag == 'fieldset' && $Legend %>
+		<legend>$Legend</legend>
+	<% end_if %>
+
+	$Field
+</$Tag>
diff --git a/app/templates/SilverStripe/Forms/FormField_holder.ss b/app/templates/SilverStripe/Forms/FormField_holder.ss
new file mode 100644
index 0000000..cd8b14e
--- /dev/null
+++ b/app/templates/SilverStripe/Forms/FormField_holder.ss
@@ -0,0 +1,16 @@
+<div id="$HolderID" class="field<% if $extraClass %> $extraClass<% end_if %>">
+	<% if $Title %><label class="left" for="$ID">$Title</label><% end_if %>
+
+	<div class="middleColumn">
+		$Field
+	</div>
+
+	<% if $Title && $RightTitle %>
+		<div class="right">$RightTitle</div>
+	<% else_if $RightTitle %>
+		<label class="right" for="$ID">$RightTitle</label>
+	<% end_if %>
+
+	<% if $Message %><span class="message $MessageType">$Message</span><% end_if %>
+	<% if $Description %><span class="description">$Description</span><% end_if %>
+</div>
diff --git a/app/templates/SilverStripe/Forms/Includes/Form.ss b/app/templates/SilverStripe/Forms/Includes/Form.ss
new file mode 100644
index 0000000..8515e46
--- /dev/null
+++ b/app/templates/SilverStripe/Forms/Includes/Form.ss
@@ -0,0 +1,27 @@
+<% if $IncludeFormTag %>
+<form $AttributesHTML>
+<% end_if %>
+	<% if $Message %>
+	<p id="{$FormName}_error" class="message $MessageType">$Message.RAW</p>
+	<% else %>
+	<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
+	<% end_if %>
+
+	<fieldset>
+		<% if $Legend %><legend>$Legend</legend><% end_if %>
+		<% loop $Fields %>
+			$FieldHolder
+		<% end_loop %>
+		<div class="clear"><!-- --></div>
+	</fieldset>
+
+	<% if $Actions %>
+	<div class="btn-toolbar">
+		<% loop $Actions %>
+			$Field
+		<% end_loop %>
+	</div>
+	<% end_if %>
+<% if $IncludeFormTag %>
+</form>
+<% end_if %>
diff --git a/app/templates/SilverStripe/Forms/OptionsetField_holder.ss b/app/templates/SilverStripe/Forms/OptionsetField_holder.ss
new file mode 100644
index 0000000..94c7ecf
--- /dev/null
+++ b/app/templates/SilverStripe/Forms/OptionsetField_holder.ss
@@ -0,0 +1,9 @@
+<div id="$HolderID" class="field<% if $extraClass %> $extraClass<% end_if %>">
+	<% if $Title %><div class="left">$Title</div><% end_if %>
+	<div class="middleColumn">
+		$Field
+	</div>
+	<% if $RightTitle %><div class="right">$RightTitle</div><% end_if %>
+	<% if $Message %><span class="message $MessageType">$Message</span><% end_if %>
+	<% if $Description %><span class="description">$Description</span><% end_if %>
+</div>
diff --git a/app/templates/Site/Widgets/BannerWidget.ss b/app/templates/Site/Widgets/BannerWidget.ss
index 8f85dda..dcccaaf 100644
--- a/app/templates/Site/Widgets/BannerWidget.ss
+++ b/app/templates/Site/Widgets/BannerWidget.ss
@@ -1,4 +1,4 @@
-<img src="$Image.Fill(432,324).URL" alt="$Title" />
+<img src="$Image.Fill(432,315).URL" alt="$Title" />
 <% if $Link %>
     <% with $Link %>
     <a href="$URL"<% if $OpenInNewWindow %> target="_blank"<% end_if %> class="stretched-link">