diff --git a/sass/_button.scss b/sass/_button.scss
index fee5ff1..f41b62b 100644
--- a/sass/_button.scss
+++ b/sass/_button.scss
@@ -24,8 +24,9 @@
 // Set Generic <button> and .btn styling.
 // use .btn on any element to give it the styling of a button
 .btn {
-  @include btn-style(#fff, #eee, #ddd);
-  border-radius: 10px; // rounded corners
+  @include btn-style(#aaa, #000, #ddd);
+  border: 0;
+  //border-radius: 10px; // rounded corners
   color: #fff;
   cursor: pointer;
   display: inline-block; // Enables non-inline-block elements like <a>s to be buttons
@@ -34,19 +35,6 @@
   outline: 0; // when the button is focused, don't show an outline
   padding: 15px 40px 16px;
   text-decoration: none;
-
-  &:not([class*='btn-']) {
-    color: #000;
-    border: 2px solid;
-    padding: 13px 38px 14px;
-    // Won't change the button size, as there's no border on other buttons
-
-    &.sm-btn {
-      padding: 8px 14px 9px;
-      // This padding is 2px smaller than the
-      // normal sm-btn padding to account for the border
-    }
-  }
 }
 
 
@@ -67,8 +55,8 @@
 
 // Add this class to a <button> or element with a .btn class
 // to create a smaller sized button.
-.sm-btn {
-  border-radius: 4px; /* rounded corners */
+.btn-sm {
+  //border-radius: 4px; /* rounded corners */
   font-size: .9em;
   padding: 10px 15px 11px;
 }
diff --git a/sass/_general.scss b/sass/_general.scss
index ab1944e..1adc1ad 100644
--- a/sass/_general.scss
+++ b/sass/_general.scss
@@ -2,8 +2,8 @@
 //  General Min Styling
 //-------------------------------------------------------------------
 
-body {
-  font: 16px sans-serif;
+body, textarea {
+  font: 16px Arial, sans-serif;
   margin: 0;
 }
 
@@ -11,42 +11,13 @@ body {
   transition: all .2s;
 }
 
-hr {
-  margin: 2.5em auto;
+.container {
+  margin: auto;
+  width: 1270px;
 
-  &.mediumwidth {
-    margin: 2.5em auto;
-  }
-}
-
-.mediumwidth {
-  margin-bottom: .3em;
-  margin-left: 30%;
-  margin-top: .3em;
-  width: 40%;
-}
-
-@media (max-width:870px) {
-  .mediumwidth {
-    margin-left: 15%;
-    width: 70%;
-  }
-  .row [class*='c']{
-    display: block;
-    margin: 1% auto;
-    width: 100%;
-  }
-  .row:last-child column {
-    margin-bottom: 2.5em;
-  }
-}
-
-@media (max-width:520px) {
-  .mediumwidth {
-    margin-left: 0;
-    width: 100%;
-  }
-  hr.mediumwidth {
+  @media(max-width:1310px) {
+    margin: 0 20px;
     width: auto;
   }
 }
+
diff --git a/sass/_grid.scss b/sass/_grid.scss
index 037c871..104fbfe 100644
--- a/sass/_grid.scss
+++ b/sass/_grid.scss
@@ -2,6 +2,11 @@
 //-------------------------------------------------------------------
 //  Grid system responsive code is in _general.scss
 //  A hack (for old IEs) for the grid system is located in _iehacks.scss
+//
+//
+//  Every column has 2% padding (1% on each side) its width is
+//  (((its number/12) * 100)-2) percent (truncated, to avoid spillage.)
+//  Thus, c12 has width 98%.
 //-------------------------------------------------------------------
 
 .row {
@@ -15,6 +20,18 @@ column {
   margin: auto 1%;
 }
 
+@media (max-width:870px) {
+  .row column {
+    margin: 1% auto;
+    width: 100%;
+  }
+}
+
+// IE Grid Fix
+.ie column {
+  margin: auto .7%;
+}
+
 .c12 {
 	width: 98%;
 }
diff --git a/sass/_iehacks.scss b/sass/_iehacks.scss
index 220dee6..cec6ad6 100644
--- a/sass/_iehacks.scss
+++ b/sass/_iehacks.scss
@@ -3,22 +3,7 @@
 //  Internet Explorer Hacks
 //-------------------------------------------------------------------
 
-// IE Medium Width
-.ie .mediumwidth {
-  margin-left: 0;
-  width: 70%;
-
-  hr {
-    margin: 100px auto;
-    padding-left: 200px;
-  }
-}
-
-
-// IE Grid System
-.ie column {
-  margin: auto .7%;
-}
+//  no hacks (outside of the ie grid hack found in the grid.scss file)
 
 //-------------------------------------------------------------------
 // End @if
diff --git a/sass/_inputs.scss b/sass/_inputs.scss
index 32418aa..b8e0207 100644
--- a/sass/_inputs.scss
+++ b/sass/_inputs.scss
@@ -12,7 +12,6 @@
 
 textarea, input {
   @extend %global-inputs;
-  font-family: sans-serif;
   outline: 0;
   padding: 6px;
 
diff --git a/sass/_navbar.scss b/sass/_navbar.scss
index 8b0a572..6d76e82 100644
--- a/sass/_navbar.scss
+++ b/sass/_navbar.scss
@@ -3,58 +3,100 @@
 //  Navigation Bar
 //-------------------------------------------------------------------
 
-.navbar {
+.nav {
   background: #000;
   color: #fff;
   height: 1.5em;
+  line-height: 1.5em;
   // max-height: 1.5em; // needed for animations, uncomment to use
-  padding: 1em 0 .6em;
-  text-align: left;
-  width: 100%;
+  padding: .7em 0 .95em;
 
   a {
+    color: #aaa;
+    font-size: 14px;
+    padding-right: 1em;
     text-decoration: none;
+
+    &:hover {
+      color: #fff;
+    }
   }
 
-  input, button, .btn {
+  .pagename {
+    color: #fff;
+    font-size: 22px;
+    position: relative;
+    top: 1px;
+  }
+
+  .current {
+    color: #fff;
+  }
+
+  input, .btn {
     margin-top: -20px;
     // This ensures that any buttons and inputs in the
-    // navbar will not mess up its vertical alignment
+    // .nav will not mess up its vertical alignment
+  }
+}
+
+
+.btn-close {
+  background: #000;
+  border: 0;
+  color: #fff;
+  float: right;
+  font-size: 25px;
+  margin-top: -44px;
+  visibility: hidden;
+}
+
+
+
+// Update styling of .nav for small screens
+@media(max-width:500px) {
+  .btn-close {
+    visibility: visible;
   }
 
-  // Update styling of .navbar for small screens
-  @media(max-width:500px) {
-    height: 7.5em;
+  .nav {
+    overflow: hidden;
+    // transition: max-height .5s ease-in-out, height .5s ease-in-out;
+
+    &:focus {
+      /* Necesary for animations
+      max-height: 500px;
+      height: 100%;
+      */
+      height: auto;
+    }
+
+    &:before {
+      background: #000;
+      border-bottom: 10px double;
+      content: '_';
+      float: right;
+      font-size: 32px;
+      font-weight: bold;
+      height: 21px;
+      line-height: 0;
+      margin-right: 10px;
+      margin-top: -10px;
+      position: relative;
+    }
 
     a {
       display: block;
-      text-align: center;
+      padding: .5em 0;
+      width: 50%;
     }
   }
-}
 
-
-.pagename {
-  color: #fff;
-  font-size: 22px;
-  top: 1px;
-  position: relative;
-}
-
-
-.navbar-link {
-  color: #aaa;
-  font-size: 14px;
-  padding-right: 1em;
-  position: relative;
-  top: -1px;
-
-  &:hover {
-    color: #fff;
+  .pagename {
+    margin-top: -11px;
   }
 }
 
-
 //-------------------------------------------------------------------
 // End @if
 }
diff --git a/sass/_table.scss b/sass/_table.scss
index 90bbccb..ae0aacb 100644
--- a/sass/_table.scss
+++ b/sass/_table.scss
@@ -8,19 +8,21 @@ table {
   width: 100%;
 }
 
+
 tbody tr:nth-child(2n-1) {
   background: #ccc; // Shade every other table row
+  // We use tbody to ensure that we don't shade the heading
+  // this preserves the order of the shading
 }
 
-.table {
-  th, td {
-    line-height: 1.4em;
-    padding: .5em;
-    text-align: left;
-  }
+
+th, td {
+  padding: .5em;
+  text-align: left;
 }
 
 
+
 //-------------------------------------------------------------------
 // End @if
 }
diff --git a/sass/min-master.scss b/sass/min-master.scss
index f827bd0..cc05888 100644
--- a/sass/min-master.scss
+++ b/sass/min-master.scss
@@ -5,6 +5,7 @@
 @import 'general.scss';
 
 
+
 // ------------------------------------------------------------------
 //  Customize Optional Components
 //
@@ -28,7 +29,7 @@ $import-icons:                            true!default;
 
 $import-grid:                             true!default;
 
-$import-ie-hacks:                         true!default;
+$import-ie-hacks:                         false!default;
 
 
 // ------------------------------------------------------------------