diff --git a/flake.lock b/flake.lock
index a4ba045..d090f65 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,17 +8,16 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1714783491,
-        "narHash": "sha256-4pUXleYQZpKJep7wwNJo6QuXV8/pk28JC4VzN1uoNh0=",
-        "owner": "aleksrutins",
-        "repo": "cheetah",
-        "rev": "3b0db8cf3b3e86dfb0f3503c54f655c831fdc359",
-        "type": "github"
+        "lastModified": 1717535613,
+        "narHash": "sha256-nyppnrB7J1RaeqCaH6O22QsC/c+N0LTNXw3XgsPzxFg=",
+        "rev": "1b42da203e960f6cad517ad80e0e2dcf5625e884",
+        "revCount": 67,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/aleksrutins/cheetah/0.2.3/018fe51b-41d1-7c39-af34-e6ff00a655b2/source.tar.gz"
       },
       "original": {
-        "owner": "aleksrutins",
-        "repo": "cheetah",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://flakehub.com/f/aleksrutins/cheetah/0.2.3.tar.gz"
       }
     },
     "flake-utils": {
diff --git a/flake.nix b/flake.nix
index 26db5f4..8ed9f42 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    cheetah.url = "github:aleksrutins/cheetah";
+    cheetah.url = "https://flakehub.com/f/aleksrutins/cheetah/0.2.3.tar.gz";
     utils.url = "github:numtide/flake-utils";
   };
 
diff --git a/layouts/page.html b/layouts/page.html
new file mode 100644
index 0000000..e151fef
--- /dev/null
+++ b/layouts/page.html
@@ -0,0 +1,11 @@
+<extends template="layouts/base.html" [title]="title"></extends>
+<p></p>
+<p>
+    <nav-links [back]="back" [next]="next"></nav-links>
+</p>
+
+<slot></slot>
+
+<p>
+    <nav-links [back]="back" [next]="next"></nav-links>
+</p>
\ No newline at end of file
diff --git a/pages/activators-vs-repressors.md b/pages/activators-vs-repressors.md
index 786ef20..f85eb10 100644
--- a/pages/activators-vs-repressors.md
+++ b/pages/activators-vs-repressors.md
@@ -1,6 +1,4 @@
-<extends template="layouts/base.html" title="Choosing Between Activators & Repressors"></extends>
-
-<nav-links back="/hill-functions.html"></nav-links>
+<extends template="layouts/page.html" back="/hill-functions.html" title="Choosing Between Activators & Repressors"></extends>
 
 # Choosing Between Activators & Repressors
 
@@ -33,6 +31,4 @@ You've reached the end, for now. I hope to expand this site in the future. If yo
 
 [^3] Gerland, U., & Hwa, T. (2009). Evolutionary selection between alternative modes of gene regulation. Proceedings of the National Academy of Sciences, 106(22), 8841–8846. <https://doi.org/10.1073/pnas.0808500106>
 
-</section>
-
-<nav-links back="/hill-functions.html"></nav-links>
\ No newline at end of file
+</section>
\ No newline at end of file
diff --git a/pages/activators.md b/pages/activators.md
index 3945938..471a14c 100644
--- a/pages/activators.md
+++ b/pages/activators.md
@@ -1,6 +1,4 @@
-<extends template="layouts/base.html" title="Activators"></extends>
-
-<nav-links back="/repressors.html" next="/hill-functions.html"></nav-links>
+<extends template="layouts/page.html" back="/repressors.html" next="/hill-functions.html" title="Activators"></extends>
 
 # Activators
 
@@ -31,8 +29,6 @@ As you can see, an activator has exactly the opposite effect as a repressor.
 
 That was a short section. Onward!
 
-<nav-links back="/repressors.html" next="/hill-functions.html"></nav-links>
-
 <script>
     plot('#binding-curve', (kd, beta0) => [`${beta0}/(1 + x/(${kd}))`, `${beta0} * ((x/${kd})/(1 + (x/${kd})))`], ['#kd', '#beta0'], [[0, 10], [0, 10]])
 
diff --git a/pages/concepts.md b/pages/concepts.md
index 21a2fa1..b28e0bb 100644
--- a/pages/concepts.md
+++ b/pages/concepts.md
@@ -1,6 +1,4 @@
-<extends template="layouts/base.html" title="Concepts of Biocircuits"></extends>
-
-<nav-links next="/simplest-circuit.html"></nav-links>
+<extends template="layouts/page.html" next="/simplest-circuit.html" title="Concepts of Biocircuits"></extends>
 
 # Concepts of Biocircuits
 
