7 files changed, 12 insertions, 11 deletions
diff --git a/templates/web/zurich/admin/body.html b/templates/web/zurich/admin/body.html
index 4cedc9838..771f1e537 100644
--- a/templates/web/zurich/admin/body.html
+++ b/templates/web/zurich/admin/body.html
@@ -19,7 +19,7 @@
         </tr>
         [% WHILE ( cat = contacts.next ) %]
             <tr[% IF cat.deleted %] class="is-deleted"[% END %]>
-                <td><a href="[% c.uri_for( 'body_edit', body_id, cat.category ) %]">[% cat.category %]</a></td>
+                <td><a href="[% c.uri_for( 'body', body_id, cat.category ) %]">[% cat.category %]</a></td>
                 <td>[% cat.email | html %]</td>
                 <td>[% cat.editor %]</td>
                 <td>[% cat.note | html %]</td>
diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html
index 5ff031ce2..82bbeba23 100644
--- a/templates/web/zurich/admin/report_edit-sdm.html
+++ b/templates/web/zurich/admin/report_edit-sdm.html
@@ -7,9 +7,6 @@
 -%]
 
 [% map_html %]
-    <p id='sub_map_links'>
-        <a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a>
-    </p>
 </div>
 
 [% status_message %]
diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html
index 66a51f162..5376d77f4 100644
--- a/templates/web/zurich/admin/report_edit.html
+++ b/templates/web/zurich/admin/report_edit.html
@@ -8,9 +8,6 @@
 -%]
 
 [% map_html %]
-    <p id='sub_map_links'>
-        <a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a>
-    </p>
 </div>
 
 [% status_message %]
diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html
index 891c6f1d3..ae1b47712 100644
--- a/templates/web/zurich/header.html
+++ b/templates/web/zurich/header.html
@@ -24,7 +24,7 @@
 
         <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
         <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script>
-        [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'Züri wie neu' %]
+        [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
         [% extra_js %]
 
         <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js" charset="utf-8"></script>
diff --git a/templates/web/zurich/maps/zurich.html b/templates/web/zurich/maps/zurich.html
index 492ccc556..46b003530 100644
--- a/templates/web/zurich/maps/zurich.html
+++ b/templates/web/zurich/maps/zurich.html
@@ -9,6 +9,15 @@
 <![endif]-->
 [% END %]
 
+[% map_sub_links = BLOCK %]
+    <a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a>
+[% END %]
+
 [% map_html = BLOCK %]
 [% INCLUDE maps/openlayers.html %]
+[% UNLESS around_page %]
+<p id="sub_map_links">
+     [% map_sub_links %]
+</p>
+[% END %]
 [% END %]
diff --git a/templates/web/zurich/reports/index.html b/templates/web/zurich/reports/index.html
index 670746753..0ece1ca2c 100755
--- a/templates/web/zurich/reports/index.html
+++ b/templates/web/zurich/reports/index.html
@@ -5,9 +5,6 @@
         bodyclass = 'mappage';
 %]
 [% map_html %]
-    <p id='sub_map_links'>
-        <a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a>
-    </p>
 </div>
 
 <div id="side">
diff --git a/templates/web/zurich/site-name.html b/templates/web/zurich/site-name.html
new file mode 100644
index 000000000..d8932b521
--- /dev/null
+++ b/templates/web/zurich/site-name.html
@@ -0,0 +1 @@
+Züri wie neu