diff --git a/css/cms_left.css b/css/cms_left.css
index 733fa472..458b17b7 100644
--- a/css/cms_left.css
+++ b/css/cms_left.css
@@ -376,7 +376,7 @@ ul.tree span.untranslated a:visited {
 }
 
 #left form.actionparams input.SearchCriteria {
-	width: 41%;
+	width: 43%;
 	float: left;
 }
 #left form.actionparams #InputSiteTreeFilterDate .calendar {
diff --git a/css/layout.css b/css/layout.css
index 8bce450e..7e6df2fc 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -295,6 +295,8 @@ body.stillLoading select {
 }
 	#bottom #switchView a {
 		background: none;
+		margin-left: 8px;
+		border-left: 1px solid;
 	}
 
 #bottom .bottomTabs a {
@@ -344,10 +346,19 @@ body.stillLoading select {
 		#SearchBox #SiteTreeSearchTerm {
 			padding: 1px 0 2px 0;
 		}
+	.SearchCriteriaContainer {
+		float: left;
+		width: 100%;
+		padding-left: 5px;
+		margin-bottom: 4px;
+	}
 	#addCriteria {
 		float: left;
 		width: 100%;
 	}
+		#addCriteria label {
+			display: none;
+		}
 	#sitetree_ul, ul#sitetree {
 		padding: 3px 0 0 3px;
 		clear: left;
diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js
index bc41ebc7..13d95998 100755
--- a/javascript/CMSMain_left.js
+++ b/javascript/CMSMain_left.js
@@ -125,8 +125,10 @@ SiteTreeFilterAddCriteria = Class.create();
 SiteTreeFilterAddCriteria.applyTo('#SiteTreeFilterAddCriteria');
 SiteTreeFilterAddCriteria.prototype = {
 	onchange : function() {
-		Element.show('Text' + this.value);
-		Element.show('Input' + this.value);
+		Element.show('Container' + this.value);
+		// Element.show('Text' + this.value);
+		// Element.show('Input' + this.value);
+		this.selectedIndex = 0; //reset selected criteria to prompt 
 	}
 }
 
diff --git a/templates/Includes/CMSMain_left.ss b/templates/Includes/CMSMain_left.ss
index f77f4800..022bd071 100755
--- a/templates/Includes/CMSMain_left.ss
+++ b/templates/Includes/CMSMain_left.ss
@@ -12,8 +12,6 @@
 					<li class="action" id="addpage"><button<% if EditingLang %> disabled="disabled" class="disabled"<% end_if %>><% _t('CREATE','Create',PR_HIGH) %></button></li>
 					<li class="action" id="search"><button><% _t('SEARCH','Search',PR_HIGH) %></button></li>
 					<li class="action" id="batchactions"><button><% _t('BATCHACTIONS','Batch Actions',PR_HIGH) %></button></li>
-					<!-- <li class="action" id="duplicate"><a href="#">Duplicate</a></li>
-					Sam: this should be put into the Create area, I think, so we don't stuff up the layout -->
 				</ul>
 				<div style="clear:both;"></div>
 				<% control AddPageOptionsForm %>
@@ -21,18 +19,8 @@
 					<% control Fields %>
 					$FieldHolder
 					<% end_control %>
-					<!--
 					<div>
-					<select name="Type">
-						<% control PageTypes %>
-						<option value="$ClassName">$AddAction</option>
-						<% end_control %>
-					</select>
-					<input type="hidden" name="ParentID" />
-					</div>
-					-->
-					<div>
-					<input class="action" type="submit" value="<% _t('GO','Go') %>" />
+						<input class="action" type="submit" value="<% _t('GO','Go') %>" />
 					</div>
 				</form>
 				<% end_control %>
@@ -45,16 +33,20 @@
 						<input type="submit" id="SiteTreeSearchButton" class="action" value="<% _t('SEARCH') %>" title="<% _t('SEARCHTITLE','Search through URL, Title, Menu Title, &amp; Content') %>" />
 					</div>
 					
-					<div style="display:none" id="TextSiteTreeFilterDate" class="SearchCriteria"><% _t('EDITEDSINCE','Edited Since') %>:</div>
-					<div style="display:none" id="InputSiteTreeFilterDate">$SiteTreeFilterDateField</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>
 					<% control SiteTreeFilterOptions %>
-						<div style="display:none" id="Text$Column" class="SearchCriteria">$Title:</div>
-						<input style="display:none" id="Input$Column" name="$Column" class="SearchCriteria" />
+						<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="addCriteria">
 						<select id="SiteTreeFilterAddCriteria">
-							<option><% _t('ADDSEARCHCRITERIA','Add Criteria...') %></option>
+							<option value=""><% _t('ADDSEARCHCRITERIA','Add Criteria...') %></option>
 							<option value="SiteTreeFilterDate"><% _t('EDITEDSINCE','Edited Since') %></option>
 							<% control SiteTreeFilterOptions %>
 		        				<option value="$Column">$Title</option>