diff --git a/templates/Includes/AssetAdmin_Content.ss b/templates/Includes/AssetAdmin_Content.ss
index f45b43ee..ae074571 100644
--- a/templates/Includes/AssetAdmin_Content.ss
+++ b/templates/Includes/AssetAdmin_Content.ss
@@ -1,21 +1,22 @@
 <div class="cms-content center ss-tabset" data-layout="{type: 'border'}">
 
 	<div class="cms-content-header north">
-		<h2><% _t('AssetAdmin.Title', 'Find &amp; Organize') %></h2>
-		<div class="cms-content-header-tabs">
-			<ul>
-				<li>
-					<a href="#cms-content-listview"><% _t('AssetAdmin.ListView', 'List View') %></a>
-				</li>
-				<li>
-					<a href="#cms-content-galleryview"><% _t('AssetAdmin.GalleryView', 'Gallery View') %></a>
-				</li>
-				<li>
-					<a href="#cms-content-treeview"><% _t('AssetAdmin.TreeView', 'Tree View') %></a>
-				</li>
-			</ul>
+		<div>
+			<h2><% _t('AssetAdmin.Title', 'Find &amp; Organize') %></h2>
+			<div class="cms-content-header-tabs">
+				<ul>
+					<li>
+						<a href="#cms-content-listview"><% _t('AssetAdmin.ListView', 'List View') %></a>
+					</li>
+					<li>
+						<a href="#cms-content-galleryview"><% _t('AssetAdmin.GalleryView', 'Gallery View') %></a>
+					</li>
+					<li>
+						<a href="#cms-content-treeview"><% _t('AssetAdmin.TreeView', 'Tree View') %></a>
+					</li>
+				</ul>
+			</div>
 		</div>
-
 	</div>
 
 
diff --git a/templates/Includes/CMSPagesController_Content.ss b/templates/Includes/CMSPagesController_Content.ss
index 407c5abf..57cd9d30 100644
--- a/templates/Includes/CMSPagesController_Content.ss
+++ b/templates/Includes/CMSPagesController_Content.ss
@@ -1,84 +1,57 @@
 <div class="cms-content center ss-tabset" data-layout="{type: 'border'}">
 
 	<div class="cms-content-header north">
-		<h2><% _t('CMSPagesController.Title','Edit & Organize') %></h2>
+		<div>
+			<h2><% _t('CMSPagesController.Title','Edit & Organize') %></h2>
 		
-		<div class="cms-content-header-tabs">
-			<ul>
-				<li>
-					<a href="#cms-content-treeview"><% _t('CMSPagesController.TreeView', 'Tree View') %></a>
-				</li>
-				<li>
-					<a href="#cms-content-galleryview"><% _t('CMSPagesController.GalleryView', 'Gallery View') %></a>
-				</li>
-				<li>
-					<a href="#cms-content-listview"><% _t('CMSPagesController.ListView', 'List View') %></a>
-				</li>
-			</ul>
+			<div class="cms-content-header-tabs">
+				<ul>
+					<li>
+						<a href="#cms-content-treeview"><% _t('CMSPagesController.TreeView', 'Tree View') %></a>
+					</li>
+					<li>
+						<a href="#cms-content-galleryview"><% _t('CMSPagesController.GalleryView', 'Gallery View') %></a>
+					</li>
+					<li>
+						<a href="#cms-content-listview"><% _t('CMSPagesController.ListView', 'List View') %></a>
+					</li>
+				</ul>
+			</div>
 		</div>
-
 	</div>
 
 	<div class="cms-content-tools west">
-		
-		<form class="actionparams" id="search_options" action="$Link(filterSiteTree)">
-			<input type="hidden" id="SiteTreeIsFiltered" value="0" />
-			
-			<div id="SearchBox">
-				<div class="SearchCriteria"><% _t('FILTERLABELTEXT', 'Text') %>:</div>
-				<input type="text" id="SiteTreeSearchTerm" class='SearchCriteria' name="SiteTreeSearchTerm" />
-			</div>
-			
-			<div id="ContainerSiteTreeFilterDate" class="SearchCriteriaContainer" style="display:none">
-				<div id="TextSiteTreeFilterDate" class="SearchCriteria"><% _t('EDITEDSINCE','Edited Since') %>:</div>
-				<div id="InputSiteTreeFilterDate">$SiteTreeFilterDateField</div>
-			</div>
-			<div id='ContainerSiteTreeFilterClassName' class='SearchCriteriaContainer' style="display:none">
-				<div id="TextSiteTreeFilterClassName" class="SearchCriteria"><% _t('FILTERLABELPAGETYPE', 'Page type') %>: </div>
-				<div id="InputSiteTreeFilterClassName">$SiteTreeFilterPageTypeField</div>
-			</div>
-
-			<% control SiteTreeFilterOptions %>
-				<div id="Container$Column" class="SearchCriteriaContainer" style="display:none">
-					<div id="Text$Column" class="SearchCriteria">$Title:</div>
-					<input id="Input$Column" name="$Column" class="SearchCriteria" />
-				</div>
-			<% end_control %>
-			
-			<div id='SearchControls'>
-				<select id="SiteTreeFilterAddCriteria">
-					<option value=""><% _t('ADDSEARCHCRITERIA','Add Criteria') %></option>
-					<option value="SiteTreeFilterDate"><% _t('EDITEDSINCE','Edited Since') %></option>
-					<option value="SiteTreeFilterClassName"><% _t('FILTERLABELPAGETYPE', 'Page type') %></option>
-					<% control SiteTreeFilterOptions %>
-        				<option value="$Column">$Title</option>
-					<% end_control %>
-				</select>
-				<div id="searchIndicator">&nbsp;</div>
-				<input type="submit" id="SiteTreeSearchClearButton" class="action" value="<% _t('CLEAR','Clear') %>" title="<% _t('CLEARTITLE','Clear the search and view all items') %>" />
-				<input type="submit" id="SiteTreeSearchButton" class="action" value="<% _t('SEARCH','Search') %>" title="<% _t('SEARCHTITLE','Search through URL, Title, Menu Title, &amp; Content') %>" />
-			</div>
-		</form>
+	
+		$SearchForm
 		
 	</div>
 
 	<div class="cms-content-form center ui-widget-content">
 		
 		<div id="cms-content-treeview">
-			<div class="cms-tree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)">
-				$SiteTreeAsUL
+			
+			<div class="cms-tree-tools">
+				<span><% _t("TreeTools.DisplayLabel","Display:") %></span>
+				<% if CanOrganiseSitetree %> 
+				<div class="checkboxAboveTree">
+					<input type="radio" name="view-mode" value="draggable" id="view-mode-draggable" />
+					<label for="view-mode-draggable"><% _t("ENABLEDRAGGING","Drag'n'drop") %></label>
+				</div>
+				<% end_if %>
+				<div>
+					<input type="radio" name="view-mode" value="multiselect" id="view-mode-multiselect" />
+					<label for="view-mode-multiselect"><% _t("MULTISELECT","Multi-selection") %></label>
+				</div>
 			</div>
 			
 			<div id="TreeActions-batchactions">
 				$BatchActionsForm
 			</div>
-		
-			<% if CanOrganiseSitetree %> 
-				<div class="checkboxAboveTree">
-					<input type="checkbox" id="sortitems" />
-					<label for="sortitems"><% _t('ENABLEDRAGGING','Allow drag &amp; drop reordering', PR_HIGH) %></label>
-				</div>
-			<% end_if %>
+			
+			<div class="cms-tree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)">
+				$SiteTreeAsUL
+			</div>
+
 		</div>
 		
 		<div id="cms-content-listview">