diff --git a/website/content/cli.md b/website/content/cli.md
new file mode 100644
index 0000000000000000000000000000000000000000..cd0489a7f9d973f73f1b4b1bf223b518d1a13422
--- /dev/null
+++ b/website/content/cli.md
@@ -0,0 +1,15 @@
+Title: First pass of CLI
+Date: 2016-10-28
+Category: Highlights
+Authors: Brendan
+thumbnail: "/images/cli.png"
+
+One of our objectives on the Ground Station was to develop a command line interface to interact with the ground station back end. Kris and Jake have given us a sneak peek into the CLI they are developing.
+
+<a href="/images/cli.png">
+<figure>
+<img src="images/cli.png">
+</figure>
+</a>
+
+We can already see basic functionality in their CLI, as well as reliable error handling with the command parser.
diff --git a/website/content/images/cli.png b/website/content/images/cli.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd467e0b653f66a4af9f2e19d645db32573deeb7
Binary files /dev/null and b/website/content/images/cli.png differ
diff --git a/website/content/images/measuring_moi.jpg b/website/content/images/measuring_moi.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3a129340d7f943986f6f7f272147e7551583b7f3
Binary files /dev/null and b/website/content/images/measuring_moi.jpg differ
diff --git a/website/content/images/new_cli.png b/website/content/images/new_cli.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa4016bdf0ce2f552e61e470f87d9eb6522adad9
Binary files /dev/null and b/website/content/images/new_cli.png differ
diff --git a/website/content/images/wifi_testing.png b/website/content/images/wifi_testing.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2fab6efdfebfdb2a3aba850903bc0a67799fcda
Binary files /dev/null and b/website/content/images/wifi_testing.png differ
diff --git a/website/content/measuring_moi.md b/website/content/measuring_moi.md
new file mode 100644
index 0000000000000000000000000000000000000000..bb3db8294bbcd07f70287e12b95c394ea4c30761
--- /dev/null
+++ b/website/content/measuring_moi.md
@@ -0,0 +1,15 @@
+Title: Measuring Moment of Inertia
+Date: 2016-10-25
+Authors: Brendan
+Category: Highlights
+thumbnail: "/images/measuring_moi.jpg"
+
+In order to develop our physical model of the quadcopter, we need to know the moment of inertia around all axes of the quadcopter. After some unreliable results from our lab ECP machine, we needed a new method to measure the moment of inertia, and we decided to resort to the methods used in our classical physics courses.
+
+<a href="/images/measuring_moi.jpg">
+<figure>
+<img src="/images/measuring_moi.jpg">
+</figure>
+</a>
+
+With a bizarre setup of clamps, we setup the quad to measure the MOIs of every axis. A simple mass-pully-string system provides a known torque on the turn-table, and the spinning of the turn-table is measured in time using an encoder. From this data, we were able to calculate the moment of inertia. Thanks to the Physics Deptartment for their help!
diff --git a/website/content/pages/home.md b/website/content/pages/about.md
similarity index 86%
rename from website/content/pages/home.md
rename to website/content/pages/about.md
index dca80adc01430c39651866301c5ca368a3265850..b6c6e23fa3f221efacb4394e25719685e27b3e26 100644
--- a/website/content/pages/home.md
+++ b/website/content/pages/about.md
@@ -1,13 +1,13 @@
-Title: MicroCART
-url:
-save_as: index.html
+Title: About
 date: 2016-11-19
 sortorder: 001
+
+# MicroCART
 ## Microprocessor Controlled Aerial Robot Team
 
 **Senior Design Group**: may1716
 
-<img align="right" src="images/quad_pic.png" width="40%">
+<img align="right" src="/images/quad_pic.png" width="40%">
 
 MicroCART is an ongoing senior design project focused on the
 development of a quadcopter as a research platform for controls and
