diff --git a/docs/Gemfile b/docs/Gemfile
index 37f5eaa4..bcd3be7d 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
 gem 'github-pages', group: :jekyll_plugins
+gem 'jekyll-redirect-from'
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index a8c1c4a1..feb6c6f6 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -245,6 +245,7 @@ PLATFORMS
 
 DEPENDENCIES
   github-pages
+  jekyll-redirect-from
 
 BUNDLED WITH
    1.16.1
diff --git a/docs/_config.yaml b/docs/_config.yaml
index 0333b947..49bf96c2 100644
--- a/docs/_config.yaml
+++ b/docs/_config.yaml
@@ -1,2 +1,4 @@
 theme: jekyll-theme-minimal
 exclude: [ruby-bundle]
+plugins:
+  - jekyll-redirect-from
diff --git a/docs/_data/index.yaml b/docs/_data/index.yaml
index f55f1548..4070d1e4 100644
--- a/docs/_data/index.yaml
+++ b/docs/_data/index.yaml
@@ -6,7 +6,7 @@ sections:
   - title: For Users
     docs:
       - title: Getting Started
-        url: getting-started
+        url: /
       - title: ODrive Tool
         url: odrivetool
       - title: Parameters & Commands
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 0d862ce8..99fd9256 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -55,7 +55,8 @@
       <section>
 
       <div class="edit">
-        {% assign filename = page.url | replace_first: '/', '' | replace: '.html', '.md' %}
+          {% assign filename = page.url | replace_first: '/', '' | replace: '.html', '.md' %}
+          {% if filename == '' %}{% assign filename = 'getting-started.md' %}{% endif %}
         <!-- edit icon taken from GitHub -->
         <svg transform="translate(0,1)" class="octicon octicon-pencil" viewBox="0 0 14 16" version="1.1" width="10" height="12" aria-hidden="true">
           <path fill-rule="evenodd" d="M0 12v3h3l8-8-3-3-8 8zm3 2H1v-2h1v1h1v1zm10.3-9.3L12 6 9 3l1.3-1.3a.996.996 0 0 1 1.41 0l1.59 1.59c.39.39.39 1.02 0 1.41z"></path>
@@ -93,6 +94,9 @@
           if (links[i].getAttribute("href").slice(0, 3) == "../") {
             links[i].href = "https://github.com/madcowswe/ODrive/blob/master/" + links[i].getAttribute("href").slice(3);
           }
+          if (links[i].getAttribute("href").slice(0, 15) == "getting-started") {
+            links[i].href = "/" + links[i].getAttribute("href").slice(15);
+          }
         }
       }
     </script>
diff --git a/docs/getting-started.md b/docs/getting-started.md
index b6a8197d..19287ca2 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -1,3 +1,9 @@
+---
+redirect_from:
+ - /getting-started
+permalink: /
+---
+
 # Getting Started
 
 ### Table of contents
diff --git a/docs/index.md b/docs/index.md
deleted file mode 100644
index 58622112..00000000
--- a/docs/index.md
+++ /dev/null
@@ -1,6 +0,0 @@
-
-{% for section in site.data.index.sections %}
-## {{ section.title }}
-{% for item in section.docs %}
- * [{{ item.title }}]({{ item.url }}) {% endfor %}
-{% endfor %}