diff --git a/docs/_static/pep-0001-1.png b/docs/_static/pep-0001-1.png
new file mode 100644
index 0000000..51eb2b2
Binary files /dev/null and b/docs/_static/pep-0001-1.png differ
diff --git a/docs/conf.py b/docs/conf.py
index b4d1833..a7ff4a6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -69,7 +69,10 @@ release = '0.0.1'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build']
+exclude_patterns = [
+    '_build',
+    '_themes/*.rst',  # Excluded due to README.rst in _themes/
+]
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None
diff --git a/docs/contents.rst.inc b/docs/contents.rst.inc
index b312ee3..bf04003 100644
--- a/docs/contents.rst.inc
+++ b/docs/contents.rst.inc
@@ -13,6 +13,7 @@ This part of the guide focuses on setting up your Python environment.
  .. toctree::
     :maxdepth: 1
 
+    starting/installation
     starting/install/osx
     starting/install/win
     starting/install/linux
@@ -84,6 +85,7 @@ Development Environment
 
    dev/env
    dev/virtualenvs
+   dev/pip-virtualenv
 
 
 
diff --git a/docs/starting/pip-virtualenv.rst b/docs/dev/pip-virtualenv.rst
similarity index 100%
rename from docs/starting/pip-virtualenv.rst
rename to docs/dev/pip-virtualenv.rst
diff --git a/docs/intro/community.rst b/docs/intro/community.rst
index ff65aab..754d533 100644
--- a/docs/intro/community.rst
+++ b/docs/intro/community.rst
@@ -60,12 +60,12 @@ You can read more at `The PEP Index <http://www.python.org/dev/peps/>`_.
 Submitting a PEP
 ~~~~~~~~~~~~~~~~
 
- PEPs are peer-reviewed and accepted/rejected after much discussion. Anyone
- can write and submit a PEP for review.
+PEPs are peer-reviewed and accepted/rejected after much discussion. Anyone
+can write and submit a PEP for review.
 
- Here's an overview of the PEP acceptance workflow:
+Here's an overview of the PEP acceptance workflow:
 
- .. image:: https://www.python.org/m/dev/peps/pep-0001/pep-0001-1.png
+.. image:: ../_static/pep-0001-1.png
 
 
 Python Conferences
diff --git a/docs/starting/installation.rst b/docs/starting/installation.rst
index 91de5a9..04aaaa0 100644
--- a/docs/starting/installation.rst
+++ b/docs/starting/installation.rst
@@ -14,9 +14,8 @@ Installation Guides
 -------------------
 
 These guides go over the proper installation of :ref:`Python 2.7 <which-python>`
- for development purposes, as well as setuptools, pip, and virtualenv setup.
+for development purposes, as well as setuptools, pip, and virtualenv setup.
 
 - :ref:`Mac OS X <install-osx>`.
-- :ref:`Microsoft Windows<install-windows>`.
+- :ref:`Microsoft Windows <install-windows>`.
 - :ref:`Ubuntu Linux <install-linux>`.
-