diff --git a/website/content/updated_cli.md b/website/content/updated_cli.md
new file mode 100644
index 0000000000000000000000000000000000000000..b60f023a2a17f8315c0fa54e8b649af40cbf3f7c
--- /dev/null
+++ b/website/content/updated_cli.md
@@ -0,0 +1,15 @@
+Title: CLI Improved
+Date: 2016-11-29
+Authors: Brendan
+Category: Highlights
+thumbnail: "/images/new_cli.png"
+
+Jake and Kris have continued their work on the command line interface and have provided another sample of the most recent CLI functionality.
+
+<a href="/images/new_cli.png">
+<figure>
+<img src="/images/new_cli.png">
+</figure>
+</a>
+
+This example shows some of the commands used to control the PID constants of the quadcopter. On the right top are the commands being executed; on the left is the backend daemon; and on the right bottom is a continuously running monitor that refreshes 10 times per second.
diff --git a/website/content/wifi_latency_update.md b/website/content/wifi_latency_update.md
new file mode 100644
index 0000000000000000000000000000000000000000..33f2db5456aa9026710fecede6a34c4e541041b7
--- /dev/null
+++ b/website/content/wifi_latency_update.md
@@ -0,0 +1,17 @@
+Title: Wifi Latency Testing
+Date: 2016-09-22
+Authors: Brendan
+Category: Highlights
+thumbnail: "/images/wifi_testing.png"
+
+Historically, all wireless communication to the quadcopter has been accomplished through bluetooth. We've noticed that the bluetooth one-way latency was around 60-80 ms on average, which is not quite fast enough for our needs, especially if any control algorithm computations are to be performed on the ground station.
+
+David took up the challenge to test a promising solution using Wi-Fi instead of Bluetooth, and his initial tests revealed some promising metrics.
+
+<a href="/images/wifi_testing.png">
+<figure>
+<img src="/images/wifi_testing.png">
+</figure>
+</a>
+
+He tested communication with both UDP and TCP protocols, but more importantly the one-way latency for both protocols was far less than our bluetooth setup, with most of the wifi latency distrubtion falling below 20ms.
diff --git a/website/themes/notmyidea/static/css/main.css b/website/themes/notmyidea/static/css/main.css
index ac849f99bf14080f11be7eb8f4b9ed698b0b38b4..3e39c1259cdba1310dd5d3120396f0e01e1abaa6 100644
--- a/website/themes/notmyidea/static/css/main.css
+++ b/website/themes/notmyidea/static/css/main.css
@@ -25,7 +25,7 @@ body {
     text-align: left;
     width: 90%;
     display: inline-block;
-    max-width: 80em;
+    max-width: 60em;
 }
 
 * {
@@ -94,12 +94,6 @@ ol {
 li { margin-top: 0.5em;
      margin-bottom: 1em; }
 
-.post-info {
-    float:right;
-    margin:10px;
-    padding:5px;
-}
-
 .post-info p{
     margin-top: 1px;
     margin-bottom: 1px;
@@ -235,7 +229,6 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	margin-bottom: 2em;
 	overflow: hidden;
 	padding: 20px;
-	width: 760px;
 	
 	border-radius: 10px;
 	-moz-border-radius: 10px;
@@ -271,7 +264,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 }
 
 #content img {
-	padding: 1em;
+	/* padding: 1em; */
 }
 
 /* #content h1, #content h2, #content p, #content img {
@@ -390,7 +383,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 }
 li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 #content > .hentry {padding: 1em 0;}
-.hentry img{display : none ;}
+.hentry img{ display: none; }
 .entry-title {font-size: 3em; /*! margin-bottom: 10px; */ /*! margin-top: 0; */}
 .entry-title a:link, .entry-title a:visited {text-decoration: none; color: #333;}
 .entry-title a:visited {background-color: #fff;}
@@ -474,6 +467,34 @@ footer {
 	padding: 0;
 }
 
+img {
+  padding: 0;
+  margin: 0;
+  max-width: 100%;
+  max-height: 400px;
+}
+
+.hentry .thumbnail {
+  display: inline-block;
+  height: 100px;
+  /*! float: left; */
+  margin: 1em 0;
+}
+
+figure {
+  text-align: center;
+}
+
+.post-content {
+	display: inline-block;
+}
+
+.post-info {
+  display: inline-block;
+  vertical-align: top;
+  margin: 1em;
+}
+
 @media screen and (max-width:500px) {
 
 	#banner nav li {
diff --git a/website/themes/notmyidea/templates/article_infos.html b/website/themes/notmyidea/templates/article_infos.html
index 172ad85dd748cad2c5ed9af2914163ad16004f10..0f67eba6e317bbdd1f69eb177867bc5a981654a5 100644
--- a/website/themes/notmyidea/templates/article_infos.html
+++ b/website/themes/notmyidea/templates/article_infos.html
@@ -1,11 +1,11 @@
-<footer class="post-info">
+<div class="post-info">
         <abbr class="published" title="{{ article.date.isoformat() }}">
-                Published: {{ article.locale_date }}
+                {{ article.locale_date }}
         </abbr>
         {% if article.modified %}
 		<br />
         <abbr class="modified" title="{{ article.modified.isoformat() }}">
-                Updated: {{ article.locale_modified }}
+                {{ article.locale_modified }}
         </abbr>
         {% endif %}
 
@@ -20,4 +20,5 @@
 {% include 'taglist.html' %}
 {% import 'translations.html' as translations with context %}
 {{ translations.translations_for(article) }}
-</footer><!-- /.post-info -->
+
+</div><!-- /.post-info -->
diff --git a/website/themes/notmyidea/templates/base.html b/website/themes/notmyidea/templates/base.html
index edbb83ffb8855cd6b31e9ad04fb8752ba24820c3..c2155dcc5fe59dd1059941b38332604829ec4e65 100644
--- a/website/themes/notmyidea/templates/base.html
+++ b/website/themes/notmyidea/templates/base.html
@@ -36,6 +36,7 @@
                     <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
                 {% endfor %}
                 {% endif %}
+                    <li><a href="https://wikis.ece.iastate.edu/microcart-senior-design/index.php/2016-2017_Main_Page">Wiki</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
         {% block content %}
diff --git a/website/themes/notmyidea/templates/index.html b/website/themes/notmyidea/templates/index.html
index 6019987becb4047ed0f838fb26f3214f2f7bd99c..9881b88717b522fb69922da533d973534dac6898 100644
--- a/website/themes/notmyidea/templates/index.html
+++ b/website/themes/notmyidea/templates/index.html
@@ -4,24 +4,9 @@
 {% if articles %}
     {% for article in articles_page.object_list %}
 
-        {# First item #}
-        {% if loop.first and not articles_page.has_previous() %}
-            <aside id="featured" class="body">
-                <article>
-                    <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
-                    {% include 'article_infos.html' %}{{ article.content }}{% include 'comments.html' %}
-                </article>
-            </aside><!-- /#featured -->
-            {% if loop.length > 1 %}
-                <section id="content" class="body">
-                    <h1>Other articles</h1>
-                    <hr />
-                    <ol id="posts-list" class="hfeed">
-            {% endif %}
-        {# other items #}
-        {% else %}
             {% if loop.first %}
                 <section id="content" class="body">
+                    <h1>Highlights</h1>
                     <ol id="posts-list" class="hfeed" start="{{ articles_paginator.per_page -1 }}">
             {% endif %}
             <li><article class="hentry">
@@ -31,13 +16,18 @@
                 </header>
 
                 <div class="entry-content">
-                {% include 'article_infos.html' %}
-                {{ article.summary }}
-                <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
-                {% include 'comments.html' %}
+                  <div class="post-info-wrapper">
+                    <img class="thumbnail" src={{ article.thumbnail }}>
+                    {% include 'article_infos.html' %}
+                  </div>
+                  <div class="post-content">
+                    {{ article.summary }}
+                  </div>
+                  <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
+                  {% include 'comments.html' %}
                 </div><!-- /.entry-content -->
             </article></li>
-        {% endif %}
+
         {% if loop.last %}
             {% if loop.length > 1 or articles_page.has_other_pages() %}
                 </ol><!-- /#posts-list -->