Merge branch 'issues/#805-name-check-cobrand'

85 files changed, 123 insertions, 237 deletions

diff --git a/.travis.yml b/.travis.yml
index b162c4c06..1f8e95d58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,9 @@ notifications:
       - "irc.mysociety.org#fixmystreet"
     use_notice: true
     skip_join: true
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/863c1892a6a51e5a3b3c
 
 language: perl
 perl:
diff --git a/perllib/FixMyStreet/Cobrand/UK.pm b/perllib/FixMyStreet/Cobrand/UK.pm
index b293c3568..2473f386f 100644
--- a/perllib/FixMyStreet/Cobrand/UK.pm
+++ b/perllib/FixMyStreet/Cobrand/UK.pm
@@ -302,5 +302,38 @@ sub council_rss_alert_options {
     return ( \@options, @reported_to_options ? \@reported_to_options : undef );
 }
 
+sub report_check_for_errors {
+    my $self = shift;
+    my $c = shift;
+
+    my %errors = $self->next::method($c);
+
+    my $report = $c->stash->{report};
+
+    if (!$errors{name} && (length($report->name) < 5
+        || $report->name !~ m/\s/
+        || $report->name =~ m/\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i))
+    {
+        $errors{name} = _(
+'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below'
+        );
+    }
+
+    # XXX Hardcoded body ID matching mapit area ID
+    if ( $report->bodies_str && $report->detail ) {
+        # Custom character limit:
+        # Bromley Council
+        if ( $report->bodies_str eq '2482' && length($report->detail) > 1750 ) {
+            $errors{detail} = sprintf( _('Reports are limited to %s characters in length. Please shorten your report'), 1750 );
+        }
+        # Oxfordshire
+        if ( $report->bodies_str eq '2237' && length($report->detail) > 1700 ) {
+            $errors{detail} = sprintf( _('Reports are limited to %s characters in length. Please shorten your report'), 1700 );
+        }
+    }
+
+    return %errors;
+}
+
 1;
 
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index e55c26cd8..bed2f160a 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -405,14 +405,6 @@ sub check_for_errors {
     if ( !$self->name || $self->name !~ m/\S/ ) {
         $errors{name} = _('Please enter your name');
     }
-    elsif (length( $self->name ) < 5
-        || $self->name !~ m/\s/
-        || $self->name =~ m/\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i )
-    {
-        $errors{name} = _(
-'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below'
-        ) unless $self->cobrand eq 'emptyhomes';
-    }
 
     if (   $self->category
         && $self->category eq _('-- Pick a category --') )
@@ -427,18 +419,6 @@ sub check_for_errors {
         $self->category(undef);
     }
 
-    if ( $self->bodies_str && $self->detail ) {
-        # Custom character limit:
-        # Bromley Council
-        if ( $self->bodies_str eq '2482' && length($self->detail) > 1750 ) {
-            $errors{detail} = sprintf( _('Reports are limited to %s characters in length. Please shorten your report'), 1750 );
-        }
-        # Oxfordshire
-        if ( $self->bodies_str eq '2237' && length($self->detail) > 1700 ) {
-            $errors{detail} = sprintf( _('Reports are limited to %s characters in length. Please shorten your report'), 1700 );
-        }
-    }
-
     return \%errors;
 }
 
diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm
index 6a93f97ec..f08b666c8 100644
--- a/perllib/FixMyStreet/DB/Result/User.pm
+++ b/perllib/FixMyStreet/DB/Result/User.pm
@@ -100,7 +100,7 @@ use mySociety::EmailUtil;
 
 =head2 check_for_errors
 
