3 files changed, 20 insertions, 3 deletions
diff --git a/www/templates/en/around.html b/www/templates/en/around.html
index b597d9c..b7fda3f 100644
--- a/www/templates/en/around.html
+++ b/www/templates/en/around.html
@@ -45,9 +45,6 @@
         };
     </script>
 
-    <div id="map_box" class="mapbox">
-        <div id="map"></div>
-    </div>
     <div class="frontpage-menu">
         <a id="view-my-reports" class="nodisplay" data-role="button" href="#">
             <strong>My Reports</strong>
@@ -63,6 +60,11 @@
             <strong class="signin">Sign In</strong>
         </a>
         <% } %>
+    </div>
+
+
+    <div id="map_box" class="mapbox">
+        <div id="map"></div>
 
         <a id="mark-here" data-role="button" data-theme="a" class="map-bottom-btn nodisplay">
         New Report Here
diff --git a/www/templates/en/login.html b/www/templates/en/login.html
index 69aa630..02733da 100644
--- a/www/templates/en/login.html
+++ b/www/templates/en/login.html
@@ -7,6 +7,7 @@
     <% if ( FMS.isLoggedIn ) { %>
     <div id="signed_in_row">
         <p>You are signed in as <%= email %></p>
+        <div id="err" class="nodisplay"></div>
         <input type="button" id="logout" name="logout" value="Sign Out" data-theme="a">
     </div>
     <div id="password_row" class="nodisplay">
@@ -30,6 +31,7 @@
         <p>
         Signed in!
         </p>
+        <div id="err" class="nodisplay"></div>
         <input type="button" id="logout" name="logout" value="Sign Out" data-theme="a">
     </div>
 </div>
diff --git a/www/templates/en/submit_email.html b/www/templates/en/submit_email.html
index 641e276..6de8a21 100644
--- a/www/templates/en/submit_email.html
+++ b/www/templates/en/submit_email.html
@@ -10,4 +10,17 @@
     </div>
     <input data-role="button" data-theme="a" type="button" id="have_password" name="have_password" value="I have a password">
     <input data-role="button" data-theme="a" type="button" id="email_confirm" name="email_confirm" value="I don't">
+
+    <p>
+    To make a report on FixMyStreet we require you to confirm your email address either by setting up
+    an account, or clicking a link in an email we send you.
+    </p>
+
+    <p>
+    If you have a FixMyStreet account then choose "I have a password", otherwise choose "I don't".
+    </p>
+
+    <p>
+    If you choose "I don't" then you can, if you want, set a password.
+    </p>
 </div>