diff --git a/admin/code/SecurityAdmin.php b/admin/code/SecurityAdmin.php
index d87831cb9..8b406a62c 100644
--- a/admin/code/SecurityAdmin.php
+++ b/admin/code/SecurityAdmin.php
@@ -111,7 +111,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		$memberList->setPermissions(array('edit', 'delete', 'add'));
 		
 		$fields = new FieldList(
-			new TabSet(
+			$root = new TabSet(
 				'Root',
 				new Tab('Members', singleton('Member')->i18n_plural_name(),
 					$memberList,
@@ -137,7 +137,9 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 			// necessary for tree node selection in LeftAndMain.EditForm.js
 			new HiddenField('ID', false, 0)
 		);
-
+		
+		$root->setTemplate('CMSTabSet');
+		
 		// Add roles editing interface
 		if(Permission::check('APPLY_ROLES')) {
 			$rolesCTF = new ComplexTableField(
diff --git a/admin/templates/Includes/LeftAndMain_EditForm.ss b/admin/templates/Includes/LeftAndMain_EditForm.ss
index 82602abaa..d1ce603c6 100644
--- a/admin/templates/Includes/LeftAndMain_EditForm.ss
+++ b/admin/templates/Includes/LeftAndMain_EditForm.ss
@@ -13,8 +13,8 @@
 						<li><a href="#$id">$Title</a></li>
 					<% end_control %>
 					</ul>
-					<% end_with %>
 				</div>
+				<% end_with %>
 			<% end_if %>
 	
 			<!-- <div class="cms-content-search">...</div> -->
@@ -40,7 +40,6 @@
 			<% end_control %>
 			<div class="clear"><!-- --></div>
 		</fieldset>
-	
 	</div>
 
 	<div class="cms-content-actions south">
diff --git a/admin/templates/Includes/SecurityAdmin_Content.ss b/admin/templates/Includes/SecurityAdmin_Content.ss
index b9317f895..67ef14449 100644
--- a/admin/templates/Includes/SecurityAdmin_Content.ss
+++ b/admin/templates/Includes/SecurityAdmin_Content.ss
@@ -1,38 +1,76 @@
 <div class="cms-content center $BaseCSSClasses" data-layout="{type: 'border'}">
-
-	<div class="cms-content-header north">
-		<div>
-			<h2><% _t('SECGROUPS','Security Groups') %></h2>
+	<div class="cms-content-tools west">
+		<div class="cms-content-header north">
+			<div>
+				<h2><% _t('SECGROUPS','Security Groups') %></h2>
+			</div>
 		</div>
+
+		$AddForm
+
+		<div class="checkboxAboveTree">
+			<input type="checkbox" id="sortitems" />
+			<label for="sortitems">
+				<% _t('ENABLEDRAGGING','Allow drag &amp; drop reordering', PR_HIGH) %>
+			</label>
+		</div>
+
+		<div data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" class="cms-tree jstree jstree-apple">
+			$SiteTreeAsUL
+		</div>
+
 	</div>
 
-
-	<div class="cms-content-tools west">
-
-		<div id="treepanes">
-
-			<div>
-				$AddForm
-
-				<div class="checkboxAboveTree">
-					<input type="checkbox" id="sortitems" />
-					<label for="sortitems">
-						<% _t('ENABLEDRAGGING','Allow drag &amp; drop reordering', PR_HIGH) %>
-					</label>
-				</div>
-
-				<div data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" class="cms-tree jstree jstree-apple">
-					$SiteTreeAsUL
-				</div>
-
+	<% with EditForm %>
+		<div class="cms-content-fields center ui-widget-content ss-tabset">
+	
+			<% if IncludeFormTag %>
+			<form $FormAttributes data-layout="{type: 'border'}">
+			<% end_if %>
+		
+			<div class="cms-content-header north">
+				<% if Fields.hasTabset %>
+					<% with Fields.fieldByName('Root') %>
+						<div class="cms-content-header-tabs">
+							<ul>
+							<% control Tabs %>
+								<li><a href="#$id">$Title</a></li>
+							<% end_control %>
+							</ul>
+						</div>
+					<% end_with %>
+				<% end_if %>
 			</div>
 
-		</div>
-		
-	</div>
+			<div class="cms-content-fields center">
+				<% if Message %>
+				<p id="{$FormName}_error" class="message $MessageType">$Message</p>
+				<% else %>
+				<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
+				<% end_if %>
 
-	<div class="cms-content-fields center ui-widget-content">
-		$EditForm
-	</div>
+				<fieldset>
+					<% if Legend %><legend>$Legend</legend><% end_if %> 
+					<% control Fields %>
+						$FieldHolder
+					<% end_control %>
+					<div class="clear"><!-- --></div>
+				</fieldset>
+			</div>
 	
+			<div class="cms-content-actions south">
+				<% if Actions %>
+				<div class="Actions">
+					<% control Actions %>
+						$Field
+					<% end_control %>
+				</div>
+				<% end_if %>
+			</div>
+	
+			<% if IncludeFormTag %>
+			</form>
+			<% end_if %>
+		</div>
+	<% end_with %>
 </div>
\ No newline at end of file
diff --git a/forms/TabSet.php b/forms/TabSet.php
index e7495863a..b722e2e61 100644
--- a/forms/TabSet.php
+++ b/forms/TabSet.php
@@ -153,5 +153,4 @@ class TabSet extends CompositeField {
 	public function removeByName( $tabName, $dataFieldOnly = false ) {
 		parent::removeByName( $tabName, $dataFieldOnly );
 	}
-}
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/view/SSViewer.php b/view/SSViewer.php
index 7de22b792..449de81a9 100644
--- a/view/SSViewer.php
+++ b/view/SSViewer.php
@@ -185,7 +185,6 @@ class SSViewer_DataPresenter extends SSViewer_Scope {
  *
  * @see http://doc.silverstripe.org/themes
  * @see http://doc.silverstripe.org/themes:developing
-
  * 
  * @package sapphire
  * @subpackage view