-    $error_hashref = $problem->check_for_errors();
+    $error_hashref = $user->check_for_errors();
 
 Look at all the fields and return a hashref with all errors found, keyed on the
 field name. This is intended to be passed back to the form to display the
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index 1b6488fc7..ad82a62a5 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -67,30 +67,6 @@ for my $test (
         }
     },
     {
-        desc => 'name too short',
-        changed => {
-            name => 'xx',
-        },
-        errors => {
-            title => 'Please enter a subject',
-            detail => 'Please enter some details',
-            bodies => 'No council selected',
-            name => 'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below',
-        }
-    },
-    {
-        desc => 'name is anonymous',
-        changed => {
-            name => 'anonymous',
-        },
-        errors => {
-            title => 'Please enter a subject',
-            detail => 'Please enter some details',
-            bodies => 'No council selected',
-            name => 'Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below',
-        }
-    },
-    {
         desc => 'correct name',
         changed => {
             name => 'A User',
diff --git a/templates/web/barnet/header.html b/templates/web/barnet/header.html
index 0227ceff8..101d444a7 100644
--- a/templates/web/barnet/header.html
+++ b/templates/web/barnet/header.html
@@ -33,6 +33,8 @@
         [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
         <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script>
 
+        [% PROCESS 'header_extra.html' %]
+
     </head>
     <body class="[% bodyclass | html IF bodyclass %]">
         <div id="barnet-wrapper">
diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html
index 4f885f513..9559592ff 100644
--- a/templates/web/bromley/header.html
+++ b/templates/web/bromley/header.html
@@ -40,6 +40,8 @@
 
 	<link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/bromley/favicon.ico">
 
+        [% PROCESS 'header_extra.html' %]
+
     </head>
     <body class="[% bodyclass | html IF bodyclass %]">
         [%# ie_wrapper is to prevent a horizontal scrollbar in IE7, it appears (from Bromley site) %]
diff --git a/templates/web/fixmystreet-uk-councils/header_extra.html b/templates/web/fixmystreet-uk-councils/header_extra.html
new file mode 100644
index 000000000..9e614f177
--- /dev/null
+++ b/templates/web/fixmystreet-uk-councils/header_extra.html
@@ -0,0 +1 @@
+<script src="[% start %][% version('/cobrands/fixmystreet-uk-councils/js.js') %]"></script>
diff --git a/templates/web/fixmystreet.com/around/postcode_form.html b/templates/web/fixmystreet.com/around/postcode_form.html
deleted file mode 100644
index afb3b66fb..000000000
--- a/templates/web/fixmystreet.com/around/postcode_form.html
+++ /dev/null
@@ -1,48 +0,0 @@
-[%# Identical to parent, but with an extra div and javascript for our homepage A/B test %]
-
-<div id="front-main">
-    <div id="front-main-container">
-        [% INCLUDE 'around/intro.html' %]
-
-        <div id="homepage-ab-test">
-            <p><a id="cta-report">Report a problem</a></p>
-            <p><a id="cta-view">Or view problems in an area you know</a></p>
-        </div>
-
-        [%
-            question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area');
-        %]
-        <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm">
-            <label for="pc">[% question %]:</label>
-            <div>
-                <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]">
-                <input type="submit" value="[% loc('Go') %]" id="sub">
-            </div>
-            [% IF partial_token %]
-                <input type="hidden" name="partial" value="[% partial_token.token %]">
-            [% END %]
-        </form>
-    </div>
-</div>
-
-<script type="text/javascript">
-$(function(){
-  $('#homepage-ab-test a').on('click', function(e){
-      e.preventDefault();
-      $('#homepage-ab-test').fadeOut(250, function(){
-
-        /* fadeIn() normal form, and focus input */
-        $('#postcodeForm').fadeIn(250, function(){
-          $('#pc').focus();
-        });
-
-        /* Can't just fadeIn() because #geolocate_link
-           should have { display: inline-block } */
-        $('#geolocate_link').css({
-          opacity: 0,
-          display: 'inline-block'
-        }).animate({ opacity: 1 }, 250);
-      });
-  });
-});
-</script>
diff --git a/templates/web/fixmystreet.com/header_extra.html b/templates/web/fixmystreet.com/header_extra.html
index 71c3bace5..6d3474c23 100644
--- a/templates/web/fixmystreet.com/header_extra.html
+++ b/templates/web/fixmystreet.com/header_extra.html
@@ -1,25 +1,6 @@
 <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/fixmystreet.com/favicon.ico">
 
-<script src="[% start %][% version('/js/jquery.cookie.min.js') %]" type="text/javascript" charset="utf-8"></script>
-
-[%# We are conducting an A/B experiment on the homepage %]
-[% IF c.req.uri.path == '/' %]
-<script src="//www.google-analytics.com/cx/api.js?experiment=cX9Tbz_VRl-cZDM5WVRgTQ"></script>
-<script>
-var variation = cxApi.chooseVariation(),
-    docElement = document.documentElement,
-    className = docElement.className;
-docElement.className = className + ' ' + 'variant' + variation;
-</script>
-<style>
-html.variant1 #homepage-ab-test {
-    display: block;
-}
-html.variant1 #postcodeForm,
-html.variant1 #front-main a#geolocate_link {
-    display: none;
-}
-</style>
-[% END %]
+<script src="[% start %][% version('/js/jquery.cookie.min.js') %]"></script>
+<script src="[% start %][% version('/cobrands/fixmystreet.com/js.js') %]"></script>
 
 [% INCLUDE 'tracking_code.html' %]
diff --git a/templates/web/fixmystreet.com/next_steps.html b/templates/web/fixmystreet.com/next_steps.html
index 1c286827d..5a26a67fe 100644
--- a/templates/web/fixmystreet.com/next_steps.html
+++ b/templates/web/fixmystreet.com/next_steps.html
@@ -12,8 +12,8 @@
     [% END %]
     <p>[% loc('Download it now, and it’ll be ready to use when you next pick up your phone.') %]</p>
     <p class="next-steps__step__cta">
-      <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545"><img src="/cobrands/fixmystreet/images/next-step-apple.png" alt="Download on the App Store" width="120" height="37"></a>
-      <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet"><img src="/cobrands/fixmystreet/images/next-step-google.png" alt="Android app on Google Play" width="120" height="37"></a>
+      <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545"><img src="/cobrands/fixmystreet.com/images/next-step-apple.png" alt="Download on the App Store" width="120" height="37"></a>
+      <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet"><img src="/cobrands/fixmystreet.com/images/next-step-google.png" alt="Android app on Google Play" width="120" height="37"></a>
     </p>
   </div>
   <div class="next-steps__step next-steps__step--social">
@@ -25,18 +25,18 @@
       <p>[% loc('You know how to get things fixed - now make sure your friends do too.') %]</p>
     [% END %]
     <p class="next-steps__step__cta">
-      <a href="https://twitter.com/intent/tweet?text=[% twitter_comment | uri %]&amp;url=[% share_url | uri %]&amp;related=fixmystreet,mysociety"><img src="/cobrands/fixmystreet/images/next-step-twitter.png" alt="Tweet it" width="120" height="37"></a>
-      <a href="https://www.facebook.com/sharer/sharer.php?u=[% share_url | uri %]"><img src="/cobrands/fixmystreet/images/next-step-facebook.png" alt="Share on Facebook" width="120" height="37"></a>
+      <a href="https://twitter.com/intent/tweet?text=[% twitter_comment | uri %]&amp;url=[% share_url | uri %]&amp;related=fixmystreet,mysociety"><img src="/cobrands/fixmystreet.com/images/next-step-twitter.png" alt="Tweet it" width="120" height="37"></a>
+      <a href="https://www.facebook.com/sharer/sharer.php?u=[% share_url | uri %]"><img src="/cobrands/fixmystreet.com/images/next-step-facebook.png" alt="Share on Facebook" width="120" height="37"></a>
     </p>
   </div>
   <div class="next-steps__step next-steps__step--goodies">
     <h2>[% loc('Free FixMyStreet goodies for you!') %]</h2>
     <a href="/posters">
-      <img src="/cobrands/fixmystreet/images/next-step-goodies.png" alt="" width="105" height="125" class="goodies-preview">
+      <img src="/cobrands/fixmystreet.com/images/next-step-goodies.png" alt="" width="105" height="125" class="goodies-preview">
     </a>
     <p>[% loc('Perfect for civic groups, clubs, and schools.') %]</p>
     <p class="next-steps__step__cta">
-      <a href="/posters"><img src="/cobrands/fixmystreet/images/next-step-download.png" alt="Download" width="120" height="37"></a>
+      <a href="/posters"><img src="/cobrands/fixmystreet.com/images/next-step-download.png" alt="Download" width="120" height="37"></a>
     </p>
   </div>
 </div>
diff --git a/templates/web/fixmystreet.com/static/posters.html b/templates/web/fixmystreet.com/static/posters.html
index 7d60a0e1d..bcf235fa4 100644
--- a/templates/web/fixmystreet.com/static/posters.html
+++ b/templates/web/fixmystreet.com/static/posters.html
@@ -1,5 +1,5 @@
 [% extra_css = BLOCK %]
-    <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/posters.css') %]">
+    <link rel="stylesheet" href="[% version('/cobrands/fixmystreet.com/posters.css') %]">
 [% END %]
 
 [% INCLUDE header.html
@@ -54,7 +54,7 @@ $("[data-goodielink]").on(click, function(e){
 
 <h2 id="activist-pack">The FMS Activist Pack</h2>
 
-<img src="/cobrands/fixmystreet/images/pack-general.jpg" class="pack-preview" alt="">
+<img src="/cobrands/fixmystreet.com/images/pack-general.jpg" class="pack-preview" alt="">
 
 <p>Everything you need to help spread the word about FixMyStreet. Includes:</p>
 
@@ -66,11 +66,11 @@ $("[data-goodielink]").on(click, function(e){
     <li>Ideas for letting more people know about FixMyStreet</li>
 </ul>
 
-<a href="/cobrands/fixmystreet/posters/activist-pack.zip" data-goodielink="activist-pack" class="download-button">Download ZIP file</a>
+<a href="/cobrands/fixmystreet.com/posters/activist-pack.zip" data-goodielink="activist-pack" class="download-button">Download ZIP file</a>
 
 <h2 id="school-pack">Activity Pack for Schools, Brownies, and Scouts</h2>
 
-<img src="/cobrands/fixmystreet/images/pack-schools.jpg" class="pack-preview" alt="">
+<img src="/cobrands/fixmystreet.com/images/pack-schools.jpg" class="pack-preview" alt="">
 
 <p>A special pack with activities suitable for groups of children. Includes:</p>
 
@@ -80,11 +80,11 @@ $("[data-goodielink]").on(click, function(e){
     <li>Ideas for activities</li>
 </ul>
 
-<a href="/cobrands/fixmystreet/posters/schools-clubs-pack.zip" data-goodielink="schools-clubs-pack" class="download-button">Download ZIP file</a>
+<a href="/cobrands/fixmystreet.com/posters/schools-clubs-pack.zip" data-goodielink="schools-clubs-pack" class="download-button">Download ZIP file</a>
 
 <h2 id="community-pack">Community Group Pack</h2>
 
-<img src="/cobrands/fixmystreet/images/pack-community.jpg" class="pack-preview" alt="">
+<img src="/cobrands/fixmystreet.com/images/pack-community.jpg" class="pack-preview" alt="">
 
 <p>Materials for groups of adults who have a particular interest in their local community. Includes:</p>
 
@@ -96,7 +96,7 @@ $("[data-goodielink]").on(click, function(e){
     <li>Instructions for including a feed of local FixMyStreet reports on your site or blog</li>
 </ul>
 
-<a href="/cobrands/fixmystreet/posters/community-group-pack.zip" data-goodielink="community-group-pack" class="download-button">Download ZIP file</a>
+<a href="/cobrands/fixmystreet.com/posters/community-group-pack.zip" data-goodielink="community-group-pack" class="download-button">Download ZIP file</a>
 
 <h2 id="web">Website Badge</h2>
 
@@ -109,24 +109,24 @@ $("[data-goodielink]").on(click, function(e){
 <h2 id="print">Printed Materials</h2>
 
 <ul class="downloads">
-    <li><a href="/cobrands/fixmystreet/posters/fixmystreet-poster-a4.pdf" data-goodielink="fixmystreet-poster-a4">
-        <img src="/cobrands/fixmystreet/images/a4-poster.png" alt="">
+    <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-poster-a4.pdf" data-goodielink="fixmystreet-poster-a4">
+        <img src="/cobrands/fixmystreet.com/images/a4-poster.png" alt="">
         <strong>A4 poster</strong> Ideal for a noticeboard at work, in the library, corner shop… wherever your community will see it.
     </a></li>
-    <li><a href="/cobrands/fixmystreet/posters/fixmystreet-flyers-a5.pdf" data-goodielink="fixmystreet-flyers-a5">
-        <img src="/cobrands/fixmystreet/images/a5-flyers.png" alt="">
+    <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a5.pdf" data-goodielink="fixmystreet-flyers-a5">
+        <img src="/cobrands/fixmystreet.com/images/a5-flyers.png" alt="">
         <strong>A5 flyers (2 to a sheet)</strong> Perfect for handing out to friends or posting to subscribers.
     </a></li>
-    <li><a href="/cobrands/fixmystreet/posters/fixmystreet-flyers-a6.pdf" data-goodielink="fixmystreet-flyers-a6">
-        <img src="/cobrands/fixmystreet/images/a6-flyers.png" alt="">
+    <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a6.pdf" data-goodielink="fixmystreet-flyers-a6">
+        <img src="/cobrands/fixmystreet.com/images/a6-flyers.png" alt="">
         <strong>A6 flyers (4 to a sheet)</strong> Great for cafés, pubs, or meetings.
     </a></li>
-    <li><a href="/cobrands/fixmystreet/posters/fixmystreet-poop-flags.pdf" data-goodielink="fixmystreet-poop-flags">
-        <img src="/cobrands/fixmystreet/images/dog-poop-flags.png" alt="">
+    <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-poop-flags.pdf" data-goodielink="fixmystreet-poop-flags">
+        <img src="/cobrands/fixmystreet.com/images/dog-poop-flags.png" alt="">
         <strong>Doggy poop flags (4 to a sheet)</strong> Take a stand against dog-fouling with our home-made flags. Some assembly required!
     </a></li>
-    <li><a href="/cobrands/fixmystreet/posters/fixmystreet-poop-poster.pdf" data-goodielink="fixmystreet-poop-poster">
-        <img src="/cobrands/fixmystreet/images/dog-poop-poster.png" alt="">
+    <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-poop-poster.pdf" data-goodielink="fixmystreet-poop-poster">
+        <img src="/cobrands/fixmystreet.com/images/dog-poop-poster.png" alt="">
         <strong>A4 &ldquo;We love our street&rsquo; dog poop poster</strong>
     </a></li>
 </ul>
@@ -136,16 +136,16 @@ $("[data-goodielink]").on(click, function(e){
 <p>Ideal for promoting FixMyStreet in your community newsletter or local magazine. Specially designed to stand out, and get your message across!</p>
 
 <ul class="downloads">
-    <li><a href="/cobrands/fixmystreet/posters/fixmystreet-promote-90x130.pdf" data-goodielink="fixmystreet-advert-90x130">
-        <img src="/cobrands/fixmystreet/images/promote-90x130.png" alt="">
+    <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x130.pdf" data-goodielink="fixmystreet-advert-90x130">
+        <img src="/cobrands/fixmystreet.com/images/promote-90x130.png" alt="">
         <strong>Quarter page advert</strong> (9cm wide, 13cm high)
     </a></li>
-    <li><a href="/cobrands/fixmystreet/posters/fixmystreet-promote-90x60.pdf" data-goodielink="fixmystreet-advert-90x60">
-        <img src="/cobrands/fixmystreet/images/promote-90x60.png" alt="">
+    <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x60.pdf" data-goodielink="fixmystreet-advert-90x60">
+        <img src="/cobrands/fixmystreet.com/images/promote-90x60.png" alt="">
         <strong>One-eighth page advert</strong> (9cm wide, 6cm high)
     </a></li>
-    <li><a href="/cobrands/fixmystreet/posters/fixmystreet-promote-40x60.pdf" data-goodielink="fixmystreet-advert-40x60">
-        <img src="/cobrands/fixmystreet/images/promote-40x60.png" alt="">
+    <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-promote-40x60.pdf" data-goodielink="fixmystreet-advert-40x60">
+        <img src="/cobrands/fixmystreet.com/images/promote-40x60.png" alt="">
         <strong>One-sixteenth page advert</strong> (4cm wide, 6cm high)
     </a></li>
 </ul>
diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html
index a1c0ba38a..4fde56e94 100644
--- a/templates/web/fixmystreet/header.html
+++ b/templates/web/fixmystreet/header.html
@@ -12,14 +12,20 @@
         <meta name="mobileoptimized" content="0">
 
         [% INCLUDE 'header_opengraph.html' %]
+        [% SET start = c.config.ADMIN_BASE_URL IF admin;
 
-[% SET start = c.config.ADMIN_BASE_URL IF admin %]
-
-        <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
-        <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
+           # For clarity, the 'fixmystreet' moniker (for fixmystreet.com) puts
+           # it stylesheets under fixmystreet.com
+           IF c.cobrand.moniker == 'fixmystreet';
+               SET css_dir = 'fixmystreet.com';
+           ELSE;
+               SET css_dir = c.cobrand.moniker;
+           END %]
+        <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/base.css') %]">
+        <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]" media="(min-width:48em)">
         [% extra_css %]
         <!--[if (lt IE 9) & (!IEMobile)]>
-            <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
+            <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]">
         <![endif]-->
 
         <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
diff --git a/templates/web/harrogate/header.html b/templates/web/harrogate/header.html
index a1c0ba38a..e40a38d94 100644
--- a/templates/web/harrogate/header.html
+++ b/templates/web/harrogate/header.html
@@ -31,7 +31,7 @@
             <link rel="canonical" href="https://www.fixmystreet.com[% c.req.uri.path_query %]">
         [% END %]
 
-        [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %]
+        [% PROCESS 'header_extra.html' %]
 
     </head>
     [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %]
diff --git a/templates/web/hart/header.html b/templates/web/hart/header.html
index dcc202b5a..c2d363010 100644
--- a/templates/web/hart/header.html
+++ b/templates/web/hart/header.html
@@ -42,6 +42,8 @@
 
         <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/hart/favicon.ico">
 
+        [% PROCESS 'header_extra.html' %]
+
     </head>
     [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %]
     <body class="[% bodyclass | html IF bodyclass %]">
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index 0bbdaf353..bc52a0720 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -26,6 +26,7 @@
         [% extra_js %]
 
         [% INCLUDE 'tracking_code.html' %]
+        [% PROCESS 'header_extra.html' %]
 
     </head>
     <body class="[% bodyclass | html IF bodyclass %]">
diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html
index 0b3171808..155b35b64 100644
--- a/templates/web/stevenage/header.html
+++ b/templates/web/stevenage/header.html
@@ -24,6 +24,7 @@
         [% extra_js %]
                 
         [% INCLUDE 'tracking_code.html' %]
+        [% PROCESS 'header_extra.html' %]
     </head>
     <body class="[% bodyclass | html IF bodyclass %]">
 
diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html
index 1d52b5546..274a78ce7 100644
--- a/templates/web/warwickshire/header.html
+++ b/templates/web/warwickshire/header.html
@@ -32,6 +32,7 @@
     [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
 
     [% extra_js %]
+    [% PROCESS 'header_extra.html' %]
 </head>
 
 [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %]
diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss
index 15a09ec77..e8cbdab5e 100644
--- a/web/cobrands/fixamingata/layout.scss
+++ b/web/cobrands/fixamingata/layout.scss
@@ -2,55 +2,55 @@ $image-sprite: '/cobrands/fixamingata/images/sprite.png';
 
 @font-face {
   font-family: 'MuseoSans';
-  src: url('../fixmystreet/fonts/MuseoSans_300-webfont.eot');
-  src: url('../fixmystreet/fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'),
-       url('../fixmystreet/fonts/MuseoSans_300-webfont.woff') format('woff'),
-       url('../fixmystreet/fonts/MuseoSans_300-webfont.ttf') format('truetype'),
-       url('../fixmystreet/fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg');
+  src: url('../fixmystreet.com/fonts/MuseoSans_300-webfont.eot');
+  src: url('../fixmystreet.com/fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'),
+       url('../fixmystreet.com/fonts/MuseoSans_300-webfont.woff') format('woff'),
+       url('../fixmystreet.com/fonts/MuseoSans_300-webfont.ttf') format('truetype'),
+       url('../fixmystreet.com/fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'MuseoSans';
-  src: url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.eot');
-  src: url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'),
-       url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.woff') format('woff'),
-       url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'),
-       url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg');
+  src: url('../fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.eot');
+  src: url('../fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'),
+       url('../fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.woff') format('woff'),
+       url('../fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'),
+       url('../fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg');
   font-weight: normal;
   font-style: italic;
 }
 
 @font-face {
   font-family: 'MuseoSans';
-  src: url('../fixmystreet/fonts/MuseoSans_500-webfont.eot');
-  src: url('../fixmystreet/fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'),
-       url('../fixmystreet/fonts/MuseoSans_500-webfont.woff') format('woff'),
-       url('../fixmystreet/fonts/MuseoSans_500-webfont.ttf') format('truetype'),
-       url('../fixmystreet/fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg');
+  src: url('../fixmystreet.com/fonts/MuseoSans_500-webfont.eot');
+  src: url('../fixmystreet.com/fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'),
+       url('../fixmystreet.com/fonts/MuseoSans_500-webfont.woff') format('woff'),
+       url('../fixmystreet.com/fonts/MuseoSans_500-webfont.ttf') format('truetype'),
+       url('../fixmystreet.com/fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg');
   font-weight: bold;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'MuseoSans';
-  src: url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.eot');
-  src: url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'),
-       url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.woff') format('woff'),
-       url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'),
-       url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg');
+  src: url('../fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.eot');
+  src: url('../fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'),
+       url('../fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.woff') format('woff'),
+       url('../fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'),
+       url('../fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg');
   font-weight: bold;
   font-style: italic;
 }
 
 @font-face {
   font-family: 'Museo300-display';
-  src: url('../fixmystreet/fonts/Museo300-Regular-webfont.eot');
-  src: url('../fixmystreet/fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'),
-       url('../fixmystreet/fonts/Museo300-Regular-webfont.woff') format('woff'),
-       url('../fixmystreet/fonts/Museo300-Regular-webfont.ttf') format('truetype'),
-       url('../fixmystreet/fonts/Museo300-Regular-webfont.svg#Museo300') format('svg');
+  src: url('../fixmystreet.com/fonts/Museo300-Regular-webfont.eot');
+  src: url('../fixmystreet.com/fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'),
+       url('../fixmystreet.com/fonts/Museo300-Regular-webfont.woff') format('woff'),
+       url('../fixmystreet.com/fonts/Museo300-Regular-webfont.ttf') format('truetype'),
+       url('../fixmystreet.com/fonts/Museo300-Regular-webfont.svg#Museo300') format('svg');
   font-weight: normal;
   font-style: normal;
 }
diff --git a/web/cobrands/fixmystreet-uk-councils/js.js b/web/cobrands/fixmystreet-uk-councils/js.js
new file mode 100644
index 000000000..3abba8e33
--- /dev/null
+++ b/web/cobrands/fixmystreet-uk-councils/js.js
@@ -0,0 +1,3 @@
+jQuery.validator.addMethod('validName', function(value, element) {
+    var validNamePat = /\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i;
+    return this.optional(element) || value.length > 5 && value.match( /\S/ ) && value.match( /\s/ ) && !value.match( validNamePat ); }, translation_strings.category );
diff --git a/web/cobrands/fixmystreet/_colours.scss b/web/cobrands/fixmystreet.com/_colours.scss
index 29b18be1f..29b18be1f 100644
--- a/web/cobrands/fixmystreet/_colours.scss
+++ b/web/cobrands/fixmystreet.com/_colours.scss
diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet.com/base.scss
index 6e6cbd7b9..485f0ffc2 100644
--- a/web/cobrands/fixmystreet/base.scss
+++ b/web/cobrands/fixmystreet.com/base.scss
@@ -85,45 +85,6 @@
   }
 }
 
-#homepage-ab-test {
-  display: none; // header_extra.html will override this if Analytics tells it to
-
-  a {
-    display: inline-block;
-    cursor: pointer;
-  }
-
-  #cta-report {
-    padding: 0.4em 1em;
-    margin-top: 0.5em;
-    font-size: 1.5em;
-    font-weight: bold;
-    color: #333;
-    background-color: #ffd000;
-    border-radius: 0.3em;
-    box-shadow: 0 3px 5px 0 rgba(0,0,0,0.2);
-    background-image: linear-gradient(rgba(255,255,255,0.3), transparent);
-    text-shadow: 0 1px 0 rgba(255,255,255,0.6);
-    border: 2px solid #BB9900;
-    text-decoration: none;
-
-    &:hover,
-    &:focus {
-      background-color: #FFDB3E;
-    }
-
-    &:active {
-      position: relative;
-      top: 1px;
-      box-shadow: 0 2px 2px 0 rgba(0,0,0,0.3);
-    }
-  }
-
-  #cta-view {
-    margin: 0.5em 0 1em 0;
-  }
-}
-
 .unresponsive-council-warning {
     margin: 1em -1em;
     padding: 2em 2em;
diff --git a/web/cobrands/fixmystreet/config.rb b/web/cobrands/fixmystreet.com/config.rb
index 471b4b008..471b4b008 100644
--- a/web/cobrands/fixmystreet/config.rb
+++ b/web/cobrands/fixmystreet.com/config.rb
diff --git a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.eot b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.eot
index 15be4441c..15be4441c 100755
--- a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.eot
+++ b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.eot
diff --git a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.svg b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.svg
index 71109b80b..71109b80b 100755
--- a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.svg
+++ b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.svg
diff --git a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.ttf b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.ttf
index 072e9a4e0..072e9a4e0 100755
--- a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.ttf
+++ b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.ttf
diff --git a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.woff b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.woff
index f8a9dff96..f8a9dff96 100755
--- a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.woff
+++ b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.woff
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.eot b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.eot
index 5287827df..5287827df 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.eot
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.eot
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.svg b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.svg
index 9a04e92bc..9a04e92bc 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.svg
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.svg
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.ttf b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.ttf
index 0a4444b76..0a4444b76 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.ttf
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.ttf
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.woff b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.woff
index 22110a14e..22110a14e 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.woff
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.woff
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.eot b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.eot
index 3a35076a1..3a35076a1 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.eot
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.eot
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.svg b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.svg
index b848d3756..b848d3756 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.svg
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.svg
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.ttf b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.ttf
index 58241a2e9..58241a2e9 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.ttf
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.ttf
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.woff b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.woff
index 95c94194f..95c94194f 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.woff
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.woff
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.eot b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.eot
index 2731833c7..2731833c7 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.eot
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.eot
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.svg b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.svg
index dd240b802..dd240b802 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.svg
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.svg
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.ttf b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.ttf
index d23f991ce..d23f991ce 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.ttf
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.ttf
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.woff b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.woff
index c1f85a061..c1f85a061 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.woff
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.woff
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.eot b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.eot
index e60c7e02e..e60c7e02e 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.eot
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.eot
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.svg b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.svg
index 28df57c2f..28df57c2f 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.svg
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.svg
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.ttf b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.ttf
index 445af3ac1..445af3ac1 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.ttf
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.ttf
diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.woff b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.woff
index 453194a98..453194a98 100755
--- a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.woff
+++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.woff
diff --git a/web/cobrands/fixmystreet/images/a4-poster.png b/web/cobrands/fixmystreet.com/images/a4-poster.png
index 45d3c1f84..45d3c1f84 100644
--- a/web/cobrands/fixmystreet/images/a4-poster.png
+++ b/web/cobrands/fixmystreet.com/images/a4-poster.png
diff --git a/web/cobrands/fixmystreet/images/a5-flyers.png b/web/cobrands/fixmystreet.com/images/a5-flyers.png
index 111f0bc45..111f0bc45 100644
--- a/web/cobrands/fixmystreet/images/a5-flyers.png
+++ b/web/cobrands/fixmystreet.com/images/a5-flyers.png
diff --git a/web/cobrands/fixmystreet/images/a6-flyers.png b/web/cobrands/fixmystreet.com/images/a6-flyers.png
index cde4593e6..cde4593e6 100644
--- a/web/cobrands/fixmystreet/images/a6-flyers.png
+++ b/web/cobrands/fixmystreet.com/images/a6-flyers.png
diff --git a/web/cobrands/fixmystreet/images/arrow-down-16px-16px.png b/web/cobrands/fixmystreet.com/images/arrow-down-16px-16px.png
index 8223a4e69..8223a4e69 100755
--- a/web/cobrands/fixmystreet/images/arrow-down-16px-16px.png
+++ b/web/cobrands/fixmystreet.com/images/arrow-down-16px-16px.png
diff --git a/web/cobrands/fixmystreet/images/dog-poop-flags.png b/web/cobrands/fixmystreet.com/images/dog-poop-flags.png
index 581318d10..581318d10 100644
--- a/web/cobrands/fixmystreet/images/dog-poop-flags.png
+++ b/web/cobrands/fixmystreet.com/images/dog-poop-flags.png
diff --git a/web/cobrands/fixmystreet/images/dog-poop-poster.png b/web/cobrands/fixmystreet.com/images/dog-poop-poster.png
index bd508dee8..bd508dee8 100644
--- a/web/cobrands/fixmystreet/images/dog-poop-poster.png
+++ b/web/cobrands/fixmystreet.com/images/dog-poop-poster.png
diff --git a/web/cobrands/fixmystreet/images/locate-me.png b/web/cobrands/fixmystreet.com/images/locate-me.png
index 47a0eef20..47a0eef20 100644
--- a/web/cobrands/fixmystreet/images/locate-me.png
+++ b/web/cobrands/fixmystreet.com/images/locate-me.png
diff --git a/web/cobrands/fixmystreet/images/locate-me@2.png b/web/cobrands/fixmystreet.com/images/locate-me@2.png
index df920fadb..df920fadb 100644
--- a/web/cobrands/fixmystreet/images/locate-me@2.png
+++ b/web/cobrands/fixmystreet.com/images/locate-me@2.png
diff --git a/web/cobrands/fixmystreet/images/next-step-apple.png b/web/cobrands/fixmystreet.com/images/next-step-apple.png
index 79476f552..79476f552 100644
--- a/web/cobrands/fixmystreet/images/next-step-apple.png
+++ b/web/cobrands/fixmystreet.com/images/next-step-apple.png
diff --git a/web/cobrands/fixmystreet/images/next-step-download.png b/web/cobrands/fixmystreet.com/images/next-step-download.png
index 525c27d1f..525c27d1f 100644
--- a/web/cobrands/fixmystreet/images/next-step-download.png
+++ b/web/cobrands/fixmystreet.com/images/next-step-download.png
diff --git a/web/cobrands/fixmystreet/images/next-step-facebook.png b/web/cobrands/fixmystreet.com/images/next-step-facebook.png
index c01fa6ced..c01fa6ced 100644
--- a/web/cobrands/fixmystreet/images/next-step-facebook.png
+++ b/web/cobrands/fixmystreet.com/images/next-step-facebook.png
diff --git a/web/cobrands/fixmystreet/images/next-step-goodies.png b/web/cobrands/fixmystreet.com/images/next-step-goodies.png
index 27fe702c3..27fe702c3 100644
--- a/web/cobrands/fixmystreet/images/next-step-goodies.png
+++ b/web/cobrands/fixmystreet.com/images/next-step-goodies.png
diff --git a/web/cobrands/fixmystreet/images/next-step-google.png b/web/cobrands/fixmystreet.com/images/next-step-google.png
index 6b2244c44..6b2244c44 100644
--- a/web/cobrands/fixmystreet/images/next-step-google.png
+++ b/web/cobrands/fixmystreet.com/images/next-step-google.png
diff --git a/web/cobrands/fixmystreet/images/next-step-twitter.png b/web/cobrands/fixmystreet.com/images/next-step-twitter.png
index e79255bd6..e79255bd6 100644
--- a/web/cobrands/fixmystreet/images/next-step-twitter.png
+++ b/web/cobrands/fixmystreet.com/images/next-step-twitter.png
diff --git a/web/cobrands/fixmystreet/images/pack-community.jpg b/web/cobrands/fixmystreet.com/images/pack-community.jpg
index 710a34651..710a34651 100644
--- a/web/cobrands/fixmystreet/images/pack-community.jpg
+++ b/web/cobrands/fixmystreet.com/images/pack-community.jpg
diff --git a/web/cobrands/fixmystreet/images/pack-general.jpg b/web/cobrands/fixmystreet.com/images/pack-general.jpg
index 336e80a9c..336e80a9c 100644
--- a/web/cobrands/fixmystreet/images/pack-general.jpg
+++ b/web/cobrands/fixmystreet.com/images/pack-general.jpg
diff --git a/web/cobrands/fixmystreet/images/pack-schools.jpg b/web/cobrands/fixmystreet.com/images/pack-schools.jpg
index 3c3292d6d..3c3292d6d 100644
--- a/web/cobrands/fixmystreet/images/pack-schools.jpg
+++ b/web/cobrands/fixmystreet.com/images/pack-schools.jpg
diff --git a/web/cobrands/fixmystreet/images/promote-40x60.png b/web/cobrands/fixmystreet.com/images/promote-40x60.png
index 43b6ba53b..43b6ba53b 100644
--- a/web/cobrands/fixmystreet/images/promote-40x60.png
+++ b/web/cobrands/fixmystreet.com/images/promote-40x60.png
diff --git a/web/cobrands/fixmystreet/images/promote-90x130.png b/web/cobrands/fixmystreet.com/images/promote-90x130.png
index b30f1e3ff..b30f1e3ff 100644
--- a/web/cobrands/fixmystreet/images/promote-90x130.png
+++ b/web/cobrands/fixmystreet.com/images/promote-90x130.png
diff --git a/web/cobrands/fixmystreet/images/promote-90x60.png b/web/cobrands/fixmystreet.com/images/promote-90x60.png
index 46e21f10b..46e21f10b 100644
--- a/web/cobrands/fixmystreet/images/promote-90x60.png
+++ b/web/cobrands/fixmystreet.com/images/promote-90x60.png
diff --git a/web/cobrands/fixmystreet/images/tile-y-border.jpg b/web/cobrands/fixmystreet.com/images/tile-y-border.jpg
index 04c75a9de..04c75a9de 100644
--- a/web/cobrands/fixmystreet/images/tile-y-border.jpg
+++ b/web/cobrands/fixmystreet.com/images/tile-y-border.jpg
diff --git a/web/cobrands/fixmystreet/images/tile-y.jpg b/web/cobrands/fixmystreet.com/images/tile-y.jpg
index 63682f1c4..63682f1c4 100644
--- a/web/cobrands/fixmystreet/images/tile-y.jpg
+++ b/web/cobrands/fixmystreet.com/images/tile-y.jpg
diff --git a/web/cobrands/fixmystreet/images/tile.jpg b/web/cobrands/fixmystreet.com/images/tile.jpg
index b412774e4..b412774e4 100644
--- a/web/cobrands/fixmystreet/images/tile.jpg
+++ b/web/cobrands/fixmystreet.com/images/tile.jpg
diff --git a/web/cobrands/fixmystreet/images/unresponsive-council-cta-arrow.png b/web/cobrands/fixmystreet.com/images/unresponsive-council-cta-arrow.png
index 664721830..664721830 100644
--- a/web/cobrands/fixmystreet/images/unresponsive-council-cta-arrow.png
+++ b/web/cobrands/fixmystreet.com/images/unresponsive-council-cta-arrow.png
diff --git a/web/cobrands/fixmystreet/images/unresponsive-council-cta-arrow@2.png b/web/cobrands/fixmystreet.com/images/unresponsive-council-cta-arrow@2.png
index 181d8402b..181d8402b 100644
--- a/web/cobrands/fixmystreet/images/unresponsive-council-cta-arrow@2.png
+++ b/web/cobrands/fixmystreet.com/images/unresponsive-council-cta-arrow@2.png
diff --git a/web/cobrands/fixmystreet.com/js.js b/web/cobrands/fixmystreet.com/js.js
new file mode 100644
index 000000000..3abba8e33
--- /dev/null
+++ b/web/cobrands/fixmystreet.com/js.js
@@ -0,0 +1,3 @@
+jQuery.validator.addMethod('validName', function(value, element) {
+    var validNamePat = /\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i;
+    return this.optional(element) || value.length > 5 && value.match( /\S/ ) && value.match( /\s/ ) && !value.match( validNamePat ); }, translation_strings.category );
diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet.com/layout.scss
index b6698055d..23f3c575d 100644
--- a/web/cobrands/fixmystreet/layout.scss
+++ b/web/cobrands/fixmystreet.com/layout.scss
@@ -276,24 +276,6 @@ body.twothirdswidthpage {
   }
 }
 
-#homepage-ab-test {
-  #cta-report {
-    font-size: 2em;
-  }
-
-  #cta-view {
-    line-height: 1.2em;
-    font-size: 1.2em;
-    color: #333;
-    border-bottom: 1px solid #917F00;
-    text-decoration: none;
-
-    &:hover, &:focus {
-      border-bottom-color: #BD942A;
-    }
-  }
-}
-
 body.unresponsive-council {
     .container .content {
         padding: 0;
@@ -343,4 +325,4 @@ body.unresponsive-council {
         background-image: url(images/unresponsive-council-cta-arrow@2.png);
         background-size: 60px;
     }
-}
\ No newline at end of file
+}
diff --git a/web/cobrands/fixmystreet/posters.scss b/web/cobrands/fixmystreet.com/posters.scss
index 029180784..8c4f0c1ed 100644
--- a/web/cobrands/fixmystreet/posters.scss
+++ b/web/cobrands/fixmystreet.com/posters.scss
@@ -42,7 +42,7 @@ body.goodies {
       display: inline-block;
       width: 16px;
       height: 16px;
-      background: transparent url(/cobrands/fixmystreet/images/arrow-down-16px-16px.png) 0 0 no-repeat;
+      background: transparent url(images/arrow-down-16px-16px.png) 0 0 no-repeat;
       margin-right: 0.5em;
       vertical-align: -0.1em;
     }
diff --git a/web/cobrands/fixmystreet/posters/activist-pack.zip b/web/cobrands/fixmystreet.com/posters/activist-pack.zip
index 1d836345b..1d836345b 100644
--- a/web/cobrands/fixmystreet/posters/activist-pack.zip
+++ b/web/cobrands/fixmystreet.com/posters/activist-pack.zip
diff --git a/web/cobrands/fixmystreet/posters/community-group-pack.zip b/web/cobrands/fixmystreet.com/posters/community-group-pack.zip
index 8dafc8b50..8dafc8b50 100644
--- a/web/cobrands/fixmystreet/posters/community-group-pack.zip
+++ b/web/cobrands/fixmystreet.com/posters/community-group-pack.zip
diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-flyers-a5.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a5.pdf
index 04de4b95b..04de4b95b 100644
--- a/web/cobrands/fixmystreet/posters/fixmystreet-flyers-a5.pdf
+++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a5.pdf
diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-flyers-a6.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a6.pdf
index 2e65bffb1..2e65bffb1 100644
--- a/web/cobrands/fixmystreet/posters/fixmystreet-flyers-a6.pdf
+++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a6.pdf
diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-poop-flags.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-poop-flags.pdf
index b2100a49b..b2100a49b 100644
--- a/web/cobrands/fixmystreet/posters/fixmystreet-poop-flags.pdf
+++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-poop-flags.pdf
diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-poop-poster.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-poop-poster.pdf
index 4e2c3166b..4e2c3166b 100644
--- a/web/cobrands/fixmystreet/posters/fixmystreet-poop-poster.pdf
+++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-poop-poster.pdf
diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-poster-a4.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-poster-a4.pdf
index ed6788cf0..ed6788cf0 100644
--- a/web/cobrands/fixmystreet/posters/fixmystreet-poster-a4.pdf
+++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-poster-a4.pdf
diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-promote-40x60.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-40x60.pdf
index 9c1e4cd9b..9c1e4cd9b 100644
--- a/web/cobrands/fixmystreet/posters/fixmystreet-promote-40x60.pdf
+++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-40x60.pdf
diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-promote-90x130.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x130.pdf
index 13bff9f05..13bff9f05 100644
--- a/web/cobrands/fixmystreet/posters/fixmystreet-promote-90x130.pdf
+++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x130.pdf
diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-promote-90x60.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x60.pdf
index 7763ce4f7..7763ce4f7 100644
--- a/web/cobrands/fixmystreet/posters/fixmystreet-promote-90x60.pdf
+++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x60.pdf
diff --git a/web/cobrands/fixmystreet/posters/schools-clubs-pack.zip b/web/cobrands/fixmystreet.com/posters/schools-clubs-pack.zip
index 53a2a5f41..53a2a5f41 100644
--- a/web/cobrands/fixmystreet/posters/schools-clubs-pack.zip
+++ b/web/cobrands/fixmystreet.com/posters/schools-clubs-pack.zip
diff --git a/web/cobrands/fixmystreet/images/temp-map.jpg b/web/cobrands/fixmystreet/images/temp-map.jpg
deleted file mode 100644
index 60ca79878..000000000
--- a/web/cobrands/fixmystreet/images/temp-map.jpg
+++ /dev/null
diff --git a/web/cobrands/fixmystreet/images/temp-map.png b/web/cobrands/fixmystreet/images/temp-map.png
deleted file mode 100644
index 12b9f2ab4..000000000
--- a/web/cobrands/fixmystreet/images/temp-map.png
+++ /dev/null
diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js
index c8f1fe697..78372d68c 100644
--- a/web/js/fixmystreet.js
+++ b/web/js/fixmystreet.js
@@ -49,10 +49,6 @@ $(function(){
     jQuery.validator.addMethod('validCategory', function(value, element) {
         return this.optional(element) || value != '-- Pick a category --'; }, translation_strings.category );
 
-    jQuery.validator.addMethod('validName', function(value, element) {
-        var validNamePat = /\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i;
-        return this.optional(element) || value.length > 5 && value.match( /\S/ ) && value.match( /\s/ ) && !value.match( validNamePat ); }, translation_strings.category );
-
     var form_submitted = 0;
     var submitted = false;