@@ -25,6 +23,4 @@ Again, though, even though we know a lot about biocircuit design, there are stil
 
 In theory, natural and synthetic circuits _should_ share a common set of design principles. These principles are generally expressed as a statement: _Circuit feature X enables function Y_. We know a few already, but new ones are still being discovered.
 
-That's the introduction. Onward - let's design a circuit!
-
-<nav-links next="/simplest-circuit.html"></nav-links>
\ No newline at end of file
+That's the introduction. Onward - let's design a circuit!
\ No newline at end of file
diff --git a/pages/hill-functions.md b/pages/hill-functions.md
index 8ae6a9f..2a4379a 100644
--- a/pages/hill-functions.md
+++ b/pages/hill-functions.md
@@ -1,6 +1,4 @@
-<extends template="layouts/base.html" title="Ultrasensitivity & the Hill Function"></extends>
-
-<nav-links back="/activators.html" next="/activators-vs-repressors.html"></nav-links>
+<extends template="layouts/page.html" back="/activators.html" next="/activators-vs-repressors.html" title="Ultrasensitivity & the Hill Function"></extends>
 
 # Ultrasensitivity & the Hill Function
 
@@ -54,8 +52,6 @@ To find production rates with the Hill function, just multiply by $\beta_0$:
 
 Onwards!
 
-<nav-links back="/activators.html" next="/activators-vs-repressors.html"></nav-links>
-
 <script>
     plot('#hill-graph', (k, n) => [`((x/${k})^(${n}))/(1 + ((x/${k})^(${n})))`, `1/(1 + ((x/${k})^(${n})))`], ['#k', '#n'], [[0, 10], [0, 1]])
     plot('#hill-graph-prod', (k, n, b0) => [`(${b0}) * ((x/${k})^(${n}))/(1 + ((x/${k})^(${n})))`, `(${b0})/(1 + ((x/${k})^(${n})))`], ['#k-prod', '#n-prod', '#b0'], [[0, 10], [0, 10]])
diff --git a/pages/repressors.md b/pages/repressors.md
index 866aafd..7dc1191 100644
--- a/pages/repressors.md
+++ b/pages/repressors.md
@@ -1,6 +1,4 @@
-<extends template="layouts/base.html" title="Repressors & Leaks"></extends>
-
-<nav-links back="/simplest-circuit.html" next="/activators.html"></nav-links>
+<extends template="layouts/page.html" back="/simplest-circuit.html" next="/activators.html" title="Repressors & Leaks"></extends>
 
 # Repressors & Leaks
 
@@ -82,8 +80,6 @@ Because leaks are so common, it's important to make sure that important parts of
 
 Onwards!
 
-<nav-links back="/simplest-circuit.html" next="/activators.html"></nav-links>
-
 <script>
     plot('#binding-curve', (kd, beta0) => [`${beta0}/(1 + x/(${kd}))`, `-(${beta0})x/(${kd}) + ${beta0}`], ['#kd', '#beta0'], [[0, 10], [0, 10]])
 
diff --git a/pages/simplest-circuit.md b/pages/simplest-circuit.md
index d2d3d5f..7a427a5 100644
--- a/pages/simplest-circuit.md
+++ b/pages/simplest-circuit.md
@@ -1,6 +1,4 @@
-<extends template="layouts/base.html" title="The Simplest Circuit"></extends>
-
-<nav-links back="/concepts.html" next="/repressors.html"></nav-links>
+<extends template="layouts/page.html" back="/concepts.html" next="/repressors.html" title="The Simplest Circuit"></extends>
 
 # The Simplest Circuit
 
@@ -96,8 +94,6 @@ Here's a graph to play with:
 
 It's still a line. Onwards!
 
-<nav-links back="/concepts.html" next="/repressors.html"></nav-links>
-
 <script>
     plot('#concentration-graph', (beta, gamma) => [`(${beta}x)/${gamma}`], ['#beta', '#gamma'])
     plot('#concentration-graph-2step', (betap, gammap, betam, gammam) => [`((${betap})(${betam})x)/((${gammap})(${gammam}))`], ['#betap', '#gammap', '#betam', '#gammam'])