diff --git a/css/ReportAdmin.css b/css/ReportAdmin.css
index 0f6bbca6..3d965f45 100644
--- a/css/ReportAdmin.css
+++ b/css/ReportAdmin.css
@@ -8,4 +8,52 @@
 #right iframe.AWStatsReport {
 	width: 98%;
 	height: 85%;
+}
+
+.ReportAdmin h4 {
+	border-bottom: 1px #AAA solid;
+	margin-bottom: 0.5em;
+}
+
+.ReportAdmin .right form h4 {
+	font-size: 11px;
+}
+
+.ReportAdmin .filters {
+	overflow: auto;
+}
+
+.ReportAdmin .filters .field {
+	padding: 0;
+}
+
+.ReportAdmin .filters > .field {
+	float: left;
+	clear: none;
+	margin-right: 1em;
+	margin-bottom: .5em;
+}
+
+.ReportAdmin .right form .field label.left {
+	width: auto;
+	height: 15px;
+}
+
+.ReportAdmin .right form .field .middleColumn {
+	width: auto;
+	padding: 0;
+}
+
+.ReportAdmin .filters .field .middleColumn {
+	background: none;
+}
+
+.ReportAdmin .filters .field.checkbox {
+	margin-top: 18px;
+	padding: 0;
+}
+
+.ReportAdmin .filters .field.datetime .field.date,
+.ReportAdmin .filters .field.datetime .field.time {
+	float: left;
 }
\ No newline at end of file
diff --git a/templates/ReportAdminForm.ss b/templates/ReportAdminForm.ss
index eaec9431..0466d91a 100644
--- a/templates/ReportAdminForm.ss
+++ b/templates/ReportAdminForm.ss
@@ -9,28 +9,24 @@
 			$FieldMap.ReportTitle.FieldHolder
 			$FieldMap.ReportDescription.FieldHolder
 		
-			<!-- Filters -->
-			
 			<% if FieldMap.Filters.Children %>
-			<div style="border-bottom: 1px #AAA solid"><b><% _t('ReportAdminForm.FILTERBY', 'Filter by') %></b></div>
+				<h4><% _t('ReportAdminForm.FILTERBY', 'Filter by') %></h4>
 			
-			<% control FieldMap.Filters %>
-			<% control Children %>
-			<div style="float: left; margin: 5px 10px 10px 0; height: 35px">
-				<label for="$ID" style="font-weight: bold; display: block">$Title</label>
-				$Field
-			</div>
-			<% end_control %>
-			<% end_control %>
+				<div class="filters">
+					<% control FieldMap.Filters %>
+						<% control Children %>
+							$FieldHolder
+						<% end_control %>
+					<% end_control %>
+				</div>
 			
-			<div id="action_updatereport" style="float: left; margin: 1px 10px 10px 0">
-			<br />
-			<% if FieldMap.action_updatereport %>
-			$FieldMap.action_updatereport.Field
-			<% end_if %>
-			</div>
+				<div id="action_updatereport">
+					<% if FieldMap.action_updatereport %>
+						$FieldMap.action_updatereport.Field
+					<% end_if %>
+				</div>
 			
-			<div style="clear: both">&nbsp;</div>
+				<div style="clear: both">&nbsp;</div>
 			<% end_if %>
 			
 			$FieldMap.ReportContent.FieldHolder