diff --git a/README.md b/README.md
index 988607d..df1a504 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## 
+##
 
 The [Office of Management and Budget (OMB)](https://www.whitehouse.gov/omb/) has issued the [Data Center Optimization Initiative (DCOI)](https://www.whitehouse.gov/sites/default/files/omb/memoranda/2016/m_16_19_1.pdf) to advance the consolidation and optimization of the Federal Government’s inventory of data centers.  The DCOI supersedes the Federal Data Center Consolidation Initiative (FDCCI) and addresses requirements in the Federal Information Technology Acquisition Reform Act (FITARA).
 
@@ -24,10 +24,16 @@ Install dependencies with Bundler:
 bundle install
 ```
 
+For local development, uncomment the following line in `_config.yml`:
+
+```
+baseurl: /datacenters/
+```
+
 And run the site with Jekyll:
 
 ```
 bundle exec jekyll serve --watch
 ```
 
-If all goes well, visit the site at `http://localhost:4000`.
+If all goes well, visit the site at `http://localhost:4000/datacenters/`.
diff --git a/_config.yml b/_config.yml
index 79e6d1e..9cdda53 100755
--- a/_config.yml
+++ b/_config.yml
@@ -24,7 +24,7 @@ name: "Datacenters.cio.gov"
 description: "Data Center Optimization Initiative (DCOI)"
 baseurl: https://datacenters.cio.gov/
 # Uncomment the following line for localhost development at http://127.0.0.1:4000/datacenters/
-#baseurl: /datacenters/
+#baseurl: /datacenters
 
 # GitHub information
 org_name: whitehouse
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index bd0d781..a94f5e8 100755
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -20,7 +20,7 @@
 
                 <li class="{{ current }}">
                     {% if sublink.url %}
-                        <a href="{{ sublink.url }}">{{ sublink.text }}</a>
+                        <a href="{{ site.baseurl }}{{ sublink.url }}">{{ sublink.text }}</a>
                     {% else %}
                         <span class="sidebar-heading" style="font-size:16px;padding:10px; line-height:1.4em;font-weight:normal">{{ sublink.text }}</span>
                     {% endif %}