diff --git a/less/buttons.less b/less/buttons.less
index 1378932..4cd8207 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -24,7 +24,7 @@
 	color: #000;
 	border: 2px solid;
 	padding: 13px 38px 14px; /* This way we don't change the button size, as there's no border on other buttons */
-	&.small-btn {
+	&.btn-small {
 		padding: 8px 14px 9px; /* This padding is 2px smaller than the normal small-btn padding to account for the border */
 	}
 }
@@ -60,7 +60,7 @@
 	}
 }
 
-.small-btn {
+.btn-small {
 	padding: 10px 15px 11px;
 	font-size: .9em;
 	border-radius: 4px; /* rounded corners */
diff --git a/less/general.less b/less/general.less
index 313c3be..13058c8 100644
--- a/less/general.less
+++ b/less/general.less
@@ -1,7 +1,6 @@
 body, textarea {
-	font-family: Arial, sans-serif;
+	font: 16px Arial, sans-serif;
 	margin: 0;
-	font-size: 16px;
 }
 
 .smooth {
diff --git a/less/inputs.less b/less/inputs.less
index 62812f0..722120b 100644
--- a/less/inputs.less
+++ b/less/inputs.less
@@ -1,8 +1,13 @@
+textarea, input, .addon-front {
+	border: 1px solid #ccc;
+	font-size: .8em;
+}
+
 textarea, input {
 	outline: 0;
 	padding: 6px;
 	&:focus {
-		border: 1px solid #5ab;
+		border-color: #5ab;
 	}
 }
 
@@ -15,8 +20,3 @@ textarea, input[type='text'] {
 	margin-right: -2px;
 	border-right: 0;
 }
-
-textarea, input, .addon-front {
-	border: 1px solid #ccc;
-	font-size: .8em;
-}
diff --git a/less/navbar.less b/less/navbar.less
index 2b196f9..91450f0 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -7,6 +7,9 @@ nav {
 	height: 1.5em;
 	padding: .7em 0 .95em;
 	outline: 0;
+	/* Necessary for animations
+	max-height: 1.5em;
+	*/
 }
 
 .navbar a {
@@ -51,12 +54,6 @@ button.btn.close.small-btn {
 	/* This ensures that any buttons and inputs in the navbar will not mess up its vertical alignment */
 }
 
-/* Necessary for animations
-.navbar {
-	max-height: 1.5em;
-}
-*/
-
 @media (max-width:500px) {
 	button.btn.close.small-btn {
 		visibility: visible;
diff --git a/sass/_button.scss b/sass/_button.scss
index f6cfd1a..238c217 100644
--- a/sass/_button.scss
+++ b/sass/_button.scss
@@ -26,24 +26,32 @@
 // 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 */
+  border-radius: 10px; // rounded corners
   border: 0;
   color: #fff;
   cursor: pointer;
-  display: inline-block; /* Enables non-inline-block elements like <div>s to be buttons */
+  display: inline-block; // Enables non-inline-block elements like <div>s to be buttons
   font-size: 2.5em;
   margin: .3em .7em;
-  outline: 0; /* when the button is focused, don't show an outline */
+  outline: 0; // when the button is focused, don't show an outline
   padding: 15px 40px 16px;
   text-decoration: none;
 
   // to make sure buttons are visible when not paired with a coloring
   // class, we give the <button> and .btn a dark border and text color
   &:not([class*='btn-']) {
+    border: 2px solid;
     box-shadow: 0 0 0 2px inset;
-    color: #000;
     // We use box shadow here because then we can
     // apply a border without changing the element height
+    color: #000;
+    padding: 13px 38px 14px;
+    // keeps relative sizing to buttons w/out borders
+
+    &.btn-small {
+      padding: 8px 14px 9px;
+      // 2px smaller than the normal padding to account for the border
+    }
   }
 }
 
diff --git a/sass/_headings.scss b/sass/_headings.scss
index de33d5e..8bf369b 100644
--- a/sass/_headings.scss
+++ b/sass/_headings.scss
@@ -3,8 +3,7 @@
 //  Headings
 //-------------------------------------------------------------------
 
-/* Make the default heading style larger */
-// Set style for <h1>
+// Set style for <h1> -- larger than 'normal'
 h1 {
   font-size: 4em;
 }
diff --git a/sass/_icons.scss b/sass/_icons.scss
index e72a220..dd6444c 100644
--- a/sass/_icons.scss
+++ b/sass/_icons.scss
@@ -5,7 +5,9 @@
 
 ico {
   font-size: 2.04em;
-  font-family: Arial Unicode MS, Lucida Sans Unicode, sans-serif; /* This combo of Unicode fonts means Min's icons support OSX 10.5+, Windows 98+, and Ubuntu. */
+  font-family: Arial Unicode MS, Lucida Sans Unicode, sans-serif;
+  // This combo of Unicode fonts means Min's icons support
+  // OSX 10.5+, Windows 98+, and Ubuntu.
 }
 
 
diff --git a/sass/_inputs.scss b/sass/_inputs.scss
index 678a7a5..32418aa 100644
--- a/sass/_inputs.scss
+++ b/sass/_inputs.scss
@@ -13,11 +13,11 @@
 textarea, input {
   @extend %global-inputs;
   font-family: sans-serif;
-  outline: none;
+  outline: 0;
   padding: 6px;
 
   &:focus {
-    border: 1px solid #5ab;
+    border-color: #5ab;
   }
 }
 
diff --git a/sass/_navbar.scss b/sass/_navbar.scss
index e56c68a..8b0a572 100644
--- a/sass/_navbar.scss
+++ b/sass/_navbar.scss
@@ -7,6 +7,7 @@
   background: #000;
   color: #fff;
   height: 1.5em;
+  // max-height: 1.5em; // needed for animations, uncomment to use
   padding: 1em 0 .6em;
   text-align: left;
   width: 100%;
@@ -35,14 +36,18 @@
 
 .pagename {
   color: #fff;
-  padding: 0 1em 0 2em;
-  font-weight: bold;
+  font-size: 22px;
+  top: 1px;
+  position: relative;
 }
 
 
 .navbar-link {
   color: #aaa;
-  padding: .5em;
+  font-size: 14px;
+  padding-right: 1em;
+  position: relative;
+  top: -1px;
 
   &:hover {
     color: #fff;
diff --git a/sass/_table.scss b/sass/_table.scss
index 8f6b9e1..90bbccb 100644
--- a/sass/_table.scss
+++ b/sass/_table.scss
@@ -9,7 +9,7 @@ table {
 }
 
 tbody tr:nth-child(2n-1) {
-  background: #ccc; /* Shade every other table row */
+  background: #ccc; // Shade every other table row
 }
 
 .table {
diff --git a/sass/min-master.scss b/sass/min-master.scss
index 58d0acc..f827bd0 100644
--- a/sass/min-master.scss
+++ b/sass/min-master.scss
@@ -35,12 +35,11 @@ $import-ie-hacks:                         true!default;
 //  Import Components based on above customization
 // ------------------------------------------------------------------
 
-@import 'button.scss';
-@import 'grid.scss';
-@import 'headings.scss';
-@import 'icons.scss';
-@import 'inputs.scss';
-@import 'messages.scss';
-@import 'navbar.scss';
-@import 'table.scss';
-@import 'iehacks.scss';
+@import 'button';
+@import 'grid';
+@import 'headings';
+@import 'icons';
+@import 'inputs';
+@import 'navbar';
+@import 'table';
+@import 'iehacks';