diff --git a/app/__init__.py b/app/__init__.py
index b596bdfdd..61237c7dc 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -612,7 +612,8 @@ def useful_headers_after_request(response):
"connect-src 'self' *.google-analytics.com;"
"object-src 'self';"
"font-src 'self' {asset_domain} data:;"
- "img-src 'self' {asset_domain} *.google-analytics.com *.notifications.service.gov.uk {logo_domain} data:;"
+ "img-src 'self' {asset_domain} *.tile.openstreetmap.org *.google-analytics.com"
+ " *.notifications.service.gov.uk {logo_domain} data:;"
"frame-src 'self' www.youtube-nocookie.com;".format(
asset_domain=current_app.config['ASSET_DOMAIN'],
logo_domain=get_logo_cdn_domain(),
diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index ec40d460b..318f116af 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -14,6 +14,8 @@
{% block head %}
+ {% block extra_stylesheets %}
+ {% endblock %}
@@ -251,6 +253,8 @@
{% endblock %}
{% block bodyEnd %}
+ {% block extra_javascripts %}
+ {% endblock %}
diff --git a/app/templates/views/broadcast/preview-areas.html b/app/templates/views/broadcast/preview-areas.html
index 6b86fc3ba..2793bff16 100644
--- a/app/templates/views/broadcast/preview-areas.html
+++ b/app/templates/views/broadcast/preview-areas.html
@@ -8,9 +8,48 @@
Choose where to broadcast to
{% endblock %}
+{% block extra_stylesheets %}
+
+
+{% endblock %}
+
+{% block extra_javascripts %}
+
+
+{% endblock %}
+
{% block maincolumn_content %}
- {{ page_header("Choose where to broadcast to", back_link="#") }}
+ {{ page_header("Choose where to broadcast to", back_link="{{ url_for('.broadcast', service_id=current_service.id) }}") }}
{% for area in selected %}
{{ area.name }} (remove)
@@ -36,9 +75,7 @@
{% endfor %}
{% if selected %}
- {% for area in area_polygons %}
- {{ area }}
- {% endfor %}
+