diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index 323435b4..b72ccec2 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -214,6 +214,7 @@ class ReportAdmin extends LeftAndMain {
 		}
 
 		$form->setFormAction($this->Link() . '/EditForm?' . http_build_query($filteredCriteria));
+		$form->setTemplate('ReportAdminForm');
 		
 		return $form;
 	}
@@ -240,8 +241,7 @@ class ReportAdmin extends LeftAndMain {
 	}
 	
 	public function updatereport() {
-		FormResponse::load_form($this->EditForm()->renderWith('Form'));
-		FormResponse::add("$('tab-Root_Report').onclick();");
+		FormResponse::load_form($this->EditForm()->forTemplate());
 		return FormResponse::respond();
 	}
 }
diff --git a/css/cms_right.css b/css/cms_right.css
index 0ff55828..b4a20294 100644
--- a/css/cms_right.css
+++ b/css/cms_right.css
@@ -233,6 +233,19 @@
 	clear: left;
 }
 
+/**
+ * Non-tabbed scrolling area that can be used in place of tabs in LeftAndMAin
+ */
+.right #ScrollPanel {
+	background: #fff;
+	clear: left;
+	overflow: auto;
+	border: 1px solid #aaa;
+	position: relative;
+	top: 0;
+	padding: 10px;
+}
+
 /**
  * RHS Action Parameters boxes
  */
diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index a71ca9a2..18c540bd 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -156,6 +156,11 @@ window.ontabschanged = function() {
 			fitToParent(_TAB_DIVS_ON_PAGE[i], 30);
 		}
 	}
+	
+	// Non-tab alternative
+	if($('ScrollPanel')) {
+		fitToParent('ScrollPanel', 0);
+	}
 }
 
 window.onresize = function(init) {
diff --git a/javascript/ReportAdmin_right.js b/javascript/ReportAdmin_right.js
index 99bf1172..31a6bbe8 100755
--- a/javascript/ReportAdmin_right.js
+++ b/javascript/ReportAdmin_right.js
@@ -11,6 +11,10 @@ Behaviour.register({
 		 */
 		prepareForm : function() {
 			ajaxActionsAtTop('Form_EditForm', 'form_actions', 'right');
+
+			// Custom code for reports section - link the search button to ajax
+			var updateReportButtonHolder = $('action_updatereport');
+			if(updateReportButtonHolder) prepareAjaxActions(updateReportButtonHolder, 'Form_EditForm');
 		},
 		
 		/**
@@ -107,7 +111,6 @@ Behaviour.register({
 			this.resetElements();
 				
 			window.ontabschanged();
-			
 		}
 	}
-});
+});
\ No newline at end of file