diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index 818e0670..f5b83744 100644
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -77,7 +77,7 @@ abstract class ModelAdmin extends LeftAndMain {
 		
 		Requirements::javascript('jsparty/jquery/jquery.js');
 		Requirements::javascript('jsparty/jquery/livequery/jquery.livequery.js');
-		Requirements::javascript('jsparty/jquery/ui/ui/ui.base.js');
+		Requirements::javascript('jsparty/jquery/ui/ui/ui.core.js');
 		Requirements::javascript('jsparty/jquery/ui/ui/ui.tabs.js');
 		Requirements::javascript('jsparty/jquery/ui/plugins/form/jquery.form.js');
 		Requirements::javascript('cms/javascript/ModelAdmin.js');
@@ -300,7 +300,7 @@ class ModelAdmin_CollectionController extends Controller {
 	 * @return unknown
 	 */
 	function add($request) {
-		return $this->AddForm()->forTemplate();
+		return $this->AddForm()->forAjaxTemplate();
 	}
 
 	/**
@@ -362,7 +362,7 @@ class ModelAdmin_RecordController extends Controller {
 	 */
 	function edit($request) {
 		if ($this->currentRecord) {
-			return $this->EditForm()->forTemplate();
+			return $this->EditForm()->forAjaxTemplate();
 		} else {
 			return "I can't find that item";
 		}
@@ -405,7 +405,7 @@ class ModelAdmin_RecordController extends Controller {
 	function view($request) {
 		if ($this->currentRecord) {
 			$form = $this->ViewForm();
-			return $form->forTemplate();
+			return $form->forAjaxTemplate();
 		} else {
 			return "I can't find that item";
 		}
diff --git a/javascript/ModelAdmin.js b/javascript/ModelAdmin.js
index 680db043..16a12ce1 100644
--- a/javascript/ModelAdmin.js
+++ b/javascript/ModelAdmin.js
@@ -16,7 +16,12 @@ jQuery(document).ready(function() {
 	function showRecord(uri) {
 		jQuery.get(uri, function(result){
 			jQuery('#right').html(result);
+			jQuery('#SearchForm_holder').tabs();
+			
+			// TODO/SAM: It seems a bit of a hack to have to list all the little updaters here. 
+			// Is livequery a solution?
 			Behaviour.apply(); // refreshes ComplexTableField
+			jQuery('#right ul.tabstrip').tabs();
 		});
 	}
 	
@@ -26,7 +31,11 @@ jQuery(document).ready(function() {
 	function saveRecord(uri, data) {
 		jQuery.post(uri, data, function(result){
 			jQuery('#right').html(result);
+
+			// TODO/SAM: It seems a bit of a hack to have to list all the little updaters here. 
+			// Is livequery a solution?
 			Behaviour.apply(); // refreshes ComplexTableField
+			jQuery('#right ul.tabstrip').tabs();
 		});
 	}