diff --git a/less/buttons.less b/less/buttons.less
index d61137242d29b16a73610e0b7072171d4355c2a1..a65ae11743d004c85777cdfc3461427b727880cb 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -1,13 +1,13 @@
 .btn {
 	background: #999;
+	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 */
-	font-size: 2.5em; 
-	padding: 15px 40px 16px;
+	font-size: 2.5em;
 	margin: .3em .2em 0 0;
-	cursor: pointer;
-	border: 0;
-	border-radius: 10px; /* rounded corners */
+	padding: 15px 40px 16px;
 }
 
 .btn:hover {
@@ -50,7 +50,7 @@
 }
 
 .btn-sm {
-	padding: 10px 15px 11px;
-	font-size: .9em;
 	border-radius: 4px; /* rounded corners */
+	font-size: .9em;
+	padding: 10px 15px 11px;
 }
diff --git a/sass/_button.scss b/sass/_button.scss
index f41b62bdcfde4687e41378e6135245964176ed9b..519a70cece2af2694bb9edbc8a44cc13cc63a237 100644
--- a/sass/_button.scss
+++ b/sass/_button.scss
@@ -24,9 +24,10 @@
 // Set Generic <button> and .btn styling.
 // use .btn on any element to give it the styling of a button
 .btn {
-  @include btn-style(#aaa, #000, #ddd);
+  @extend %no-underline;
+  @include btn-style(#999, #888, #777);
   border: 0;
-  //border-radius: 10px; // rounded corners
+  border-radius: 10px; // rounded corners
   color: #fff;
   cursor: pointer;
   display: inline-block; // Enables non-inline-block elements like <a>s to be buttons
@@ -34,7 +35,6 @@
   margin: .3em .2em 0 0;
   outline: 0; // when the button is focused, don't show an outline
   padding: 15px 40px 16px;
-  text-decoration: none;
 }
 
 
@@ -56,7 +56,7 @@
 // Add this class to a <button> or element with a .btn class
 // to create a smaller sized button.
 .btn-sm {
-  //border-radius: 4px; /* rounded corners */
+  border-radius: 4px; /* rounded corners */
   font-size: .9em;
   padding: 10px 15px 11px;
 }
diff --git a/sass/_general.scss b/sass/_general.scss
index 1adc1ad57d8b68e45c3b377f41830afc9dadeb6a..b98695ebbf224dfe43fcd0856fb02f6337ae71d2 100644
--- a/sass/_general.scss
+++ b/sass/_general.scss
@@ -21,3 +21,14 @@ body, textarea {
   }
 }
 
+
+
+// shared styling between btn and links in nav bars
+%nav-btn-shared {
+  outline: 0;
+  // when button or navbar is focused don't show an outline
+}
+
+%no-underline {
+  text-decoration: none;
+}
diff --git a/sass/_iehacks.scss b/sass/_iehacks.scss
index cec6ad670e9f64ce63c754e117e77ec3d4de23eb..e0bd4b297ccfd2df2b865faf1eda57f8b88b3650 100644
--- a/sass/_iehacks.scss
+++ b/sass/_iehacks.scss
@@ -1,4 +1,4 @@
-@if $import-ie-hacks == true{
+@if $import-ie-hacks == true {
 //-------------------------------------------------------------------
 //  Internet Explorer Hacks
 //-------------------------------------------------------------------
diff --git a/sass/_inputs.scss b/sass/_inputs.scss
index b8e0207491c5d9656a23538dc014edfe2046468d..84eb7ebe7a0c2dc52c14f904dddd4efdaf9d1dde 100644
--- a/sass/_inputs.scss
+++ b/sass/_inputs.scss
@@ -29,8 +29,7 @@ textarea, input[type='text'] {
 .addon-front {
   @extend %global-inputs;
   border-right: 0;
-  margin-right: -2px;
-  padding: 6px 11px 6px 10px;
+  padding: 6px 11px;
 }