diff --git a/layouts/partials/gpxstudio.html b/layouts/partials/gpxstudio.html
new file mode 100644
index 0000000..df05727
--- /dev/null
+++ b/layouts/partials/gpxstudio.html
@@ -0,0 +1,13 @@
+{{ $gpxFile := .Scratch.Get "gpxFile" }}
+
+{{ $url := printf "%sdata/tracks/%s" .Site.BaseURL $gpxFile }}
+{{ $url_state := querify "state" (printf "{\"urls\":[\"%s\"]}" $url) }}
+{{ $iframe_url := printf "https://gpx.studio/?%s&embed&distance" $url_state }}
+{{ $a_url := printf "https://gpx.studio/?%s" $url_state }}
+<iframe {{ printf "src=%q" $iframe_url | safeHTMLAttr }}
+        width="100%"
+        height="500"
+        frameborder="0"
+        allowfullscreen>
+            <p><a {{ printf "href=%q" $a_url | safeHTMLAttr }}></a></p>
+</iframe>
\ No newline at end of file
diff --git a/layouts/shortcodes/displayGPX.html b/layouts/shortcodes/displayGPX.html
index 7ed4a42..dff024a 100644
--- a/layouts/shortcodes/displayGPX.html
+++ b/layouts/shortcodes/displayGPX.html
@@ -1,11 +1,2 @@
-{{ $url := printf "%sdata/tracks/%s" .Site.BaseURL (.Get 0) }}
-{{ $url_state := querify "state" (printf "{\"urls\":[\"%s\"]}" $url) }}
-{{ $iframe_url := printf "https://gpx.studio/?%s&embed&distance" $url_state }}
-{{ $a_url := printf "https://gpx.studio/?%s" $url_state }}
-<iframe {{ printf "src=%q" $iframe_url | safeHTMLAttr }}
-        width="100%"
-        height="500"
-        frameborder="0"
-        allowfullscreen>
-            <p><a {{ printf "href=%q" $a_url | safeHTMLAttr }}></a></p>
-</iframe>
\ No newline at end of file
+{{ .Scratch.Set "gpxFile" (.Get 0) }}
+{{ partial "gpxstudio.html" . }}
diff --git a/layouts/shortcodes/displayToots.html b/layouts/shortcodes/displayToots.html
deleted file mode 100644
index 2853d7d..0000000
--- a/layouts/shortcodes/displayToots.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{{ $url := .Get 0 }}
-{{ $dataJ := getJSON $url  }}
-
-
-{{ range sort $dataJ "created_at" "desc" }}
-  {{ .Scratch.Set "toot" $dataJ }}
-  {{ partial "toot.html" . }}
-{{ end }}
diff --git a/layouts/tracks/single.html b/layouts/tracks/single.html
index 4901ef8..c8618a4 100644
--- a/layouts/tracks/single.html
+++ b/layouts/tracks/single.html
@@ -17,18 +17,8 @@
     {{ partial "tags/page.html" . }}
     <!-- content -->
     <div class="e-content">
-      <!-- Move this to a common folder later -->
-      {{ $url := printf "%sdata/tracks/%s" .Site.BaseURL .Params.gpx }}
-      {{ $url_state := querify "state" (printf "{\"urls\":[\"%s\"]}" $url) }}
-      {{ $iframe_url := printf "https://gpx.studio/?%s&embed&distance" $url_state }}
-      {{ $a_url := printf "https://gpx.studio/?%s" $url_state }}
-      <iframe {{ printf "src=%q" $iframe_url | safeHTMLAttr }}
-              width="100%"
-              height="500"
-              frameborder="0"
-              allowfullscreen>
-                  <p><a {{ printf "href=%q" $a_url | safeHTMLAttr }}></a></p>
-      </iframe>
+      {{ .Scratch.Set "gpxFile" .Params.gpx }}
+      {{ partial "gpxstudio.html" . }}
       {{ .Content }}
     </div>
   </article>