4 files changed, 30 insertions, 18 deletions
diff --git a/templates/web/base/around/_updates.html b/templates/web/base/around/_updates.html
index 458983e8f..6121b218b 100755
--- a/templates/web/base/around/_updates.html
+++ b/templates/web/base/around/_updates.html
@@ -1,5 +1,5 @@
 <div class="shadow-wrap">
-    <ul id="key-tools" class="singleton">
+    <ul id="key-tools">
         <li><a class="feed" id="key-tool-around-updates" href="[% email_url | html %]">[% loc("Get updates") %]</a></li>
     </ul>
 </div>
diff --git a/templates/web/base/dashboard/index.html b/templates/web/base/dashboard/index.html
index e47798573..d7ad6ddfa 100644
--- a/templates/web/base/dashboard/index.html
+++ b/templates/web/base/dashboard/index.html
@@ -34,11 +34,9 @@
         </select>
     </p>
 
-    <p>
+    <p class="no-label">
         <input type="submit" class="btn" value="[% loc('Look up') %]">
     </p>
-
-    <br clear="all" />
 </div>
 
 
@@ -133,18 +131,32 @@
 
 <h2>[% loc('Reports') %]</h2>
 
-                </select>
-<p>[% loc('Report state:') %] <select class="form-control" name="state">
-<option value=''>[% loc('All') %]</option>
-    [% FOR group IN filter_states %]
-      [% FOR state IN group.1 %]
-        [% NEXT IF state == 'hidden' %]
-        <option [% 'selected ' IF state == q_state %] value="[% state %]">[% prettify_state(state, 1) %]</option>
-      [% END %]
-    [% END %]
-</select>
-<input type="submit" class="btn" value="[% loc('Look up') %]">
-<a class="export_as_csv" href="[% c.req.uri_with({ export => 1 }) %]">[% loc('Export as CSV') %]</a>
+<div class="filters">
+    <p>
+        <label for="state">[% loc('Report state:') %]</label>
+        <select class="form-control" name="state">
+            <option value=''>[% loc('All') %]</option>
+          [% FOR group IN filter_states %]
+          [% FOR state IN group.1 %]
+            [% NEXT IF state == 'hidden' %]
+            <option [% 'selected ' IF state == q_state %] value="[% state %]">[% prettify_state(state, 1) %]</option>
+          [% END %]
+          [% END %]
+        </select>
+    </p>
+    <p>
+        <label for="start_date">[% loc('Start Date') %]</label>
+        <input name="start_date" type="date" value="[% start_date | html %]" class="form-control">
+    </p>
+    <p>
+        <label for="end_date">[% loc('End Date') %]</label>
+        <input name="end_date" type="date" value="[% end_date | html %]" class="form-control">
+    </p>
+    <p class="no-label">
+        <input type="submit" class="btn" value="[% loc('Look up') %]">
+        <a class="btn export_as_csv" href="[% c.req.uri_with({ export => 1 }) %]">[% loc('Export as CSV') %]</a>
+    </p>
+</div>
 
 <table width="100%" id="reports">
     <tr>
diff --git a/templates/web/base/report/display_tools.html b/templates/web/base/report/display_tools.html
index c477fd8dd..bb76cc388 100644
--- a/templates/web/base/report/display_tools.html
+++ b/templates/web/base/report/display_tools.html
@@ -3,7 +3,7 @@
         [% IF c.user_exists AND c.cobrand.users_can_hide AND c.user.belongs_to_body( problem.bodies_str ) %]
         <li><form method="post" action="/report/delete/[% problem.id %]" id="remove-from-site-form">
             <input type="hidden" name="token" value="[% csrf_token %]">
-            <input type="submit" id="key-tool-report-abuse" class="abuse btn" data-confirm="[% loc('Are you sure?') %]" name="remove_from_site" value="[% loc('Remove from site') %]">
+            <button type="submit" id="key-tool-report-abuse" class="abuse" data-confirm="[% loc('Are you sure?') %]" name="remove_from_site">[% loc('Remove from site') %]</button>
         </form></li>
         [% ELSIF c.cobrand.moniker != 'zurich' %]
         <li><a rel="nofollow" id="key-tool-report-abuse" class="abuse" href="[% c.uri_for( '/contact', { id => problem.id } ) %]">[%
diff --git a/templates/web/base/reports/_rss.html b/templates/web/base/reports/_rss.html
index f2d164bfa..fdb833315 100644
--- a/templates/web/base/reports/_rss.html
+++ b/templates/web/base/reports/_rss.html
@@ -1,5 +1,5 @@
 <div class="shadow-wrap">
-    <ul id="key-tools"[% IF NOT children.size %] class="singleton"[% END %]>
+    <ul id="key-tools">
         <li><a rel="nofollow" id="key-tool-updates-area" class="feed" href="[% rss_url %]">[%
             IF c.cobrand.moniker == 'bromley' AND thing == 'council';
                 'Get updates of reports in Bromley';