diff --git a/cms/static/sass/_calendar.scss b/cms/static/sass/_calendar.scss
index 90fd767c68..f4d97a64ff 100644
--- a/cms/static/sass/_calendar.scss
+++ b/cms/static/sass/_calendar.scss
@@ -269,14 +269,34 @@ section.cal {
   opacity: .4;
   @include transition();
 
-  > header ul {
-    display: none;
-  }
-
   &:hover {
     opacity: 1;
   }
 
+  > header {
+    @include transition;
+    overflow: hidden;
+    height: 55px;
+
+    ul {
+      display: block;
+
+      li {
+        border-left: 0;
+        margin-left: 0;
+        margin-bottom: 4px;
+
+        ul {
+          display: inline;
+        }
+      }
+    }
+
+    &:hover {
+      height: 167px;
+    }
+  }
+
   ol {
     li {
       @include box-sizing(border-box);
diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss
index b3a6debb57..0dada82323 100644
--- a/cms/static/sass/_unit.scss
+++ b/cms/static/sass/_unit.scss
@@ -51,41 +51,61 @@ section#unit-wrapper {
     padding: 20px;
 
     section.meta {
+      background: $light-blue;
+      border-bottom: 1px solid lighten($dark-blue, 40%);
+      padding: 10px 20px;
+      margin: -20px -20px 10px;
+      opacity: .7;
+      @include transition;
+
+      &:hover {
+        opacity: 1;
+        padding: 20px;
+        margin: -20px -20px 10px;
+      }
+
       section {
         &.status-settings {
           float: left;
           margin-bottom: 10px;
           color: $dark-blue;
+          @include clearfix;
 
           ul {
             list-style: none;
-            border: 1px solid lighten($dark-blue, 40%);
-            @include inline-block();
+            border: 1px solid darken($light-blue, 15%);
+            @include clearfix();
+            float: left;
 
             li {
-              @include inline-block();
-              border-right: 1px solid lighten($dark-blue, 40%);
-              padding: 6px;
+              border-right: 1px solid darken($light-blue, 15%);
+              float: left;
 
               &:last-child {
                 border-right: 0;
               }
 
-              &.current {
-                background: #eee;
-              }
-
               a {
                 color: $dark-blue;
+                padding: 6px;
+                display: block;
+
+                &.current {
+                  background: darken($light-blue, 5%);
+                }
+
+                &:hover {
+                  background-color: lighten($yellow, 13%);
+                }
               }
             }
           }
 
           a.settings {
-            @include inline-block();
+            float: left;
             margin: 0 20px;
             padding: 6px;
-            border: 1px solid lighten($dark-blue, 40%);
+            border: 1px solid darken($light-blue, 15%);
             color: $dark-blue;
           }
 
@@ -110,10 +130,7 @@ section#unit-wrapper {
         }
 
         &.tags {
-          background: $light-blue;
           color: lighten($dark-blue, 6%);
-          padding: 10px;
-          margin: 0 0 20px;
           @include clearfix();
           clear: both;
 
diff --git a/cms/templates/widgets/html-edit.html b/cms/templates/widgets/html-edit.html
index f0f63ea905..47a6a55cba 100644
--- a/cms/templates/widgets/html-edit.html
+++ b/cms/templates/widgets/html-edit.html
@@ -36,7 +36,7 @@
   <textarea name="" class="edit-box" rows="8" cols="40">${data}</textarea>
   <div class="preview">${data}</div>
 
-  <div class="actions wip">
+  <div class="actions">
     <a href="" class="save-update">Save &amp; Update</a>
     <a href="#" class="cancel">Cancel</a>
   </div>