2 files changed, 13 insertions, 1 deletions
diff --git a/templates/web/base/admin/index.html b/templates/web/base/admin/index.html
index f573f0e7a..8498055b1 100644
--- a/templates/web/base/admin/index.html
+++ b/templates/web/base/admin/index.html
@@ -20,14 +20,18 @@ and to receive notices of updates.
   </p>
 [% END %]
 
+<div class="admin-index-search form-txt-submit-box clearfix">
+
 <form method="get" action="[% c.uri_for('reports') %]" accept-charset="utf-8">
     <p><label for="search_reports">[% loc('Search Reports') %]</label>
         <input type="text" class="form-control" name="search"  size="30" id="search_reports" value="[% searched | html %]">
+        <input type="submit" class="btn" value="[% loc('Go') %]">
 </form>
 
 <form method="get" action="[% c.uri_for('users') %]" accept-charset="utf-8">
     <p><label for="search_users">[% loc('Search Users') %]</label>
         <input type="text" class="form-control" name="search"  size="30" id="search_users" value="[% searched | html %]">
+        <input type="submit" class="btn" value="[% loc('Go') %]">
 </form>
 
 [% IF c.user.is_superuser %]
@@ -46,6 +50,8 @@ and to receive notices of updates.
   </form>
 [% END %]
 
+</div>
+
 [% IF unsent_reports.size %]
 <h2>[% loc('Reports waiting to be sent') %]</h2>
 
diff --git a/templates/web/base/common_scripts.html b/templates/web/base/common_scripts.html
index 1d53f1d51..42c04f11f 100644
--- a/templates/web/base/common_scripts.html
+++ b/templates/web/base/common_scripts.html
@@ -16,6 +16,12 @@ scripts.push(
     version('/cobrands/fixmystreet/fixmystreet.js'),
 );
 
+IF c.user_exists AND (c.user.from_body OR c.user.is_superuser);
+    scripts.push(
+        version('/cobrands/fixmystreet/staff.js')
+    );
+END;
+
 FOR script IN map_js;
     scripts.push(script);
 END;
@@ -28,7 +34,7 @@ scripts.push(
 IF admin;
     scripts.push(
         version('/js/jquery-ui/js/jquery-ui-1.10.3.custom.min.js'),
-        version('/js/fixmystreet-admin.js'),
+        version('/cobrands/fixmystreet/admin.js'),
     );
 END;