diff --git a/expansionadding.html b/expansionadding.html
index 90f8608..656b452 100644
--- a/expansionadding.html
+++ b/expansionadding.html
@@ -13,7 +13,7 @@
   <script src='/flatdoc/flatdoc.js'></script>
 
   <!-- Flatdoc theme -->
-  <link  href='/flatdoc/theme-dark/style.css?2' rel='stylesheet'>
+  <link  href='/flatdoc/theme-dark/style.css?3' rel='stylesheet'>
   <script src='/flatdoc/theme-dark/script.js?1'></script>
 
   <!-- Highlight.js --> 
@@ -26,7 +26,7 @@
   <!-- Initializer -->
   <script>
     Flatdoc.run({
-      fetcher: Flatdoc.github('darkwaterfoundation/docs', 'expansions.md')
+      fetcher: Flatdoc.github('darkwaterfoundation/docs', 'expansionadding.md')
     });
 
     $(document).on('flatdoc:ready', function() {
diff --git a/readme.md b/readme.md
index 5d88692..14d81c5 100644
--- a/readme.md
+++ b/readme.md
@@ -10,13 +10,15 @@ The 640 (Six for Zero) board is a DC and Stepper motor control board capable of
 
 ![640](/images/640-450.png)
 
-- [Getting started](/640.html#getting-started) setting up your 640 board ready for use
+- [Getting started](/640.html#getting-started) find out about your 640 board
+- [Setup your 640](/640.html640.html#setup-your-640) setting up your 640 board ready for use
+- [Setting up your Pi](/640.html#setting-up-your-pi) setting up your Raspberry Pi
 - [Wiring everything up](/640.html) connecting your power, motors and servos
-- [Programming in Python](/640.html) the Python API and how to use it
-- [Programming in C++](/640.html) controlling the board in C++
+- [Programming in Python](/640.html#programming-the-640-installing-the-python-libraries) the Python API and how to use it
+- [Programming in C++](/640.html#programming-the-640-installing-the-c-libraries) controlling the board in C++
 - [Set up RC Input]() reading input from your RC receiver
 - [Expanding](/expansionadding.html) adding extra expansion boards
-- [Get Advanced](/640advanced.html) more advanced things you can do
+- [Get Advanced]() more advanced things you can do
 
 [Pre-Order a 640 board >](https://darkwater.io/product/640-dc-motor-control-board/)
 
@@ -26,13 +28,15 @@ The ESCAPE (ESC-cape) board was designed to provide a method of using brushless
 
 ![escape](/images/escape-450.png)
 
-- [Getting started](/escape.html) setting up your ESCAPE board ready for use
+- [Getting started](/escape.html#getting-started) find out about your ESCAPE board
+- [Setup your ESCAPE](/escape.html#setup-your-escape) setting up your ESCAPE board ready for use
+- [Setting up your Pi](/escape.html#setting-up-your-pi) setting up your Raspberry Pi
 - [Wiring everything up](/escape.html) connecting your power, motors and servos
-- [Programming in Python](/escape.html) the Python API and how to use it
-- [Programming in C++](/escape.html) controlling the board in C++
+- [Programming in Python](/escape.html#programming-the-escape-installing-the-python-libraries) the Python API and how to use it
+- [Programming in C++](/escape.html#programming-the-escape-installing-the-c-libraries) controlling the board in C++
 - [Set up RC Input]() reading input from your RC receiver
 - [Expanding](/expansionadding.html) adding extra expansion boards
-- [Get Advanced](/escapeadvanced.html) more advanced things you can do
+- [Get Advanced]() more advanced things you can do
 
 [Pre-Order an ESCAPE board >](https://darkwater.io/product/escape-esc-powered-motor-control-board/)