Add .btn and .form-control classes to inputs

36 files changed, 165 insertions, 156 deletions

diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index 330cb3389..1ea55b003 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -936,7 +936,7 @@ subtest 'Status update shown as appropriate' => sub {
             my ($state, $update, $public, $user_response) = @$_;
             $report->update({ state => $state });
             $mech->get_ok( '/admin/report_edit/' . $report->id );
-            $mech->contains_or_lacks($update, "<textarea name='status_update'");
+            $mech->contains_or_lacks($update, "name='status_update'");
             $mech->contains_or_lacks($public || $user_response, '<div class="admin-official-answer">');
 
             if ($public) {
diff --git a/templates/web/base/admin/body-form.html b/templates/web/base/admin/body-form.html
index 13e688097..303afb682 100644
--- a/templates/web/base/admin/body-form.html
+++ b/templates/web/base/admin/body-form.html
@@ -22,7 +22,7 @@
     </div>
     <p>
         <label for="name">[% loc('Name') %]</label>
-        <input type="text" name="name" id="name" value="[% body.name | html %]" size="50">
+        <input type="text" class="form-control" name="name" id="name" value="[% body.name | html %]" size="50">
     </p>
 
     <div class="admin-hint">
@@ -35,7 +35,7 @@
     </div>
     <p>
         <label for="parent">[% loc('Parent') %]</label>
-        <select name="parent" id="parent">
+        <select class="form-control" name="parent" id="parent">
             <option value=""> -- [% loc('Select a body') %] -- </option>
             [% FOR b IN bodies %]
             <option value="[% b.id %]"[% ' selected' IF body.parent.id == b.id %]>[% b.name %]</option>
@@ -73,7 +73,7 @@
     </div>
     <p>
         <label for="area_ids">[% loc('Area covered') %]</label>
-        <select name="area_ids" id="area_ids" multiple>
+        <select class="form-control" name="area_ids" id="area_ids" multiple>
             <option value=""> -- [% loc('Select an area') %] -- </option>
             [% SET body_areas = body.areas %]
             [% FOR area IN areas %]
@@ -85,7 +85,7 @@
 
     <p>
         <label for="external_url">[% loc('External URL') %]</label>
-        <input type="text" name="external_url" id="external_url" value="[% body.external_url | html %]" size="50">
+        <input type="text" class="form-control" name="external_url" id="external_url" value="[% body.external_url | html %]" size="50">
     </p>
     <div class="admin-hint">
       <p>[% loc( "You can mark a body as deleted if you do not want it to be active on the site." ) %]</p>
@@ -105,7 +105,7 @@
     </div>
     <p>
         <label for="send_method">Send Method</label>
-        <select name="send_method" id="send_method">
+        <select class="form-control" name="send_method" id="send_method">
             <option value=""> -- Select a method -- </option>
             [% FOR method IN send_methods %]
             <option value="[% method %]"[% ' selected' IF body.send_method == method %]>[% method %]</option>
@@ -118,7 +118,7 @@
         [% loc(
           "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br>
            <strong>You don't need to set them if the Send Method is email.</strong>.
-           For more information on Open311, see 
+           For more information on Open311, see
            <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.
            "
         ) %]
@@ -127,14 +127,14 @@
       <div class="admin-hint">
         <p>
           [% loc(
-            "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to 
+            "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to
             when sending reports to this body."
           ) %]
         </p>
       </div>
     <p>
         <label for="endpoint">[% loc('Endpoint') %]</label>
-        <input type="text" name="endpoint" id="endpoint" value="[% body.endpoint | html %]" size="50">
+        <input type="text" class="form-control" name="endpoint" id="endpoint" value="[% body.endpoint | html %]" size="50">
     </p>
 
     <div class="admin-hint">
@@ -147,7 +147,7 @@
     </div>
     <p>
         <label for="jurisdiction">Open311 Jurisdiction</label>
-        <input type="text" name="jurisdiction" id="jurisdiction" value="[% body.jurisdiction | html %]" size="50">
+        <input type="text" class="form-control" name="jurisdiction" id="jurisdiction" value="[% body.jurisdiction | html %]" size="50">
     </p>
 
     <div class="admin-hint">
@@ -160,7 +160,7 @@
     </div>
     <p>
         <label for="api_key">Open311 API Key</label>
-        <input type="text" name="api_key" id="api_key" value="[% body.api_key | html %]" size="25">
+        <input type="text" class="form-control" name="api_key" id="api_key" value="[% body.api_key | html %]" size="25">
     </p>
 
     <div class="admin-hint">
@@ -168,7 +168,7 @@
         [% loc(
           "Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive
           updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.
-          For more information, see 
+          For more information, see
           <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>."
         ) %]
       </p>
@@ -181,7 +181,7 @@
     <div class="admin-hint">
       <p>
         [% loc(
-          "If you've enabled Open311 update-sending above, you must identify which 
+          "If you've enabled Open311 update-sending above, you must identify which
           FixMyStreet <strong>user</strong> will be attributed as the creator of those updates
           when they are shown on the site. Enter the ID (number) of that user."
         ) %]
@@ -198,7 +198,7 @@
     <div class="admin-hint">
       <p>
         [% loc(
-          "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> 
+          "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong>
           if you do <strong>not</strong> want that user to be notified whenever these updates are created."
         ) %]
       </p>
@@ -211,7 +211,7 @@
     <div class="admin-hint">
       <p>
         [% loc(
-          "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in 
+          "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in
           its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.
           Check that your cobrand supports this feature before switching it on."
         ) %]
@@ -222,11 +222,11 @@
         <label for="send_extended_statuses" class="inline">Send extended Open311 statuses with service request updates</label>
     </p>
     </div>
-    
+
     <div class="admin-hint">
       <p>
         [% loc(
-          "Enable this <strong>can be devolved</strong> setting if one or more contacts have a 
+          "Enable this <strong>can be devolved</strong> setting if one or more contacts have a
           different endpoint (and send method) from the body's. For example, if reports for some categories of
           problem must be emailed, while others can be sent over Open311."
         ) %]
@@ -239,11 +239,11 @@
         <input type="checkbox" id="can_be_devolved" name="can_be_devolved"[% ' checked' IF body.can_be_devolved %]>
         <label for="can_be_devolved" class="inline">Send method or endpoints can be devolved to contacts (i.e, can be different from the body's)</label>
     </p>
-    
+
     <p>
     <input type="hidden" name="posted" value="body">
     <input type="hidden" name="token" value="[% csrf_token %]">
-    <input type="submit" value="[% body ? loc('Update body') : loc('Add body') %]">
+    <input type="submit" class="btn" value="[% body ? loc('Update body') : loc('Add body') %]">
     </p>
     </form>
 
diff --git a/templates/web/base/admin/body.html b/templates/web/base/admin/body.html
index 6d23c1458..065cafe2d 100644
--- a/templates/web/base/admin/body.html
+++ b/templates/web/base/admin/body.html
@@ -102,12 +102,12 @@
   <p>
     <input type="hidden" name="posted" value="update">
     <input type="hidden" name="token" value="[% csrf_token %]">
-    <input type="submit" name="Update statuses" value="[% loc('Update statuses') %]">
+    <input type="submit" class="btn" name="Update statuses" value="[% loc('Update statuses') %]">
   </p>
 </form>
 
 <p class="fms-admin-info">
-    [% loc("Each contact for the body has a category, which is displayed to the public. 
+    [% loc("Each contact for the body has a category, which is displayed to the public.
             Different categories <strong>can have the same contact</strong> (email address).
             This means you can add many categories even if you only have one contact for the body.
     ") %]
@@ -138,12 +138,12 @@
         </p>
       </div>
       <p>
-        <strong>[% loc('Category:') %] </strong><input type="text" name="category" size="30" value="[% contact.category | html %]">
+        <strong>[% loc('Category:') %] </strong><input type="text" class="form-control" name="category" size="30" value="[% contact.category | html %]">
       </p>
 
     <div class="admin-hint">
       <p>
-        [% loc("The <strong>email address</strong> is the destination to which reports about this category will be sent. 
+        [% loc("The <strong>email address</strong> is the destination to which reports about this category will be sent.
         Other categories for this body may have the same email address.") %]
       </p>
       [% IF (body.send_method AND body.send_method != 'Email') OR body.can_be_devolved  %]
@@ -154,7 +154,7 @@
     </div>
 
     <p>
-      <strong>[% loc('Email address:') %] </strong><input type="text" name="email" size="30" value="[% contact.email | html %]">
+      <strong>[% loc('Email address:') %] </strong><input type="text" class="form-control" name="email" size="30" value="[% contact.email | html %]">
     </p>
 
     <div class="admin-hint">
@@ -170,7 +170,7 @@
 
     <div class="admin-hint">
       <p>
-        [% loc("Check <strong>deleted</strong> to remove the category from use. 
+        [% loc("Check <strong>deleted</strong> to remove the category from use.
         It will not appear as an available category in the drop-down menu on the report-a-problem page.") %]
       </p>
     </div>
@@ -217,7 +217,7 @@
     <p>
       <input type="hidden" name="posted" value="new" >
       <input type="hidden" name="token" value="[% csrf_token %]" >
-      <input type="submit" name="Create category" value="[% errors ? loc('Save changes') : loc('Create category') %]" >
+      <input type="submit" class="btn" name="Create category" value="[% errors ? loc('Save changes') : loc('Create category') %]" >
     </p>
 
     <div>
diff --git a/templates/web/base/admin/category_edit.html b/templates/web/base/admin/category_edit.html
index 6aec0c132..7fe1a10d3 100644
--- a/templates/web/base/admin/category_edit.html
+++ b/templates/web/base/admin/category_edit.html
@@ -25,12 +25,12 @@
     <input type="hidden" name="token" value="[% csrf_token %]" >
 
     <p><strong>[% loc('Email:') %] </strong>
-    <input type="text" name="email" value="[% contact.email | html %]" size="30"> 
+    <input type="text" class="form-control" name="email" value="[% contact.email | html %]" size="30">
 
     <p>
       [% IF c.cobrand.moniker != 'zurich' %]
         <input type="checkbox" name="confirmed" value="1" id="confirmed"[% ' checked' IF contact.confirmed %]>
-        <label class="inline" for="confirmed">[% loc('Confirmed' ) %]</label> 
+        <label class="inline" for="confirmed">[% loc('Confirmed' ) %]</label>
       [% ELSE %]
         <input type="hidden" name="confirmed" value="1">
       [% END %]
@@ -54,22 +54,22 @@
     <form method="post" action="[% c.uri_for('body', body_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
     <p>
         <label for="endpoint">Endpoint</label>
-        <input type="text" name="endpoint" id="endpoint" value="[% contact.endpoint | html %]" size="50">
+        <input type="text" class="form-control" name="endpoint" id="endpoint" value="[% contact.endpoint | html %]" size="50">
     </p>
 
     <p>
         <label for="jurisdiction">Jurisdiction</label>
-        <input type="text" name="jurisdiction" id="jurisdiction" value="[% contact.jurisdiction | html %]" size="50">
+        <input type="text" class="form-control" name="jurisdiction" id="jurisdiction" value="[% contact.jurisdiction | html %]" size="50">
     </p>
 
     <p>
         <label for="api_key">Api Key</label>
-        <input type="text" name="api_key" id="api_key" value="[% contact.api_key | html %]" size="25">
+        <input type="text" class="form-control" name="api_key" id="api_key" value="[% contact.api_key | html %]" size="25">
     </p>
 
     <p>
         <label for="send_method">Send Method</label>
-        <select name="send_method">
+        <select class="form-control" name="send_method">
             <option value=""> -- Select a method -- </option>
             [% FOR method IN send_methods %]
             <option value="[% method %]"[% ' selected' IF contact.send_method == method %]>[% method %]</option>
@@ -79,7 +79,7 @@
     [% END %]
 
     <input type="hidden" name="posted" value="new">
-    <p><input type="submit" name="Save changes" value="[% loc('Save changes') %]">
+    <p><input type="submit" class="btn" name="Save changes" value="[% loc('Save changes') %]">
 </form>
 
 [% IF contact.extra %]
diff --git a/templates/web/base/admin/index.html b/templates/web/base/admin/index.html
index beb4dad7f..f573f0e7a 100644
--- a/templates/web/base/admin/index.html
+++ b/templates/web/base/admin/index.html
@@ -22,18 +22,18 @@ and to receive notices of updates.
 
 <form method="get" action="[% c.uri_for('reports') %]" accept-charset="utf-8">
     <p><label for="search_reports">[% loc('Search Reports') %]</label>
-        <input type="text" name="search"  size="30" id="search_reports" value="[% searched | html %]">
+        <input type="text" class="form-control" name="search"  size="30" id="search_reports" value="[% searched | html %]">
 </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" name="search"  size="30" id="search_users" value="[% searched | html %]">
+        <input type="text" class="form-control" name="search"  size="30" id="search_users" value="[% searched | html %]">
 </form>
 
 [% IF c.user.is_superuser %]
   <form method="get" action="[% c.uri_for('bodies') %]">
   <label for="search_body">[% loc('Edit body details') %]</label>
-  <select id="search_body" name="body">
+  <select class="form-control" id="search_body" name="body">
   [% FOREACH body IN bodies %]
     [%- SET id = body.id %]
       <option[% IF body.deleted %] class="adminhidden"[% END %] value="[% body.id %]">
@@ -42,7 +42,7 @@ and to receive notices of updates.
       </option>
   [% END %]
   </select>
-  <input type="submit" value="[% loc('Go') %]">
+  <input type="submit" class="btn" value="[% loc('Go') %]">
   </form>
 [% END %]
 
diff --git a/templates/web/base/admin/report_blocks.html b/templates/web/base/admin/report_blocks.html
index 941bff821..3561d865d 100644
--- a/templates/web/base/admin/report_blocks.html
+++ b/templates/web/base/admin/report_blocks.html
@@ -38,12 +38,12 @@ SET state_groups = [
 
 [% BLOCK abuse_button -%]
 [% IF allowed_pages.abuse_edit -%]
-[% IF email_in_abuse %]<small>[% loc('(Email in abuse table)') %]</small>[% ELSE %]<input type="submit" name="banuser" value="[% loc('Ban email address') %]" />[% END %]
+[% IF email_in_abuse %]<small>[% loc('(Email in abuse table)') %]</small>[% ELSE %]<input type="submit" class="btn" name="banuser" value="[% loc('Ban email address') %]" />[% END %]
 [%- END %]
 [%- END %]
 
 [% BLOCK flag_button -%]
-[% IF user.flagged || user_flagged %]<input type="submit" name="removeuserflag" value="[% loc('Remove flag') %]">[% ELSE %]<input type="submit" name="flaguser" value="[% loc('Flag user') %]" />[% END %]
+[% IF user.flagged || user_flagged %]<input type="submit" class="btn" name="removeuserflag" value="[% loc('Remove flag') %]">[% ELSE %]<input type="submit" class="btn" name="flaguser" value="[% loc('Flag user') %]" />[% END %]
 [%- END %]
 
 [%# note: date format here (i.e., dd.mm.YYYY) currently used by Zurich %]
diff --git a/templates/web/base/admin/report_edit.html b/templates/web/base/admin/report_edit.html
index 96e59d1c4..02e75563c 100644
--- a/templates/web/base/admin/report_edit.html
+++ b/templates/web/base/admin/report_edit.html
@@ -21,7 +21,7 @@
 
 <div class="sidebar">
 
-    <p align="center"><input type="submit" name="Submit changes" value="[% loc('Submit changes') %]"></p>
+    <p align="center"><input type="submit" class="btn" name="Submit changes" value="[% loc('Submit changes') %]"></p>
 
     <ul>
     [%- cobrand_data = problem.cobrand_data;
@@ -81,9 +81,9 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a>
     ([% problem.send_method_used %])
   [% END %]
   [% IF problem.state == 'confirmed' AND problem.whensent %]
-    <input data-confirm="[% loc('Are you sure?') %]" type="submit" name="resend" value="[% loc('Resend report') %]">
+    <input data-confirm="[% loc('Are you sure?') %]" class="btn" type="submit" name="resend" value="[% loc('Resend report') %]">
   [% ELSIF NOT problem.whensent %]
-    <input type="submit" name="mark_sent" value="[% loc('Mark as sent') %]">
+    <input type="submit" class="btn" name="mark_sent" value="[% loc('Mark as sent') %]">
   [% END %]
 </li>
 <li class="sm">[% loc('Last update:') %] [% PROCESS format_time time=problem.lastupdate %]</li>
@@ -95,11 +95,11 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a>
 <li>[% loc('Going to send questionnaire?') %] [% IF problem.send_questionnaire %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</li>
 
 <li><label for="external_id">[% loc('External ID') %]:</label>
-    <input type="text" name="external_id" id="external_id" value="[% problem.external_id | html %]">
+    <input type="text" class="form-control" name="external_id" id="external_id" value="[% problem.external_id | html %]">
 <li><label for="external_body">[% loc('External body') %]:</label>
-    <input type="text" name="external_body" body="external_body" value="[% problem.external_body | html %]">
+    <input type="text" class="form-control" name="external_body" body="external_body" value="[% problem.external_body | html %]">
 <li><label for="external_team">[% loc('External team') %]:</label>
-    <input type="text" name="external_team" team="external_team" value="[% problem.external_team | html %]">
+    <input type="text" class="form-control" name="external_team" team="external_team" value="[% problem.external_team | html %]">
 
 </ul>
 </div>
@@ -108,12 +108,12 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a>
 
 <ul class="plain-list">
 <li><label for='title'>[% loc('Subject:') %]</label>
-    <input size=60 type='text' id='title' name='title' value='[% problem.title | html %]'></li>
+    <input size=60 type='text' class="form-control" id='title' name='title' value='[% problem.title | html %]'></li>
 <li><label for='detail'>[% loc('Details:') %]</label>
-<textarea name='detail' id='detail' cols=60 rows=10>[% problem.detail | html %]</textarea></li>
+<textarea class="form-control" name='detail' id='detail' cols=60 rows=10>[% problem.detail | html %]</textarea></li>
 
 <li><label class="inline-text" for="state">[% loc('State:') %]</label>
-<select name="state"  id="state">
+<select class="form-control" name="state"  id="state">
 [% FOREACH group IN state_groups %]
     <optgroup label="[% group.0 %]">
     [% FOREACH state IN group.1 %]
@@ -123,7 +123,7 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a>
 [% END %]
 </select></li>
 <li><label class="inline-text" for="category">[% loc('Category:') %]</label>
-<select name="category" id="category">
+<select class="form-control" name="category" id="category">
   [% IF NOT problem.category OR NOT categories.grep(problem.category).size %]
   <optgroup label="[% loc('Existing category') %]">
     <option selected value="[% problem.category | html %]">[% (problem.category OR '-') | html %]</option>
@@ -138,14 +138,14 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a>
   [% END %]
 </select></li>
 <li><label class="inline-text" for="anonymous">[% loc('Anonymous:') %]</label>
-<select name="anonymous"  id="anonymous">
+<select class="form-control" name="anonymous"  id="anonymous">
 <option [% 'selected ' IF problem.anonymous %]value="1">[% loc('Yes') %]</option>
 <option [% 'selected ' IF !problem.anonymous %]value="0">[% loc('No') %]</option>
 </select></li>
 <li><label for="name">[% loc('Name:') %]</label>
-    <input type='text' name='name' id='name' value='[% problem.name | html %]'></li>
+    <input type='text' class="form-control" name='name' id='name' value='[% problem.name | html %]'></li>
 <li><label for="email">[% loc('Email:') %]</label>
-    <input type='text' id='email' name='email' value='[% problem.user.email | html %]'>
+    <input type='text' class="form-control" id='email' name='email' value='[% problem.user.email | html %]'>
     [% PROCESS abuse_button %]
     [% PROCESS flag_button user=problem.user %]
 </li>
@@ -177,7 +177,7 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a>
 [% END %]
 
 </ul>
-<input type="submit" name="Submit changes" value="[% loc('Submit changes') %]">
+<input type="submit" class="btn" name="Submit changes" value="[% loc('Submit changes') %]">
 </form>
 
 </div>
diff --git a/templates/web/base/admin/responsepriorities/edit.html b/templates/web/base/admin/responsepriorities/edit.html
index b05ebfaf9..89f41a069 100644
--- a/templates/web/base/admin/responsepriorities/edit.html
+++ b/templates/web/base/admin/responsepriorities/edit.html
@@ -11,7 +11,7 @@
 
     <p>
         <strong>[% loc('Name:') %] </strong>
-        <input type="text" name="name" class="required" size="30" value="[% rp.name | html %]">
+        <input type="text" name="name" class="required form-control" size="30" value="[% rp.name | html %]">
     </p>
     <p>
       <strong>[% loc('Categories:') %]</strong>
@@ -34,7 +34,7 @@
     </p>
     <p>
       <input type="hidden" name="token" value="[% csrf_token %]" >
-      <input type="submit" name="Edit priorities" value="[% rp.id ? loc('Save changes') : loc('Create priority') %]" >
+      <input type="submit" class="btn" name="Edit priorities" value="[% rp.id ? loc('Save changes') : loc('Create priority') %]" >
     </p>
 </form>
 
diff --git a/templates/web/base/admin/stats.html b/templates/web/base/admin/stats.html
index 897e2fc44..535f04d18 100644
--- a/templates/web/base/admin/stats.html
+++ b/templates/web/base/admin/stats.html
@@ -68,13 +68,13 @@
 
 <form method="post" action="[% c.uri_for('stats') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
     <p>
-    <label for="start_date">[% loc('Start Date:') %]</label><input type="text"
+    <label for="start_date">[% loc('Start Date:') %]</label><input type="text" class="form-control"
       placeholder="[% loc('Click here or enter as dd/mm/yyyy') %]" name="start_date" id="start_date"
       value="[% start_date ? start_date.strftime( '%d/%m/%Y') : '' | html %]" />
     </p>
 
     <p>
-    <label for="end_date">[% loc('End Date:') %]</label><input type="text"
+    <label for="end_date">[% loc('End Date:') %]</label><input type="text" class="form-control"
       placeholder="[% loc('Click here or enter as dd/mm/yyyy') %]" name="end_date" id="end_date" size="5"
       value="[% end_date ? end_date.strftime( '%d/%m/%Y') : '' | html %]" />
     </p>
@@ -89,7 +89,7 @@
 
     [% IF c.user.is_superuser %]
       <p>
-      [% loc('Council:') %] <select id='body' name='body'>
+      [% loc('Council:') %] <select class="form-control" id='body' name='body'>
           <option value=''>[% loc('No council') %]</option>
           [% FOR body IN bodies %]
           <option value="[% body.id %]"[% ' selected' IF body.id == selected_body %]>[% body.name %]</option>
@@ -99,7 +99,7 @@
     [% END %]
 
     <p>
-    <input type="submit" name="getcounts"  size="30" id="getcounts" value="Get Count" />
+    <input type="submit" class="btn" name="getcounts"  size="30" id="getcounts" value="Get Count" />
     </p>
 </form>
 
diff --git a/templates/web/base/admin/template_edit.html b/templates/web/base/admin/template_edit.html
index 54058a04c..8ce3c28dd 100644
--- a/templates/web/base/admin/template_edit.html
+++ b/templates/web/base/admin/template_edit.html
@@ -11,11 +11,11 @@
 
     <p>
         <strong>[% loc('Title:') %] </strong>
-        <input type="text" name="title" class="required" size="30" value="[% rt.title| html %]">
+        <input type="text" name="title" class="required form-control" size="30" value="[% rt.title| html %]">
     </p>
     <p>
         <strong>[% loc('Text:') %] </strong>
-        <textarea name="text" class="required">[% rt.text |html %]</textarea>
+        <textarea class="form-control" name="text" class="required">[% rt.text |html %]</textarea>
     </p>
     <p>
       <label>
@@ -38,11 +38,11 @@
     </p>
     <p>
       <input type="hidden" name="token" value="[% csrf_token %]" >
-      <input type="submit" name="Edit templates" value="[% rt.id ? loc('Save changes') : loc('Create template') %]" >
+      <input type="submit" class="btn" name="Edit templates" value="[% rt.id ? loc('Save changes') : loc('Create template') %]" >
     </p>
     [% IF rt.id %]
         <p>
-            <input class="delete" type="submit" name="delete_template" value="[% loc('Delete template') %]">
+            <input class="delete btn-danger" type="submit" name="delete_template" value="[% loc('Delete template') %]">
         </p>
     [% END %]
 </form>
diff --git a/templates/web/base/admin/update_edit.html b/templates/web/base/admin/update_edit.html
index 06bee6010..2b20c50b3 100644
--- a/templates/web/base/admin/update_edit.html
+++ b/templates/web/base/admin/update_edit.html
@@ -18,19 +18,21 @@
 <li><a href="[% uri %]#update_[% update.id %]" class="admin-offsite-link">[% loc('View report on site' )%]</a></li>
 
 <li><label for='detail'>[% loc('Text:') %]</label>
-<textarea name='text' id='text' cols=60 rows=10>[% update.text | html %]</textarea></li>
+<textarea class="form-control" name='text' id='text' cols=60 rows=10>[% update.text | html %]</textarea></li>
 
-<li><label for="anonymous">[% loc('Anonymous:') %]</label> <select name="anonymous"  id="anonymous">
+<li><label for="anonymous">[% loc('Anonymous:') %]</label>
+<select class="form-control" name="anonymous" id="anonymous">
 <option [% 'selected ' IF update.anonymous %]value="1">[% loc('Yes') %]</option>
 <option [% 'selected ' IF !update.anonymous %]value="0">[% loc('No') %]</option>
 </select></li>
-<li><label for="state">[% loc('State:') %]</label> <select name="state"  id="state">
+<li><label for="state">[% loc('State:') %]</label>
+<select class="form-control" name="state"  id="state">
     [% FOREACH state IN [ ['confirmed', loc('Open')], ['hidden', loc('Hidden')], ['unconfirmed',loc('Unconfirmed')] ] %]
         <option [% 'selected ' IF state.0 == update.state %] value="[% state.0 %]">[% state.1 %]</option>
     [% END %]
 </select></li>
-<li>[% loc('Name:') %] <input type='text' name='name' id='name' value='[% update.name | html %]'></li>
-<li>[% loc('Email:') %] <input type='text' id='email' name='email' value='[% update.user.email | html %]'>
+<li>[% loc('Name:') %] <input type='text' class="form-control" name='name' id='name' value='[% update.name | html %]'></li>
+<li>[% loc('Email:') %] <input type='text' class="form-control" id='email' name='email' value='[% update.user.email | html %]'>
 [%- IF update.user.from_body && update.user.from_body.id == update.problem.bodies_str %]
 [% ' (' _ tprintf(loc('user is from same council as problem - %d'), update.user.from_body.id ) _')' %]
 [% END -%]
@@ -72,6 +74,6 @@
 [% END %]
 
 </ul>
-<input type="submit" name="Submit changes" value="[% loc('Submit changes') %]" ></form>
+<input type="submit" class="btn" name="Submit changes" value="[% loc('Submit changes') %]" ></form>
 
 [% INCLUDE 'admin/footer.html' %]
diff --git a/templates/web/base/admin/user-form.html b/templates/web/base/admin/user-form.html
index 40e0b510a..1dfd35cee 100644
--- a/templates/web/base/admin/user-form.html
+++ b/templates/web/base/admin/user-form.html
@@ -16,12 +16,12 @@
             </p>
           </div>
           <label for="name">[% loc('Name:') %]</label>
-          <input type='text' name='name' id='name' value='[% user.name | html %]'>
+          <input type='text' class="form-control" name='name' id='name' value='[% user.name | html %]'>
         </li>
         <li><label for="email">[% loc('Email:') %]</label>
-        <input type='text' id='email' name='email' value='[% user.email | html %]'></li>
+        <input type='text' class="form-control" id='email' name='email' value='[% user.email | html %]'></li>
         <li><label for="phone">[% loc('Phone:') %]</label>
-        <input type='text' id='phone' name='phone' value='[% user.phone | html %]'></li>
+        <input type='text' class="form-control" id='phone' name='phone' value='[% user.phone | html %]'></li>
 
         [% IF c.user.is_superuser || c.cobrand.moniker == 'zurich' %]
           <li>
@@ -35,7 +35,7 @@
                 %]
               </p>
             </div>
-            [% loc('Body:') %] <select id='body' name='body'>
+            [% loc('Body:') %] <select class="form-control" id='body' name='body'>
               <option value=''>[% loc('No body') %]</option>
           [% FOR body IN bodies %]
               <option value="[% body.id %]"[% ' selected data-originally-selected' IF body.id == user.from_body.id %]>[% body.name %]</option>
@@ -64,7 +64,7 @@
               </p>
             </div>
             [% loc('Area:') %]
-            <select id='area_id' name='area_id' [% 'disabled' UNLESS c.user.has_permission_to('user_assign_areas', user.from_body.id) %]>
+            <select class="form-control" id='area_id' name='area_id' [% 'disabled' UNLESS c.user.has_permission_to('user_assign_areas', user.from_body.id) %]>
               <option value=''>[% loc('No area') %]</option>
               [% FOREACH area IN areas %]
                 <option value="[% area.id %]"[% ' selected' IF area.id == user.area_id %]>[% area.name | html %]</option>
@@ -98,7 +98,7 @@
             </div>
             [% IF c.user.is_superuser %]
               [% loc('Trusted by bodies:') %]<br />
-              <select id='body' name='trusted_bodies' multiple>
+              <select class="form-control" id='body' name='trusted_bodies' multiple>
                 [% FOR body IN bodies %]
                   <option value="[% body.id %]"[% ' selected' IF user.has_permission_to('trusted', body.id) %]>[% body.name %]</option>
                 [% END %]
@@ -151,5 +151,5 @@
         [% END %]
       [% END %]
     </ul>
-    <input type="submit" name="Submit changes" value="[% loc('Submit changes') %]" >
+    <input type="submit" class="btn" name="Submit changes" value="[% loc('Submit changes') %]" >
 </form>
diff --git a/templates/web/base/auth/change_email.html b/templates/web/base/auth/change_email.html
index 471782e42..a444b8c31 100644
--- a/templates/web/base/auth/change_email.html
+++ b/templates/web/base/auth/change_email.html
@@ -27,7 +27,7 @@
         <input class="form-control" type="email" name="email" id="email" value="[% email | html %]">
     </div>
     <div class="final-submit">
-        <input type="submit" value="[% loc('Change email address') %]">
+        <input type="submit" class="btn" value="[% loc('Change email address') %]">
     </div>
 
     </fieldset>
diff --git a/templates/web/base/auth/change_password.html b/templates/web/base/auth/change_password.html
index 50ecc93a2..094d131eb 100644
--- a/templates/web/base/auth/change_password.html
+++ b/templates/web/base/auth/change_password.html
@@ -40,7 +40,7 @@ INCLUDE 'header.html', title = loc('Change password'), bodyclass = bclass
         <input class="form-control" type="password" name="confirm" value="[% confirm | html %]">
     </div>
     <div class="final-submit">
-        <input type="submit" value="[% loc('Change password') %]">
+        <input type="submit" class="btn" value="[% loc('Change password') %]">
     </div>
 
     </fieldset>
diff --git a/templates/web/base/dashboard/index.html b/templates/web/base/dashboard/index.html
index c0f94ce56..1af507569 100644
--- a/templates/web/base/dashboard/index.html
+++ b/templates/web/base/dashboard/index.html
@@ -19,7 +19,7 @@
 <div class="filters">
     <p>
         <label for="ward">Ward:</label>
-        <select name="ward"><option value=''>All</option>
+        <select class="form-control" name="ward"><option value=''>All</option>
             [% FOR w IN children.values.sort('name') %]
                 <option value="[% w.id %]"[% ' selected' IF w.id == ward %]>[% w.name %]</option>
             [% END %]
@@ -28,7 +28,7 @@
 
     <p>
         <label for="category">Report category:</label>
-        <select name="category"><option value=''>All</option>
+        <select class="form-control" name="category"><option value=''>All</option>
             [% FOR cat_op IN category_options %]
                 <option value='[% cat_op | html %]'[% ' selected' IF category == cat_op %]>[% cat_op | html %]</option>
             [% END %]
@@ -36,7 +36,7 @@
     </p>
 
     <p>
-        <input type="submit" value="Look up">
+        <input type="submit" class="btn" value="Look up">
     </p>
 
     <br clear="all" />
@@ -135,7 +135,7 @@
 <h2>Reports</h2>
 
                 </select>
-<p>Report state: <select name="state">
+<p>Report state: <select class="form-control" name="state">
 <option value=''>All</option>
                 [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating',
                 loc('Investigating')], ['action scheduled', loc('Planned')], ['in progress',
@@ -143,7 +143,7 @@
                     <option [% 'selected ' IF state.0 == q_state %] value="[% state.0 %]">[% state.1 %]</option>
                 [% END %]
 </select>
-<input type="submit" value="Look up">
+<input type="submit" class="btn" value="Look up">
 <a class="export_as_csv" href="[% c.req.uri_with({ export => 1 }) %]">Export as CSV</a>
 
 <table width="100%" id="reports">
diff --git a/templates/web/base/questionnaire/creator_fixed.html b/templates/web/base/questionnaire/creator_fixed.html
index 5b6d1254a..bcd9a9514 100644
--- a/templates/web/base/questionnaire/creator_fixed.html
+++ b/templates/web/base/questionnaire/creator_fixed.html
@@ -16,7 +16,7 @@
 <label class="inline" for="reported_no">[% loc('No') %]</label>
 </p>
 
-<p><input type="submit" name="submit" value="[% loc('Submit') %]"></p>
+<p><input type="submit" class="btn" name="submit" value="[% loc('Submit') %]"></p>
 
 </form>
 
diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html
index 217bd827e..5e6cef3b7 100644
--- a/templates/web/base/questionnaire/index.html
+++ b/templates/web/base/questionnaire/index.html
@@ -107,7 +107,7 @@
     </p>
 </div>
 
-<p><input type="submit" name="submit" value="[% loc('Submit questionnaire') %]"></p>
+<p><input type="submit" class="btn" name="submit" value="[% loc('Submit questionnaire') %]"></p>
 
 </form>
 
diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html
index b24158f09..20982c30c 100644
--- a/templates/web/base/report/_main.html
+++ b/templates/web/base/report/_main.html
@@ -46,7 +46,7 @@
             Revert to original title
         </label>
       [% END %]
-        <h1><input type="text" name="problem_title" value="[% problem.title | html %]" data-original-value="[% original.title | html %]"></h1>
+        <h1><input class="form-control" type="text" name="problem_title" value="[% problem.title | html %]" data-original-value="[% original.title | html %]"></h1>
     </div>
   [% END %]
 
@@ -91,7 +91,7 @@
             Revert to original text
         </label>
       [% END %]
-        <textarea name="problem_detail" data-original-value="[% original.detail | html %]">[% problem.detail | html %]</textarea>
+        <textarea class="form-control" name="problem_detail" data-original-value="[% original.detail | html %]">[% problem.detail | html %]</textarea>
     </p>
 
     <div class="moderate-edit">
@@ -103,7 +103,7 @@
         </p>
         <p>
             <label for="moderation_reason">Moderation reason:</label>
-            <input type="text" name="moderation_reason" placeholder="Describe why you are moderating this">
+            <input type="text" class="form-control" name="moderation_reason" placeholder="Describe why you are moderating this">
         </p>
         <p>
             <input type="submit" class="green-btn" value="Save changes">
diff --git a/templates/web/base/report/display_tools.html b/templates/web/base/report/display_tools.html
index 052ffb8a5..5279829e9 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" data-confirm="[% loc('Are you sure?') %]" value="[% loc('Remove from site') %]">
+            <input type="submit" id="key-tool-report-abuse" class="abuse btn" data-confirm="[% loc('Are you sure?') %]" value="[% loc('Remove from site') %]">
         </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 } ) %]">[% loc('Report abuse' ) %]</a></li>
@@ -43,7 +43,7 @@
         <fieldset>
         <label class="hidden n" for="alert_rznvy">[% loc('Your email') %]</label>
         <div class="form-txt-submit-box">
-            <input type="email" name="rznvy" id="alert_rznvy" value="[% email | html %]" size="30" placeholder="[% loc('Your email') %]">
+            <input type="email" class="form-control" name="rznvy" id="alert_rznvy" value="[% email | html %]" size="30" placeholder="[% loc('Your email') %]">
             <input class="green-btn" type="submit" value="[% loc('Subscribe') %]">
         </div>
         <input type="hidden" name="token" value="[% csrf_token %]">
diff --git a/templates/web/base/report/update.html b/templates/web/base/report/update.html
index 104e1d6f9..0c85c132b 100644
--- a/templates/web/base/report/update.html
+++ b/templates/web/base/report/update.html
@@ -39,7 +39,7 @@
                         <label><input type="checkbox" name="update_revert_detail" class="revert-textarea">
                         Revert to original</label>
                         [% END %]
-                        <textarea name="update_detail">[% update.text | add_links %]</textarea>
+                        <textarea class="form-control" name="update_detail">[% update.text | add_links %]</textarea>
                     </div>
                     [% END %]
 
@@ -55,7 +55,7 @@
             [% IF moderating %]
                 <div class="moderate-edit">
                     <label for="moderation_reason">Moderation reason:</label>
-                    <input type="text" name="moderation_reason" 
+                    <input type="text" class="form-control" name="moderation_reason"
                         placeholder="Describe why you are moderating this">
                     <input type="submit" class="red-btn" value="Save changes">
                     <input type="button" class="btn cancel" value="Discard changes">
diff --git a/templates/web/base/report/update/form_update.html b/templates/web/base/report/update/form_update.html
index 55125ba4b..a3d4615e1 100644
--- a/templates/web/base/report/update/form_update.html
+++ b/templates/web/base/report/update/form_update.html
@@ -33,11 +33,11 @@
 [% IF field_errors.update %]
     <div class='form-error'>[% field_errors.update %]</div>
 [% END %]
-<textarea rows="7" cols="30" name="update" id="form_update" placeholder="[% loc('Please write your update here') %]" required>[% update.text | html %]</textarea>
+<textarea rows="7" cols="30" name="update" class="form-control" id="form_update" placeholder="[% loc('Please write your update here') %]" required>[% update.text | html %]</textarea>
 
 [% IF c.user && c.user.belongs_to_body( problem.bodies_str ) %]
     <label for="form_state">[% loc( 'State' ) %]</label>
-    <select name="state" id="form_state">
+    <select name="state" id="form_state" class="form-control">
     [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating',
     loc('Investigating')], ['action scheduled', loc('Action Scheduled')],
     ['in progress', loc('In Progress')], ['duplicate', loc('Duplicate')],
diff --git a/templates/web/base/report/update/form_user_loggedout_by_email.html b/templates/web/base/report/update/form_user_loggedout_by_email.html
index aae37502b..04a842bef 100644
--- a/templates/web/base/report/update/form_user_loggedout_by_email.html
+++ b/templates/web/base/report/update/form_user_loggedout_by_email.html
@@ -2,7 +2,7 @@
     <h5>[% loc('<strong>No</strong> Let me confirm my update by email') %]</h5>
 
     [% INCLUDE 'report/update/form_name.html' %]
-    
+
     <label for="password_register">[% loc('Password (optional)') %]</label>
 
     <div class="general-notes">
@@ -10,7 +10,7 @@
     </div>
 
     <div class="form-txt-submit-box">
-        <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
+        <input type="password" class="form-control" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
         <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Post') %]">
     </div>
 
diff --git a/templates/web/base/report/update/form_user_loggedout_password.html b/templates/web/base/report/update/form_user_loggedout_password.html
index 593ccf3de..d24f8bd15 100644
--- a/templates/web/base/report/update/form_user_loggedout_password.html
+++ b/templates/web/base/report/update/form_user_loggedout_password.html
@@ -6,7 +6,7 @@
         <p class='form-error'>[% field_errors.password %]</p>
     [% END %]
     <div class="form-txt-submit-box">
-        <input type="password" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]">
+        <input type="password" class="form-control" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]">
         <input class="green-btn js-submit_sign_in" type="submit" name="submit_sign_in" value="[% loc('Post') %]">
     </div>
 
diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html
index 0a36d8486..e0452eb08 100644
--- a/templates/web/base/reports/_list-filters.html
+++ b/templates/web/base/reports/_list-filters.html
@@ -1,5 +1,5 @@
 [% select_status = BLOCK %]
-    <select name="status" id="statuses">
+    <select class="form-control" name="status" id="statuses">
         <option value="all"[% ' selected' IF filter_status == 'all' %]>[% loc('all reports') %]</option>
         <option value="open"[% ' selected' IF filter_status == 'open' %]>[% loc('unfixed reports') %]</option>
         <option value="closed"[% ' selected' IF filter_status == 'closed' %]>[% loc('closed reports') %]</option>
@@ -8,7 +8,7 @@
 [% END %]
 
 [% select_category = BLOCK %]
-    <select name="filter_category" id="filter_categories">
+    <select class="form-control" name="filter_category" id="filter_categories">
         <option value="">[% loc('Everything') %]</option>
         [% FOR category IN filter_categories %]
             <option value="[% category | html %]"[% ' selected' IF filter_category == category %]>
diff --git a/templates/web/fixamingata/report/new/form_user_loggedout.html b/templates/web/fixamingata/report/new/form_user_loggedout.html
index c391ce75f..7d5b0bf39 100644
--- a/templates/web/fixamingata/report/new/form_user_loggedout.html
+++ b/templates/web/fixamingata/report/new/form_user_loggedout.html
@@ -18,7 +18,7 @@
             <p class='form-error'>[% field_errors.name %]</p>
         [% END %]
 
-        <input type="text" class="form-focus-trigger validName js-form-name" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]">
+        <input type="text" class="form-control form-focus-trigger validName js-form-name" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]">
 
         [%# if there is nothing in the name field then set check box as default on form %]
         <div class="checkbox-group">
@@ -27,7 +27,7 @@
         </div>
 
         <label for="form_phone">[% loc('Phone number (optional)') %]</label>
-        <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
+        <input type="text" class="form-control" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
 
         <div class="general-notes form-focus-hidden">
             <p>[% loc('We never show your email address or phone number.') %]</p>
@@ -40,7 +40,7 @@
         </div>
 
         <div class="form-txt-submit-box">
-            <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
+            <input type="password" class="form-control" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
         <input class="green-btn js-submit_register" type="submit" name="submit_register" value="[% loc('Submit') %]">
         </div>
     </div>
@@ -53,10 +53,10 @@
             [% IF field_errors.password %]
                 <p class='form-error'>[% field_errors.password %]</p>
             [% END %]
-            <input type="password" name="password_sign_in" id="password_sign_in" placeholder="[% loc('Your password') %]" value="">
+            <input type="password" class="form-control" name="password_sign_in" id="password_sign_in" placeholder="[% loc('Your password') %]" value="">
             <input class="green-btn js-submit_sign_in" type="submit" name="submit_sign_in" value="[% loc('Submit') %]">
         </div>
-        
+
         <div class="checkbox-group">
             <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
             <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
diff --git a/templates/web/seesomething/admin/stats.html b/templates/web/seesomething/admin/stats.html
index 4cf184f4f..155bff472 100644
--- a/templates/web/seesomething/admin/stats.html
+++ b/templates/web/seesomething/admin/stats.html
@@ -9,24 +9,24 @@
 
 <form method="post" action="[% c.uri_for('stats') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8" id="filter-form">
     <label for="form_category">Transport Type: </label>
-    <select name="category" id="form_category">
+    <select class="form-control" name="category" id="form_category">
         <option value="">Select</option>
         [% PROCESS options, option_list = [ 'Bus', 'Metro', 'Train' ], selected = category %]
     </select>
 
     <label for="form_subcategory">Incident Type: </label>
-    <select name="subcategory" id="form_subcategory">
+    <select class="form-control" name="subcategory" id="form_subcategory">
         <option value="">Select</option>
         [% PROCESS options, option_list = ['Smoking', 'Drugs', 'Anti-social Behaviour', 'Loud Music', 'Damage', 'Feet on Seats', 'Other'], selected = subcategory %]
     </select>
 
     <label for="form_service">Device: </label>
-    <select name="service" id="form_service">
+    <select class="form-control" name="service" id="form_service">
         <option value="">Select</option>
         [% PROCESS options, option_list = [ 'Android', 'iPhone' ], selected = service %]
     </select>
 
-    <input type="submit" name="getcounts"  size="30" id="getcounts" value="Look Up" />
+    <input type="submit" class="btn" name="getcounts"  size="30" id="getcounts" value="Look Up" />
 </form>
 
 [% IF pager.total_entries == 0 %]
diff --git a/templates/web/seesomething/auth/general.html b/templates/web/seesomething/auth/general.html
index 4fe2829d3..09639d15b 100644
--- a/templates/web/seesomething/auth/general.html
+++ b/templates/web/seesomething/auth/general.html
@@ -23,11 +23,11 @@
         [% ELSIF sign_in_error %]
             <div class="form-error">[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form.') %]</div>
         [% END %]
-        <input type="email" class="required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]">
+        <input type="email" class="form-control required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]">
 
         <div class="form-txt-submit-box">
             <label class="n" for="password_sign_in">Password</label>
-            <input type="password" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]">
+            <input type="password" class="form-control" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]">
         </div>
 
         <div class="form-txt-submit-box">
diff --git a/templates/web/seesomething/report/new/fill_in_details_form.html b/templates/web/seesomething/report/new/fill_in_details_form.html
index 54977f141..21b51384b 100644
--- a/templates/web/seesomething/report/new/fill_in_details_form.html
+++ b/templates/web/seesomething/report/new/fill_in_details_form.html
@@ -17,12 +17,12 @@
             [% IF field_errors.detail %]
                 <p class='form-error'>[% field_errors.detail %]</p>
             [% END %]
-            <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea>
+            <textarea class="form-control" rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea>
 
             [% IF js %]
                 <div id="form_category_row">
                     <label for="form_category">[% loc('Transport Category') %]</label>
-                    <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select>
+                    <select class="form-control" name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select>
                 </div>
             [% ELSE %]
                 [% IF category_options.size %]
@@ -36,7 +36,7 @@
 
             <div id="form_subcategory_row">
                 <label for="form_subcategory">[% loc('Incident Category') %]</label>
-                <select name="subcategory" id="form_subcategory" required>
+                <select class="form-control" name="subcategory" id="form_subcategory" required>
                     <option value="">-- Pick a category --</option>
                     <option value="Smoking/other drugs">Smoking/other drugs</option>
                     <option value="Drugs">Drugs</option>
@@ -78,18 +78,18 @@
                 <p class='form-error'>[% field_errors.name %]</p>
             [% END %]
 
-            <input type="text" class="form-focus-trigger validName js-form-name" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]">
+            <input type="text" class="form-control form-focus-trigger validName js-form-name" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]">
 
             <label for="form_email">[% loc('Your email (optional)') %]</label>
             [% IF field_errors.email %]
                 <p class='form-error'>[% field_errors.email %]</p>
             [% END %]
-            <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]">
+            <input type="email" class="form-control" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]">
 
 
 
-            <label class="" for="form_phone">[% loc('Phone number (optional)') %]</label>
-            <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
+            <label for="form_phone">[% loc('Phone number (optional)') %]</label>
+            <input type="text" class="form-control" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
 
             <div class="form-txt-submit-box ">
                 <input class="green-btn" type="submit" id="submit_noname" name="submit_noname" value="[% loc('Submit') %]">
diff --git a/templates/web/zurich/admin/body-form.html b/templates/web/zurich/admin/body-form.html
index 966bdf799..de9fac0e2 100644
--- a/templates/web/zurich/admin/body-form.html
+++ b/templates/web/zurich/admin/body-form.html
@@ -2,17 +2,17 @@
 
     <p>
         <label for="name">[% loc('Name') %]</label>
-        <input type="text" name="name" id="name" value="[% body.name %]" size="50">
+        <input type="text" class="form-control" name="name" id="name" value="[% body.name %]" size="50">
     </p>
 
     <p>
         <label for="email">[% loc('Email') %]</label>
-        <input type="text" name="endpoint" id="email" value="[% body.endpoint %]" size="50">
+        <input type="text" class="form-control" name="endpoint" id="email" value="[% body.endpoint %]" size="50">
     </p>
 
     <p>
         <label for="parent">[% loc('Parent') %]</label>
-        <select name="parent" id="parent">
+        <select class="form-control" name="parent" id="parent">
             <option value=""> -- [% loc('Select a body') %] -- </option>
             [% FOR b IN bodies %]
             <option value="[% b.id %]"[% ' selected' IF body.parent.id == b.id %]>[% b.name %]</option>
@@ -22,7 +22,7 @@
 
     <p>
         <label for="area_ids">[% loc('Area covered') %]</label>
-        <select name="area_ids" id="area_ids" multiple>
+        <select class="form-control" name="area_ids" id="area_ids" multiple>
             <option value=""> -- [% loc('Select an area') %] -- </option>
             [% SET body_areas = body.areas %]
             [% FOR area IN areas %]
@@ -49,7 +49,7 @@
     <input type="hidden" name="posted" value="body">
     <input type="hidden" name="token" value="[% csrf_token %]">
     <p>
-    <input type="submit" value="[% body ? loc('Update body') : loc('Add body') %]">
+    <input type="submit" class="btn" value="[% body ? loc('Update body') : loc('Add body') %]">
     </p>
     </form>
 
diff --git a/templates/web/zurich/admin/body.html b/templates/web/zurich/admin/body.html
index 1a156773d..435f42885 100644
--- a/templates/web/zurich/admin/body.html
+++ b/templates/web/zurich/admin/body.html
@@ -40,23 +40,26 @@
     <form method="post" action="[% c.uri_for('body', body_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
 
         <p>
-          <strong>[% loc('Category:') %] </strong><input type="text" name="category" size="30" value="[% contact.category | html %]">
+        <strong>[% loc('Category:') %] </strong>
+        <input type="text" class="form-control" name="category" size="30" value="[% contact.category | html %]">
         </p>
 
         <p>
-        <strong>[% loc('Email:') %] </strong><input type="text" name="email" size="30" value="[% contact.email | html %]">
+        <strong>[% loc('Email:') %] </strong>
+        <input type="text" class="form-control" name="email" size="30" value="[% contact.email | html %]">
         </p>
 
-        <input type="hidden" name="confirmed" value="1" id="confirmed"> 
+        <input type="hidden" name="confirmed" value="1" id="confirmed">
 
         <p>
-        <strong>[% loc('Note:') %] </strong> <textarea name="note" rows="3" cols="40"></textarea>
+        <strong>[% loc('Note:') %] </strong>
+        <textarea class="form-control" name="note" rows="3" cols="40"></textarea>
         </p>
 
         <p>
         <input type="hidden" name="posted" value="new" >
         <input type="hidden" name="token" value="[% csrf_token %]" >
-        <input type="submit" name="Create category" value="[% errors ? loc('Save changes') : loc('Create category') %]">
+        <input type="submit" class="btn" name="Create category" value="[% errors ? loc('Save changes') : loc('Create category') %]">
         </p>
 
         <div>
diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html
index 509ddfd7c..3df9459f9 100644
--- a/templates/web/zurich/admin/report_edit-sdm.html
+++ b/templates/web/zurich/admin/report_edit-sdm.html
@@ -101,28 +101,28 @@
 
 <div class="admin-report-edit admin-report-edit--interact">
 
-<p align="right" class="screen-only"><input type="submit" name="send_back" value="[% loc('Not for my subdivision') %]"></p>
-<p align="right" class="screen-only"><input type="submit" name="not_contactable" value="[% loc('Customer not contactable') %]"></p>
+<p align="right" class="screen-only"><input type="submit" class="btn" name="send_back" value="[% loc('Not for my subdivision') %]"></p>
+<p align="right" class="screen-only"><input type="submit" class="btn" name="not_contactable" value="[% loc('Customer not contactable') %]"></p>
 
 <ul class="no-bullets screen-only">
     <li>
         <label for="new_internal_note">[% loc('New internal note:') %]</label>
-        <textarea name='new_internal_note' id='new_internal_note' cols=60 rows=4></textarea>
+        <textarea class="form-control" name='new_internal_note' id='new_internal_note' cols=60 rows=4></textarea>
     </li>
     <li>
         <label for="status_update">[% loc('New note to DM:') %]</label>
-        <textarea name='status_update' id='status_update' cols=60 rows=4></textarea>
+        <textarea class="form-control" name='status_update' id='status_update' cols=60 rows=4></textarea>
     </li>
 </ul>
 
 <p class="screen-only">
     <label for="time_spent">[% loc('Time spent (in minutes):') %]</label>
-    <input type="text" name="time_spent" id="form_time_spent" style="width: 4em" value="0">
+    <input type="text" class="form-control" name="time_spent" id="form_time_spent" style="width: 4em" value="0">
 </p>
 
 <p class="clearfix screen-only">
-    <input style="float:left" type="submit" name="Submit changes" value="[% loc('Submit changes') %]" >
-    <input style="float:right" type="submit" name="no_more_updates" value="[% loc('No further updates') %]">
+    <input style="float:left" type="submit" class="btn" name="Submit changes" value="[% loc('Submit changes') %]" >
+    <input style="float:right" type="submit" class="btn" name="no_more_updates" value="[% loc('No further updates') %]">
 </p>
 
 [% INCLUDE 'admin/list_updates.html' %]
diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html
index 4ef55e75a..ec65cf99f 100644
--- a/templates/web/zurich/admin/report_edit.html
+++ b/templates/web/zurich/admin/report_edit.html
@@ -39,11 +39,11 @@
   [% ELSE %]
 
     <dt><label for='title'>[% loc('Subject:') %]</label></dt>
-    <dd class="screen-only"><input size=60 type='text' id='title' name='title' value='[% problem.title | html %]'></dd>
+    <dd class="screen-only"><input size=60 type='text' class="form-control" id='title' name='title' value='[% problem.title | html %]'></dd>
     <dd class="print-only">[% problem.title | html %]</dd>
 
     <dt><label for='detail'>[% loc('Details:') %]</label></dt>
-    <dd class="screen-only"><textarea name='detail' id='detail' cols=60 rows=4>[% problem.detail | html %]</textarea></dd>
+    <dd class="screen-only"><textarea name='detail' class="form-control" id='detail' cols=60 rows=4>[% problem.detail | html %]</textarea></dd>
     <dd class="print-only">[% problem.detail | html %]</dd>
 
     [% IF problem.extra.original_detail %]
@@ -137,21 +137,21 @@
         <label for="new_internal_note">[% loc('New internal note:') %]</label>
     </dt>
     <dd class="screen-only">
-        <textarea name='new_internal_note' id='new_internal_note' cols=60 rows=4>[% new_internal_note | html %]</textarea>
+        <textarea class="form-control" name='new_internal_note' id='new_internal_note' cols=60 rows=4>[% new_internal_note | html %]</textarea>
     </dd>
 
     <dt class="screen-only">
         <label for="time_spent">[% loc('Time spent (in minutes):') %]</label>
     </dt>
     <dd class="screen-only">
-      <input type="text" name="time_spent" id="form_time_spent" style="width: 4em" value="0">
+      <input type="text" class="form-control" name="time_spent" id="form_time_spent" style="width: 4em" value="0">
     </dd>
 
     <dt class="screen-only">
         <span class="mock-label">[% loc('State:') %]</span>
     </dt>
     <dd class="screen-only">
-        <select name="state"  id="state" data-pstate="[% pstate %]">
+        <select class="form-control" name="state"  id="state" data-pstate="[% pstate %]">
             <option value="">--</option>
           [% FOREACH s IN states %]
             <option [% 'selected ' IF s.state == pstate %] value="[% s.state %]">[% s.trans %]</option>
@@ -167,7 +167,7 @@
     <li class="assignation">
         <div id="assignation__category">
             <label for="category">[% loc('Assign to different category:') %]</label>
-            <select name="category" id="category">
+            <select class="form-control" name="category" id="category">
                 <option value="">--</option>
               [% FOREACH cat IN categories %]
                 <option value="[% cat %]">[% cat %]</option>
@@ -184,7 +184,7 @@
   [% IF admin_type != 'super' AND list %]
     <li class="assignation" id="assignation__subdivision">
         <label for="body_subdivision">[% loc('Assign to subdivision:') %]</label>
-        <select name="body_subdivision" id="body_subdivision" class="assignation__select">
+        <select name="body_subdivision" id="body_subdivision" class="form-control assignation__select">
             <option value="">--</option>
             [% list %]
         </select>
@@ -209,7 +209,7 @@
                 [% loc('Assign to competent body:') %]
               [% END %]
             </label>
-            <select name="body_external" id="body_external">
+            <select class="form-control" name="body_external" id="body_external">
                 <option value="">--</option>
               [% FOR body IN bodies %]
                 [% NEXT IF body.parent OR body.bodies OR body.deleted %]
@@ -225,7 +225,7 @@
         </li>
         <li>
             [% INCLUDE 'admin/response_templates_select.html' for='external_body' %]
-            <textarea name='external_message' id='external_body' cols=60 rows=5>[% problem.get_extra_metadata('external_message') | html %]</textarea>
+            <textarea class="form-control" name='external_message' id='external_body' cols=60 rows=5>[% problem.get_extra_metadata('external_message') | html %]</textarea>
         </li>
         </ul>
     [% END %]
@@ -242,7 +242,7 @@
         [% END %]
         </label>
         [% INCLUDE 'admin/response_templates_select.html' for='status_update' %]
-        <textarea name='status_update' id='status_update' cols=60 rows=5>
+        <textarea class="form-control" name='status_update' id='status_update' cols=60 rows=5>
         [%- problem.extra.public_response || default_public_response | html -%]
         </textarea>
         </li>
@@ -256,12 +256,12 @@
       # only a private email will be sent to the user.  However, in all cases,
       # this is the end of processing, so we mark this with the same text used
       # for 'No further updates %]
-    <input type="submit" name="publish_response" value="[% loc('No further updates') %]">
+    <input type="submit" class="btn" name="publish_response" value="[% loc('No further updates') %]">
   [% END %]
 
     [%# This button simply saves changes, but does NOT close the report (though
       # it may trigger other workflow %]
-    <input type="submit" name="Submit changes" value="[% loc('Submit changes') %]" >
+    <input type="submit" class="btn" name="Submit changes" value="[% loc('Submit changes') %]" >
 </p>
 
 [% IF c.cobrand.problem_has_public_response(problem) || c.cobrand.problem_has_user_response(problem) %]
diff --git a/templates/web/zurich/admin/stats.html b/templates/web/zurich/admin/stats.html
index fa8104496..ce8e238f7 100644
--- a/templates/web/zurich/admin/stats.html
+++ b/templates/web/zurich/admin/stats.html
@@ -9,7 +9,7 @@
 [% END %]
 
 <form method="get" action="[% c.uri_for('stats') %]">
-<p><select name="ym">
+<p><select class="form-control" name="ym">
     <option value="">[% loc('All reports') %]</option>
     [% FOR y IN [ 2013 .. date.format(date.now, '%Y') ];
         SET max = 12;
@@ -23,7 +23,7 @@
     [% END %]
 </select>
 
-<input type="submit" value="[% loc('Go') %]">
+<input type="submit" class="btn" value="[% loc('Go') %]">
 </form>
 
 <ul>
diff --git a/templates/web/zurich/admin/template_edit.html b/templates/web/zurich/admin/template_edit.html
index dbad55f08..e954d566c 100644
--- a/templates/web/zurich/admin/template_edit.html
+++ b/templates/web/zurich/admin/template_edit.html
@@ -18,19 +18,19 @@
 
     <p>
         <strong>[% loc('Title:') %] </strong>
-        <input type="text" name="title" class="required" size="30" value="[% rt.title| html %]">
+        <input type="text" name="title" class="form-control required" size="30" value="[% rt.title| html %]">
     </p>
     <p>
         <strong>[% loc('Text:') %] </strong>
-        <textarea name="text" class="required">[% rt.text |html %]</textarea> 
+        <textarea name="text" class="form-control required">[% rt.text |html %]</textarea>
     </p>
     <p>
     <input type="hidden" name="token" value="[% csrf_token %]" >
-    <input type="submit" name="Edit templates" value="[% rt.id ? loc('Save changes') : loc('Create template') %]" >
+    <input type="submit" class="btn" name="Edit templates" value="[% rt.id ? loc('Save changes') : loc('Create template') %]" >
     </p>
     [% IF rt.id %]
         <p>
-            <input class="delete" type="submit" name="delete_template" value="[% loc('Delete template') %]">
+            <input class="delete btn-danger" type="submit" name="delete_template" value="[% loc('Delete template') %]">
         </p>
     [% END %]
 </form>
diff --git a/templates/web/zurich/admin/update_edit.html b/templates/web/zurich/admin/update_edit.html
index adafff3a8..b2cde0b92 100644
--- a/templates/web/zurich/admin/update_edit.html
+++ b/templates/web/zurich/admin/update_edit.html
@@ -10,11 +10,11 @@
 <li><a href="[% c.uri_for_email( '/report', update.problem_id ) %]#update_[% update.id %]">[% loc('View report on site' )%]</a></li>
 
 <li><label for='detail'>[% loc('Text:') %]</label>
-<textarea name='text' id='text' cols=60 rows=5>[% update.text | html %]</textarea></li>
+<textarea class="form-control" name='text' id='text' cols=60 rows=5>[% update.text | html %]</textarea></li>
 
 <input type="hidden" name="anonymous" value="[% update.anonymous %]">
 
-<li>[% loc('State:') %] <select name="state"  id="state">
+<li>[% loc('State:') %] <select class="form-control" name="state" id="state">
     [% FOREACH state IN [ ['confirmed', loc('Open')], ['hidden', loc('Hidden')], ['unconfirmed',loc('Unconfirmed')] ] %]
         <option [% 'selected ' IF state.0 == update.state %] value="[% state.0 %]">[% state.1 %]</option>
     [% END %]
@@ -35,6 +35,6 @@
 <label for="remove_photo" class="inline">[% loc("Remove photo (can't be undone!)") %]</label></li>
 [% END %]
 </ul>
-<input type="submit" name="Submit changes" value="[% loc('Submit changes') %]" ></form>
+<input type="submit" class="btn" name="Submit changes" value="[% loc('Submit changes') %]" ></form>
 
 [% INCLUDE 'admin/footer.html' %]
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 87cadefed..612d8cf55 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -246,7 +246,7 @@ textarea {
 
 textarea {
   line-height: 1.5em;
-  min-height: 8em;
+  min-height: 5em;
 }
 
 label{
@@ -285,6 +285,10 @@ label{
 select.form-control {
     box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
     height: 2.2em; // roughly equal to default input height
+
+    &[multiple] {
+        height: auto;
+    }
 }
 
 .form-section-heading {