diff --git a/javascript/AssetAdmin.DragDrop.js b/javascript/AssetAdmin.DragDrop.js
index 5ec3acf6..2067c671 100644
--- a/javascript/AssetAdmin.DragDrop.js
+++ b/javascript/AssetAdmin.DragDrop.js
@@ -63,7 +63,6 @@
 				
 				this.draggable({
 					zIndex: 4000,
-					//stack: {group: '.ui-layout-west'},
 					appendTo: 'body',
 					helper: function() {
 						return $(
diff --git a/javascript/CMSMain.js b/javascript/CMSMain.js
index 50f76ca1..f809cb0a 100644
--- a/javascript/CMSMain.js
+++ b/javascript/CMSMain.js
@@ -4,30 +4,6 @@
 (function($) {
 	$.entwine('ss', function($){
 	
-		/**
-		 * Class: #contentPanel form
-		 * 
-		 * All forms in the right content panel should have closeable jQuery UI style titles.
-		 */
-		// TODO Change to modal dialog, jQuery UI update somehow messed up the button positioning,
-		// they're no longer clickable
-		// $('#contentPanel form').entwine({
-		// 	// Constructor: onmatch
-		// 	onmatch: function() {
-		// 	  // Style as title bar
-		// 		this.find(':header:first').titlebar({
-		// 			closeButton:true
-		// 		});
-		// 		// The close button should close the east panel of the layout
-		// 		this.find(':header:first .ui-dialog-titlebar-close').bind('click', function(e) {
-		// 			$('body.CMSMain').entwine('ss').getMainLayout().close('east');
-		// 			return false;
-		// 		});
-		// 	
-		// 		this._super();
-		// 	}
-		// });
-	
 		/**
 		 * Class: #Form_SearchTreeForm
 		 * 
diff --git a/javascript/tinymce_ssbuttons/editor_plugin_src.js b/javascript/tinymce_ssbuttons/editor_plugin_src.js
index 2b24c4e3..7ed93e34 100644
--- a/javascript/tinymce_ssbuttons/editor_plugin_src.js
+++ b/javascript/tinymce_ssbuttons/editor_plugin_src.js
@@ -55,15 +55,10 @@
 				if(!showForm || showForm.style.display == "none") {
 					ed.controlManager.setActive(showCommand, false);
 					// Can't use $('contentPanel'), as its in a different window
-					window.parent.document.getElementById('contentPanel').style.display = "none";
-					// toggle layout panel
-					jQuery('body.CMSMain').entwine('ss').getMainLayout().close('east');
+					jQuery('#contentPanel', window.parent).hide();
 				} else {
 					ed.controlManager.setActive(showCommand, true);
-					window.parent.document.getElementById('contentPanel').style.display = "block";
-					// toggle layout panel
-					jQuery('body.CMSMain').entwine('ss').getMainLayout().resizeAll();
-					jQuery('body.CMSMain').entwine('ss').getMainLayout().open('east');
+					jQuery('#contentPanel', window.parent).show();
 				}
 			}