diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index 13bab02594..cad315f6e4 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -8,7 +8,7 @@ $body-line-height: 20px;
 $light-blue: #f0f7fd;
 $dark-blue: #50545c;
 $bright-blue: #3c8ebf;
-$orange: #ea5155;
+$orange: #f96e5b;
 $yellow: #fff8af;
 $cream: #F6EFD4;
 $mit-red: #933;
@@ -41,29 +41,19 @@ input {
 }
 
 button, input[type="submit"], .button {
-<<<<<<< HEAD
   background-color: $orange;
-  @include linear-gradient(adjust-hue($orange, 8%), $orange);
   border: 1px solid darken($orange, 15%);
+  @include border-radius(4px);
   @include box-shadow(inset 0 0 0 1px adjust-hue($orange, 20%), 0 1px 0 #fff);
-  text-shadow: 0 1px 0 darken($orange, 10%);
-=======
-  @include box-shadow(inset 0 0 0 1px lighten($bright-blue, 15%));
-  @include linear-gradient(lighten($bright-blue, 10%), $bright-blue);
-  border-left: 1px solid lighten($dark-blue, 10%);
-  text-shadow: 0 -1px 0 darken($bright-blue, 10%);
->>>>>>> Added more styles includeing the index page more color changes and header styles
   color: #fff;
   font-weight: bold;
+  @include linear-gradient(adjust-hue($orange, 8%), $orange);
   padding: 6px 20px;
+  text-shadow: 0 1px 0 darken($orange, 10%);
   -webkit-font-smoothing: antialiased;
-  @include border-radius(4px);
 
   &:hover, &:focus {
-<<<<<<< HEAD
     @include box-shadow(inset 0 0 6px 1px adjust-hue($orange, 30%));
-=======
->>>>>>> Added more styles includeing the index page more color changes and header styles
   }
 }
 
diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss
index 38bd60f20e..0ab0d1064d 100644
--- a/cms/static/sass/_unit.scss
+++ b/cms/static/sass/_unit.scss
@@ -32,46 +32,31 @@ section#unit-wrapper {
       @include clearfix;
       color: #666;
       float: right;
-      padding: 0 20px;
+      padding: 6px 20px;
 
       a {
         @include inline-block;
-        padding: 13px 20px;
 
         &.cancel {
           margin-right: 20px;
           font-style: italic;
           font-size: 12px;
+          padding: 6px 0;
         }
 
         &.save-update {
-          border-left: 1px solid lighten($dark-blue, 40%);
-          border-right: 1px solid lighten($dark-blue, 40%);
-          // @include box-shadow(inset 0 0 0 1px lighten($bright-blue, 15%));
-          color: $bright-blue;
-          @include linear-gradient(lighten($dark-blue, 50%), lighten($bright-blue, 55%));
+          padding: 6px 20px;
+          @include border-radius(3px);
+          border: 1px solid lighten($dark-blue, 40%);
+          @include box-shadow(inset 0 0 0 1px #fff);
+          color: $dark-blue;
+          @include linear-gradient(lighten($dark-blue, 60%), lighten($dark-blue, 55%));
 
-          // &:hover, &:focus {
-          //   color: $yellow;
-          //   @include linear-gradient($bright-blue, darken($bright-blue, 10%));
-          //   @include box-shadow(inset 0 0 3px 1px lighten($bright-blue, 10%));
-          // }
+          &:hover, &:focus {
+            @include linear-gradient(lighten($dark-blue, 58%), lighten($dark-blue, 53%));
+            @include box-shadow(inset 0 0 6px 1px #fff);
+          }
         }
-        // &.save-update {
-        //   border-left: 1px solid lighten($dark-blue, 10%);
-        //   border-right: 1px solid lighten($dark-blue, 10%);
-        //   @include box-shadow(inset 0 0 0 1px lighten($bright-blue, 15%));
-        //   color: #fff;
-        //   @include linear-gradient(lighten($bright-blue, 10%), $bright-blue);
-        //   text-shadow: 0 -1px 0 darken($bright-blue, 10%);
-
-        //   &:hover, &:focus {
-        //     color: $yellow;
-        //     @include linear-gradient($bright-blue, darken($bright-blue, 10%));
-        //     @include box-shadow(inset 0 0 3px 1px lighten($bright-blue, 10%));
-        //   }
-        // }
->>>>>>> Added more styles includeing the index page more color changes and header styles
       }
     }
   }