diff --git a/content/visit.md b/content/visit.md
index 5778895..44c04f9 100644
--- a/content/visit.md
+++ b/content/visit.md
@@ -1,6 +1,7 @@
 ---
 title: Visit Us
 subtitle: Come take a look around.
+layout: visit
 ---
 
 Leigh Hackspace is located inside [Leigh Spinners Mill](https://www.spinnersmill.co.uk), a [Grade II* listed](https://historicengland.org.uk/advice/heritage-at-risk/search-register/list-entry/48399) former cotton spinning mill, restored by Leigh Building Preservation Trust and now hosting [multiple business and community projects](https://www.spinnersmill.co.uk).
@@ -18,7 +19,9 @@ Leigh
 WN7 2LB
 ```
 
-{{< map >}}
+{{< rawhtml >}}
+<div id="map" class="map"></div>
+{{</ rawhtml >}}
 
 What3Words: [//escape.shot.cleansed](https://what3words.com/escape.shots.cleansed) - This is for the main entrance of Mill 2.
 
diff --git a/layouts/page/visit.html b/layouts/page/visit.html
new file mode 100644
index 0000000..68485d7
--- /dev/null
+++ b/layouts/page/visit.html
@@ -0,0 +1,19 @@
+{{ define "title" }}
+{{ .Title }}
+{{ end }}
+
+{{ define "subtitle" }}
+{{ .Params.subtitle }}
+{{ end }}
+
+{{ define "extra_css" }}
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ol@v8.2.0/ol.css">
+{{ end }}
+
+{{ define "extra_js" }}
+<script src="https://cdn.jsdelivr.net/npm/ol@v8.2.0/dist/ol.js"></script>
+{{ end }}
+
+{{ define "content" }}
+{{ .Content }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/shortcodes/map.html b/layouts/shortcodes/map.html
deleted file mode 100644
index 571cc7e..0000000
--- a/layouts/shortcodes/map.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<div id="map" class="map"></div>
-{{ .Page.Store.Set "hasMap" true }}
diff --git a/themes/lhs/layouts/partials/foot.html b/themes/lhs/layouts/partials/foot.html
index 7254526..66bc30f 100644
--- a/themes/lhs/layouts/partials/foot.html
+++ b/themes/lhs/layouts/partials/foot.html
@@ -8,11 +8,6 @@
   </script>
 {{ end }}
 
-{{ if .Page.Store.Get "hasMap" }}
-<script src="https://cdn.jsdelivr.net/npm/ol@v8.2.0/dist/ol.js"></script>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ol@v8.2.0/ol.css">
-{{ end }}
-
 {{ $theme := resources.Get "js/theme.js" }}
 {{ $site := resources.Get "js/site.js" }}
 {{ $js := slice $site $theme | resources.Concat "js/bundle.js" | resources.Minify }}
diff --git a/themes/lhs/layouts/partials/head.html b/themes/lhs/layouts/partials/head.html
index 4dd6911..3257b4c 100644
--- a/themes/lhs/layouts/partials/head.html
+++ b/themes/lhs/layouts/partials/head.html
@@ -19,9 +19,6 @@
 <link rel="alternate" type="text/calendar" href="{{ .Site.Params.calendarUrl }}" title="{{ .Site.Title }} Events">
 <link rel="canonical" href="{{ .Permalink }}">
 
-{{ if .Page.Store.Get "hasMap" }}
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ol@v8.2.0/ol.css">
-{{ end }}
 {{ $opts := dict "transpiler" "libsass" "targetPath" "css/leighhack.css" }}
 {{ with resources.Get "sass/leighhack.scss" | toCSS $opts | minify | fingerprint }}
 <link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">