diff --git a/less/icons.less b/less/icons.less
index ed2daf7..c1b8ef2 100644
--- a/less/icons.less
+++ b/less/icons.less
@@ -1,4 +1,8 @@
 .ico {
-	font: 33px Arial Unicode MS, Lucida Sans Unicode; /* This combo of Unicode fonts means Min's icons support OSX 10.5+, Windows 98+, and Ubuntu. */
-	/* We don't use ems because 33px is a great size cross-browser and OS for nice icons */
+	font: 33px Arial Unicode MS, Lucida Sans Unicode;
+	/*
+		This combo of Unicode fonts means Min's icons support OSX 10.5+, Windows 98+, and Ubuntu.
+
+		We don't use ems because 33px is a great size cross-browser and OS for nice icons
+	*/
 }
diff --git a/less/messages.less b/less/messages.less
index 6558102..dd9f6d5 100644
--- a/less/messages.less
+++ b/less/messages.less
@@ -1,5 +1,5 @@
 .msg {
-	padding: 1.5em;
 	background: #def;
 	border-left: 5px solid #59d;
-}
\ No newline at end of file
+	padding: 1.5em;
+}
diff --git a/sass/_forms.scss b/sass/_forms.scss
index c258f8c..b040061 100644
--- a/sass/_forms.scss
+++ b/sass/_forms.scss
@@ -29,7 +29,7 @@ input[type='text'], textarea {
 }
 
 
-.addon-front {
+.addon {
   @extend %shared-font-size;
   box-shadow: 0 0 0 1px $c-grey;
   padding: 8px 12px;
diff --git a/sass/_grid.scss b/sass/_grid.scss
index 7d3f95e..100ab81 100644
--- a/sass/_grid.scss
+++ b/sass/_grid.scss
@@ -7,6 +7,10 @@
 // Thus, c12 has width 98%.
 //-------------------------------------------------------------------
 
+%w-100 {
+  width: 100%;
+}
+
 .row {
   margin: 1% 0;
   overflow: auto; // needed for proper formed layout
@@ -16,8 +20,8 @@
   float: left;
 }
 
-.c12, .table {
-  width: 100%;
+.c12 {
+  @extend %w-100;
 }
 
 $grid-list: (
diff --git a/sass/_icons.scss b/sass/_icons.scss
index 4b6ca03..c4f7598 100644
--- a/sass/_icons.scss
+++ b/sass/_icons.scss
@@ -5,11 +5,12 @@
 
 .ico {
   font: 33px Arial Unicode MS, Lucida Sans Unicode;
+
   // This combo of Unicode fonts means Min's icons
   // support OSX 10.5+, Windows 98+, and Ubuntu.
 
   // We don't use ems because 33px is a great size
-  // cross-browser and OS for nice icons */
+  // cross-browser and OS for nice icons
 }
 
 
diff --git a/sass/_messages.scss b/sass/_messages.scss
new file mode 100644
index 0000000..a99a2b4
--- /dev/null
+++ b/sass/_messages.scss
@@ -0,0 +1,14 @@
+@if $import-messages == true {
+//-------------------------------------------------------------------
+//  Messages
+//-------------------------------------------------------------------
+
+.msg {
+  background: #def;
+  border-left: 5px solid #59d;
+  padding: 1.5em;
+}
+
+//-------------------------------------------------------------------
+// End @if
+}
diff --git a/sass/_navbar.scss b/sass/_navbar.scss
index 2e5c306..70d8938 100644
--- a/sass/_navbar.scss
+++ b/sass/_navbar.scss
@@ -13,11 +13,13 @@
 
 .nav {
   @extend %nav-global;
+  height: 24px;
+  padding: 11px 0 15px;
+
    // TODO: migrate to ems
    // (currently we don't use them because of iOS compatibility problems
    // -- has to do with unicode icon for close) */
-  height: 24px;
-  padding: 11px 0 15px;
+
   // Uncomment for animations
   // max-height: 1.5em;
 
@@ -46,10 +48,10 @@
 
 .btn.btn-close {
   background: $c-black;
+  display: none;
   float: right;
   font-size: 25px;
   margin-top: -54px;
-  visibility: hidden;
 }
 
 
@@ -57,7 +59,7 @@
 // Update styling of .nav for small screens
 @media(max-width:500px) {
   .btn.btn-close {
-    visibility: visible;
+    display: block;
   }
 
   .nav {
diff --git a/sass/_table.scss b/sass/_table.scss
index b48cead..e63393e 100644
--- a/sass/_table.scss
+++ b/sass/_table.scss
@@ -4,7 +4,7 @@
 //-------------------------------------------------------------------
 
 .table {
-  border-spacing: 0;
+  @extend %w-100%;
 
   th, td {
     padding: .5em;
diff --git a/sass/min-master.scss b/sass/min-master.scss
index 6fcacd8..ca4a8d6 100644
--- a/sass/min-master.scss
+++ b/sass/min-master.scss
@@ -13,23 +13,25 @@
 //  the final Min CSS output.
 // ------------------------------------------------------------------
 
-$import-headings:                         true!default;
+$import-headings:                         true !default;
 
-$import-buttons:                          true!default;
+$import-buttons:                          true !default;
 
-$import-forms:                            true!default;
+$import-forms:                            true !default;
 
-$import-navbar:                           true!default;
+$import-navbar:                           true !default;
 
-$import-tables:                           true!default;
+$import-tables:                           true !default;
 
-$import-messages:                         true!default;
+$import-messages:                         true !default;
 
-$import-icons:                            true!default;
+$import-icons:                            true !default;
 
-$import-grid:                             true!default;
+$import-grid:                             true !default;
 
-$import-ie-hacks:                         false!default;
+$import-messages:                         true !default;
+
+$import-ie-hacks:                         false !default;
 
 
 // ------------------------------------------------------------------
@@ -43,4 +45,5 @@ $import-ie-hacks:                         false!default;
         'forms',
         'navbar',
         'table',
+        'messages'
         'iehacks';