diff --git a/docs/_config.yml b/docs/_config.yml
index f37c0878..bd944722 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,6 +1,6 @@
 title: VzBoT Documentation
 tagline: Documentation for VzBoT 3D-printers
-description: VzBoT Official Documentation
+description: Official documentation and manuals for VzBoT printers
 logo: "/assets/images/logo.svg"
 
 baseurl: ""
@@ -8,14 +8,12 @@ url: "https://docs.vzbot.org"
 repository: vzbot3d/docs
 permalink: pretty
 
-
 color_scheme: "vzbot"
 markdown: kramdown
 remote_theme: just-the-docs/just-the-docs
 
 search_enabled: true
 
-
 plugins:
   - jekyll-spaceship
   - jekyll-remote-theme
@@ -65,7 +63,7 @@ gh_edit_link: true                                      # show or hide edit this
 gh_edit_link_text: "Edit this page on GitHub"
 gh_edit_repository: "https://github.com/vzbot3d/docs"   # the github URL for your repo
 gh_edit_branch: "gh-pages"                              # the branch that your docs is served from
-# gh_edit_source: docs                                  # the source that your files originate from
+gh_edit_source: docs                                    # the source that your files originate from
 gh_edit_view_mode: "edit"                               # "tree" or "edit" if you want the user to jump into the editor immediately
 
 callouts_level: quiet # or loud
diff --git a/docs/general/belt-tensioning.md b/docs/general/belt-tensioning.md
new file mode 100644
index 00000000..7822344e
--- /dev/null
+++ b/docs/general/belt-tensioning.md
@@ -0,0 +1,42 @@
+---
+title: Belt tensioning
+description: Tensioning the belts on your VzBoT printer, with information and how-to videos.
+parent: General info
+slug: belt-tensioning
+---
+
+# Belt tensioning
+
+{: .note}
+> This guide is still a work in progress.
+
+Belt tensioning is an important part of achieving good performance on your VzBoT printer. The specifications and numbers for tuning your printer may differ slightly between models and versions, but the steps for achieving these results are largely the same for all of them.
+
+## What you will need
+
+- A mobile phone or tablet
+- Frequency analyzer application
+- Quiet environment
+- Tools for motor mounts
+
+### VzBoT-330
+
+The Vz330 belt tensioners are located at the back of the printer. Loosen the fixing screw on the rear motor mounts before turning the tensioning screw. Tighten the fixing screw back up when you're done adjusting belt tension.
+
+Recommended target acoustic frequency:
+
+- Printed version: 110Hz
+- CNC / Mellow kit: 130Hz
+
+![Vz330 belt tensioning](https://www.youtube.com/watch?v=qNMXW6MUV5E)
+
+### VzBoT-235
+
+The Vz235 belt tensioners are located at the front of the printer, either side of the front doors. Loosen the fixing screw on the rear motor mounts before turning the tensioning screw. Tighten the fixing screw back up when you're done adjusting belt tension.
+
+Recommended target acoustic frequency:
+
+- Printed version: 110Hz
+- CNC / Mellow kit: 130Hz
+
+![Vz235 belt tensioning](https://www.youtube.com/watch?v=lP59PClF_PU&start=4380&end=4550)
diff --git a/docs/general/index.md b/docs/general/index.md
index aa2018b4..a6322597 100644
--- a/docs/general/index.md
+++ b/docs/general/index.md
@@ -9,5 +9,12 @@ tags:
   - printer
   - setup
 has_children: true
+has_toc: true
+nav_order: 0.9 # before Misc info
 slug: general
----
\ No newline at end of file
+---
+
+## Setting up your printer
+
+- [Tensioning your belts](/general/belt-tensioning)
+- [Tuning your printer](/general/tuning)
diff --git a/docs/general/misc-info/tuning.md b/docs/general/misc-info/tuning.md
deleted file mode 100644
index 3a097cb4..00000000
--- a/docs/general/misc-info/tuning.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-parent: Miscellaneous info
----
\ No newline at end of file
diff --git a/docs/general/which-vzbot.md b/docs/general/misc-info/which-vzbot.md
similarity index 72%
rename from docs/general/which-vzbot.md
rename to docs/general/misc-info/which-vzbot.md
index aeb2f2d0..c1439b02 100644
--- a/docs/general/which-vzbot.md
+++ b/docs/general/misc-info/which-vzbot.md
@@ -1,13 +1,14 @@
 ---
-title: Which VzBot do I want?
-description: A guided choice on which VzBot printer is best for you
-parent: General info # temporarily here to clean up the sidebar links
+title: Which VzBoT do I want?
+description: A guided choice on which VzBoT printer is best for you
+parent: Miscellaneous info # temporarily here to clean up the sidebar links
+slug: choosing-a-printer
 ---
 
 
-# Which VzBot do I want?
+# Which VzBoT do I want?
 
-There are some subtle differences between the two main printers under the VzBot umbrella. The Vz235 and Vz330 are both very capable printers.
+There are some subtle differences between the two main printers under the VzBoT umbrella. The Vz235 and Vz330 are both very capable printers.
 
 **Vz330:**  
 [Vz330 - CNC Aluminium Mellow kit][Vz330]
diff --git a/docs/general/tuning.md b/docs/general/tuning.md
new file mode 100644
index 00000000..2256802c
--- /dev/null
+++ b/docs/general/tuning.md
@@ -0,0 +1,8 @@
+---
+title: Tuning
+description: Tuning your VzBoT printer for quality or performance. Learn how to run Input Shaper tests, analyze results, adjust settings accordingly, mitigate artifacts, reduce sound levels and more.
+tags: [tuning, resonance, input shaper, vibration, sound, noise, quality, speed, performance, stepper tuning, belts, artifacts, ringing, ghosting]
+parent: General info
+slug: tuning
+nav_exclude: true # page not ready for publishing
+---
\ No newline at end of file
diff --git a/docs/vz330_mellow/gantry.md b/docs/vz330_mellow/gantry.md
index bb0b7844..a4312c48 100644
--- a/docs/vz330_mellow/gantry.md
+++ b/docs/vz330_mellow/gantry.md
@@ -16,6 +16,7 @@ All LDO rails are from factory, and should also be cleaned and lubricated. It is
 
 1. [Replace the placeholder parts](#placeholder-parts)
 2. [Printhead](/vz330_mellow/gantry/printhead)
+3. [Belt tensioning](/general/belt-tensioning)
 
 ## Placeholder parts