diff --git a/couscous.yml b/couscous.yml
index b1328bf0..4ca08f61 100644
--- a/couscous.yml
+++ b/couscous.yml
@@ -20,12 +20,12 @@ menu:
                 getting-started-install-swift-3:
                     text: Install Swift 3
                     relativeUrl: getting-started/install-swift-3.html
-                getting-started-quickstart:
-                    text: Manual QuickStart
-                    relativeUrl: getting-started/quickstart.html
                 getting-started-install-toolbox:
                     text: Install Toolbox
                     relativeUrl: getting-started/install-toolbox.html
+                getting-started-manual:
+                    text: Manual
+                    relativeUrl: getting-started/manual.html
                 getting-started-hello-world:
                     text: Hello, World
                     relativeUrl: getting-started/hello-world.html
@@ -74,21 +74,21 @@ menu:
         http:
             name: HTTP
             items:
-                guide-request:
+                http-request:
                   text: Request
                   relativeUrl: http/request.html
-                guide-response:
+                http-response:
                     text: Response
                     relativeUrl: http/response.html
-                guide-response-body:
+                http-body:
                     text: Body
                     relativeUrl: http/body.html
-                guide-response-representable:
+                http-response-representable:
                     text: ResponseRepresentable
                     relativeUrl: http/response-representable.html
-                guide-responder:
+                http-responder:
                     text: Responder
                     relativeUrl: http/responder.html
-                guide-client:
+                http-client:
                     text: Client
                     relativeUrl: http/client.html
diff --git a/getting-started/install-swift-3.md b/getting-started/install-swift-3.md
index 5ca40cd2..2d991d06 100644
--- a/getting-started/install-swift-3.md
+++ b/getting-started/install-swift-3.md
@@ -6,7 +6,7 @@ currentMenu: getting-started-install-swift-3
 
 This section assumes you have followed the operating system specific instructions for either [macOS](install-swift-3-macos.md) or [Ubuntu](install-swift-3-ubuntu.md).
 
-To use Vapor, you must have Swift 3 installed. Each version of Vapor relies on a single Development Snapshot of Swift 3. Vapor 0.15 relies on `DEVELOPMENT-SNAPSHOT-2016-07-25-a`.
+To use Vapor, you must have Swift 3 installed. Each version of Vapor relies on a single Development Snapshot of Swift 3. Vapor 0.16 relies on `DEVELOPMENT-SNAPSHOT-2016-07-25-a`.
 
 ## Swiftenv
 
diff --git a/getting-started/install-toolbox.md b/getting-started/install-toolbox.md
index 91e486d7..82fb39db 100644
--- a/getting-started/install-toolbox.md
+++ b/getting-started/install-toolbox.md
@@ -6,6 +6,8 @@ currentMenu: getting-started-install-toolbox
 
 Vapor's command line interface provides shortcuts and assistance for commons tasks.
 
+> If you do not want to install the Toolbox, checkout the [Manual](manual.md) quickstart.
+
 ## Install
 
 Run the following script to install the [Toolbox](https://github.com/qutheory/toolbox).
diff --git a/getting-started/quickstart.md b/getting-started/manual.md
similarity index 79%
rename from getting-started/quickstart.md
rename to getting-started/manual.md
index 3dd9aeb1..77057bb2 100644
--- a/getting-started/quickstart.md
+++ b/getting-started/manual.md
@@ -1,19 +1,23 @@
 ---
-currentMenu: getting-started-quick-start
+currentMenu: getting-started-manual
 ---
 
-# Vapor Quickstart
+# Manual Quickstart
 
-This document assumes that the appropriate version of Swift is installed for Vapor. Right now, this is visible on the [vapor](https://github.com/qutheory/vapor#-environment) section of the repository.
+Learn how to create a Vapor project without the Vapor Toolbox using just Swift 3 and the Swift Package Manager.
 
-You can run the following to check compatibility:
+> If you'd prefer to use the toolbox, learn how to install it [here](install-toolbox.md).
+
+This document assumes that the appropriate version of Swift is installed for Vapor 0.16.
+
+## Check
+
+To check that your environment is compatible, run the following script:
 
 ```bash
 curl -sL check.qutheory.io | bash
 ```
 
-> If you'd prefer to use our built in tool, you can find information [here](install-toolbox.md)
-
 ## Make new project using SwiftPM
 
 Open your terminal
diff --git a/http/body.md b/http/body.md
index 04bb2cf7..a1cba128 100644
--- a/http/body.md
+++ b/http/body.md
@@ -1,5 +1,5 @@
 ---
-currentMenu: http-request
+currentMenu: http-body
 ---
 
 > Module: `import HTTP`
diff --git a/http/responder.md b/http/responder.md
index 55672e92..a3515d4a 100644
--- a/http/responder.md
+++ b/http/responder.md
@@ -1,5 +1,5 @@
 ---
-currentMenu: http-response-representable
+currentMenu: http-responder
 ---
 
 > Module: `import HTTP`