diff --git a/code/CMSMain.php b/code/CMSMain.php
index 64217f86..83014360 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -660,7 +660,7 @@ JS;
 		}
 		$selectorField = new GroupedDropdownField(
 			"ReportClass", 
-			_t('CMSMain.REPORT', 'Report'),
+			false,
 			$finalOptions
 		);
 		
@@ -677,6 +677,7 @@ JS;
 			)
 		);
 		$form->unsetValidator();
+		$form->addExtraClass('oneline');
 		
 		return $form;
 	}
@@ -1029,8 +1030,8 @@ JS;
 		);
 
 		$form = new Form($this, "AddForm", $fields, $actions);
-		
 		$form->addExtraClass('actionparams');
+		$form->addExtraClass('oneline');
 		
 		return $form;
 	}
diff --git a/css/cms_left.css b/css/cms_left.css
index 78110ef2..1cbb9d4e 100644
--- a/css/cms_left.css
+++ b/css/cms_left.css
@@ -32,6 +32,12 @@
 	color: #666;
 }
 
+form.oneline fieldset {
+	width: 80%;
+	float: left;
+	margin-right: .5em;
+}
+
 /**
  * Selection Groups
  */
@@ -423,7 +429,7 @@ ul.tree span.untranslated a:visited {
 
 .checkboxAboveTree {
 	border-top: 1px solid #cccccc;
-	padding: 5px 0 0 0;
+	padding: .5em;
 	overflow: hidden;
 	clear: left;
 }
@@ -475,12 +481,10 @@ ul.tree span.untranslated a:visited {
 
 }
 
-form#SideReportForm label.left {
-	margin-left: 0em;
-	width: auto;
+#Form_SideReportsForm select,
+#Form_SideReportsForm .middlecolumn {
+	width: 80%;
 }
-
-
 /**
  * i18n
  */
diff --git a/css/cms_right.css b/css/cms_right.css
index 1ffa1fab..f1f0678a 100644
--- a/css/cms_right.css
+++ b/css/cms_right.css
@@ -196,6 +196,8 @@
 .right form .Actions {
 	text-align: right;
 	padding: 0.5em;
+	background: white;
+	border-top: 1px solid #aaa;
 }
 
 	.right form .Actions input {
diff --git a/css/layout.css b/css/layout.css
index 5a0d4a80..d128a7f6 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -404,6 +404,11 @@ body.stillLoading select {
 	_padding-top: 4px;
 }
 
+#TreeTools .ui-tabs .ui-tabs-nav li a {
+	padding-left: .5em;
+	padding-right: .5em;
+}
+
 #TreeTools #batchactionsforms {
 	padding: 0 5px 7px 5px;
 }
diff --git a/css/unjquery.css b/css/unjquery.css
index db414e80..846ac645 100644
--- a/css/unjquery.css
+++ b/css/unjquery.css
@@ -67,13 +67,6 @@
 #treepanes .ui-widget input {
 	font-size: 1.1em;
 }
-#treepanes select {
-	font-size: 1.1em;
-}
-#treepanes option {
-	padding: 3px;
-	font-size: 1.1em;
-}
 
 #treepanes .ui-tabs-panel {
 	padding: 0.5em;
@@ -100,7 +93,6 @@
 
 #treepanes .ui-accordion-header a {
 	font-size: 120%;
-	padding: 0.5em 2.2em 0.5em 0.5em;
 }
 #treepanes.ui-accordion .ui-accordion-header .ui-icon {
 	right: 0.5em !important;
@@ -140,8 +132,3 @@ p#WelcomeMessage {
 .ui-layout-resizer-dragging {
 	background: #ccdef3 none repeat scroll 0 0;
 }
-
-.CMSMain .ui-tabs .ui-tabs-nav li {
-	margin-right: 5px;
-}
-
diff --git a/javascript/CMSMain.js b/javascript/CMSMain.js
index 977cc7ba..65e79513 100644
--- a/javascript/CMSMain.js
+++ b/javascript/CMSMain.js
@@ -169,7 +169,7 @@
 				});
 			
 				// move submit button to the top
-				this.find('#ReportClass').after(this.find('.Actions'));
+				//this.find('#ReportClass').after(this.find('.Actions'));
 			
 				this._super();
 			},
diff --git a/templates/Includes/CMSMain_TreeTools.ss b/templates/Includes/CMSMain_TreeTools.ss
index ea9257c6..40f6cc2a 100644
--- a/templates/Includes/CMSMain_TreeTools.ss
+++ b/templates/Includes/CMSMain_TreeTools.ss
@@ -33,7 +33,7 @@
 			</div>
 			
 			<div class="checkboxAboveTree">
-				<img id="checkboxActionIndicator" src="cms/images/network-save.gif">
+				<img id="checkboxActionIndicator" src="cms/images/network-save.gif" />
 				<div>
 					<input type="checkbox" id="sortitems" />
 					<label for="sortitems"><% _t('ENABLEDRAGGING','Allow drag &amp; drop reordering', PR_HIGH) %></label>