diff --git a/.gitignore b/.gitignore
index a8934f3fe..2e31a9c2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@ output/
 id_rsa
 id_rsa.pub
 __pycache__
+web/.doit.db.bak
+web/.doit.db.dat
+web/.doit.db.dir
diff --git a/web/conf.py b/web/conf.py
index 8d991bfc0..ec4559796 100644
--- a/web/conf.py
+++ b/web/conf.py
@@ -28,6 +28,12 @@
 PROJECT_REPOSITORY = "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/PlasmaPy/PlasmaPy"
 BLOG_DESCRIPTION = "Webpage for PlasmaPy."  # (translatable)
 
+DOCS = "http://docs.plasmapy.org/"
+RIOT = "https://riot.im/app/#/room/#plasmapy:openastronomy.org"
+TWITTER = "https://twitter.com/plasmapy"
+MAILING_LIST = "https://groups.google.com/forum/#!forum/plasmapy"
+RITIEK = "https://ritiek.github.io/posts/"
+
 # Nikola is multilingual!
 #
 # Currently supported languages are:
@@ -134,15 +140,27 @@
 
 NAVIGATION_LINKS = {
     DEFAULT_LANG: (
+        (PROJECT_REPOSITORY, "GitHub repository"),
         ((
-            ("/about", "About PlasmaPy"),
-            # ("/acknowledging", "Acknowledging"),
-            ("/conduct", "Code of Conduct")
-        ), "About"),
-        ("http://docs.plasmapy.org/", "Documentation"),
+          ("/about", "About PlasmaPy"),
+          ("/", "PlasmaPy News"),
+          ("/acknowledging", "Acknowledging"),
+          ("/conduct", "Code of Conduct")
+         ), "About"),
+        (DOCS, "Documentation"),
         # ("/quickstart", "Quickstart guide"),
         ("/contribute", "Contribute"),
+        
+        ((
+          (RIOT, "Chat"),
+          (TWITTER, "Twitter"),
+          (MAILING_LIST, "Mailing list"),
+        ), "Contact us!"),
         # ("/team", "Team"),
+        ((
+          (RITIEK, "GSoC 2018"),
+        ), "Google Summer of Code"),
+          
     )
 }
 
@@ -943,7 +961,7 @@
 
 # A small copyright notice for the page footer (in HTML).
 # (translatable)
-CONTENT_FOOTER = 'Contents &copy; {date}         <a href="{repo}">{author}</a> - {license} - Powered by         <a href="https://getnikola.com" rel="nofollow">Nikola</a>'
+CONTENT_FOOTER = 'Contents &copy; {date} <a href="{repo}">{author}</a> - {license} - <a href="{twitter}">Twitter</a> - <a href="{riot}">Chat</a> - Powered by <a href="https://getnikola.com" rel="nofollow">Nikola</a>'
 
 # Things that will be passed to CONTENT_FOOTER.format().  This is done
 # for translatability, as dicts are not formattable.  Nikola will
@@ -965,7 +983,9 @@
             "repo": PROJECT_REPOSITORY,
             "author": BLOG_AUTHOR,
             "date": time.gmtime().tm_year,
-            "license": LICENSE
+            "license": LICENSE,
+            "twitter": TWITTER,
+            "riot": RIOT,
         }
     )
 }
diff --git a/web/pages/about.html b/web/pages/about.html
index 8846dc753..5d8fa0c83 100644
--- a/web/pages/about.html
+++ b/web/pages/about.html
@@ -46,7 +46,7 @@ <h2>Get PlasmaPy</h2>
             <h2>Get Involved</h2>
             <p>
                 We need your help, every contribution is appreciated!
-                Check out <a href="contribute">our contribution guide</a> to PlasmaPy.
+                Check out <a href="https://www.plasmapy.org/contribute">our contribution guide</a> to PlasmaPy.
             </p>
         </div>
         <div id="main-text-block">
diff --git a/web/pages/acknowledging.md b/web/pages/acknowledging.md
new file mode 100644
index 000000000..774432643
--- /dev/null
+++ b/web/pages/acknowledging.md
@@ -0,0 +1,23 @@
+title: Acknowledging PlasmaPy
+slug: acknowledging
+
+If you use PlasmaPy for a project resulting in a publication, we ask
+that you cite the following reference
+([BibTeX](https://zenodo.org/record/1238132/export/hx#.WvMkQK0cChc)):
+
+* PlasmaPy Community, Nicholas A. Murphy, Andrew J. Leonard, Dominik
+  Stańczak, Pawel M. Kozlowski, Samuel J. Langendorf, Colby C. Haggerty,
+  Jasper P. Beckers, Stuart J. Mumford, Tulasi N. Parashar, and Yi-Min
+  Huang. (2018, April). PlasmaPy: an open source community-developed
+  Python package for plasma physics. Zenodo.
+  http://doi.org/10.5281/zenodo.1238132
+
+We provide the following standard acknowledgment with this citation that
+you may use instead of a citation in the body of a paper.
+
+* This research made use of PlasmaPy, a community-developed open source
+  core Python package for plasma physics (PlasmaPy Community 2018).
+
+We highly encourage researchers to acknowledge the packages that
+PlasmaPy depends on, including but not limited to Astropy, NumPy, and
+SciPy.
diff --git a/web/pages/contribute.md b/web/pages/contribute.md
index 4223b1014..052c8bb58 100644
--- a/web/pages/contribute.md
+++ b/web/pages/contribute.md
@@ -66,7 +66,7 @@ one if necessary) to make sure there is no work duplication.
 
 You can find most of what you should know in the [Contributing Guide](http://docs.plasmapy.org/en/master/development/index.html).
 
-Please note that PlasmaPy has a [Code of Conduct](CODE_OF_CONDUCT.md).
+Please note that PlasmaPy has a [Code of Conduct](/conduct).
 
 Issues marked by the community as *help wanted* mean just that - either they're
 good contributions for outsiders or there's an issue in the ongoing work that