6 files changed, 12 insertions, 14 deletions
diff --git a/templates/web/base/around/display_location.html b/templates/web/base/around/display_location.html
index 0ae1aadf5..d7608f7aa 100755
--- a/templates/web/base/around/display_location.html
+++ b/templates/web/base/around/display_location.html
@@ -27,6 +27,7 @@
         }
     );
 
+    PROCESS "report/photo-js.html";
     PROCESS "maps/${map.type}.html" around_page = 1;
     sidebar_html = PROCESS 'report/new/sidebar.html' js = 1 report.used_map = 1;
 
diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html
index 4821b3fa0..a07aab214 100644
--- a/templates/web/base/report/_main.html
+++ b/templates/web/base/report/_main.html
@@ -1,5 +1,8 @@
 [% moderating = c.user && c.user.has_permission_to('moderate', problem.bodies_str) %]
 
+<a href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]"
+    class="problem-back js-back-to-report-list">[% loc('Back to all reports') %]</a>
+
 <div class="problem-header clearfix" problem-id="[% problem.id %]">
 
   [% IF moderating %]
diff --git a/templates/web/base/report/display.html b/templates/web/base/report/display.html
index e9f0b2914..50c649f9a 100644
--- a/templates/web/base/report/display.html
+++ b/templates/web/base/report/display.html
@@ -14,6 +14,7 @@
 </div>
 
 <div id="map_sidebar">
+  <div id="side-report">
 
 [% IF login_success %]
     <p class='form-success'>[% loc('You have successfully signed in; please check and confirm your details are accurate:') %]</p>
@@ -43,6 +44,7 @@
     [% INCLUDE 'report/update-form.html' %]
 [% END %]
 
+  </div>
 </div>
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/report/new/fill_in_details.html b/templates/web/base/report/new/fill_in_details.html
index e980c6065..debc2af2d 100644
--- a/templates/web/base/report/new/fill_in_details.html
+++ b/templates/web/base/report/new/fill_in_details.html
@@ -31,7 +31,7 @@
     [% map_html %]
     </div>
     <div id="map_sidebar">
-        <div id="side">
+        <div id="side-form">
   [% ELSE %]
     <div id="map_sidebar">
         <div id="skipped-map">
diff --git a/templates/web/base/report/photo-js.html b/templates/web/base/report/photo-js.html
index 9075ce005..05588d085 100644
--- a/templates/web/base/report/photo-js.html
+++ b/templates/web/base/report/photo-js.html
@@ -1,8 +1,6 @@
-[% IF c.cobrand.allow_photo_display(problem) %]
-    [% extra_css = BLOCK %]
-	    <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]">
-    [% END %]
-    [% extra_js = BLOCK %]
-        <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script>
-    [% END %]
+[% extra_css = BLOCK %]
+    <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]">
+[% END %]
+[% extra_js = BLOCK %]
+    <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script>
 [% END %]
diff --git a/templates/web/zurich/report/photo-js.html b/templates/web/zurich/report/photo-js.html
deleted file mode 100644
index 05588d085..000000000
--- a/templates/web/zurich/report/photo-js.html
+++ /dev/null
@@ -1,6 +0,0 @@
-[% extra_css = BLOCK %]
-    <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]">
-[% END %]
-[% extra_js = BLOCK %]
-    <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script>
-[% END %]