diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index bd7594f847..faf740b1b4 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -5,184 +5,202 @@
 // -------------------------------------
 
 body {
-	min-width: 980px;
-	background: #f3f4f5;
-	font-family: 'Open Sans', sans-serif;
-	font-size: 16px;
-	line-height: 1.6;
-	color: #3c3c3c;
+    min-width: 980px;
+    background: #f3f4f5;
+    font-family: 'Open Sans', sans-serif;
+    font-size: 16px;
+    line-height: 1.6;
+    color: #3c3c3c;
 }
 
 a {
-	text-decoration: none;
-	color: $blue;
-	-webkit-transition: color .15s;
+    text-decoration: none;
+    color: $blue;
+    -webkit-transition: color .15s;
 
-	&:hover {
-		color: #cb9c40;
-	}
+    &:hover {
+        color: #cb9c40;
+    }
 }
 
 h1 {
-	font-size: 28px;
-	margin: 36px 6px;
+    font-size: 28px;
+    margin: 36px 6px;
 }
 
 .main-wrapper {
-	position: relative;
-	margin: 0 40px;
+    position: relative;
+    margin: 0 40px;
 }
 
 .inner-wrapper {
-	position: relative;
-	max-width: 1280px;
-	margin: auto;
+    position: relative;
+    max-width: 1280px;
+    margin: auto;
 }
 
 .window {
-	background: #fff;
-	border: 1px solid $darkGrey;
-	border-radius: 3px;
-	box-shadow: 0 1px 2px rgba(0, 0, 0, .1);
+    background: #fff;
+    border: 1px solid $darkGrey;
+    border-radius: 3px;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, .1);
 }
 
 .sidebar {
-	float: right;
-	width: 28%;
+    float: right;
+    width: 28%;
 }
 
 .left {
-	float: left;
+    float: left;
 }
 
 .right {
-	float: right;
+    float: right;
 }
 
 footer {
-	clear: both;
-	height: 100px;
+    clear: both;
+    height: 100px;
 }
 
 input[type="text"] {
-	padding: 6px 8px 8px;
-	box-sizing: border-box;
-	border: 1px solid #b0b6c2;
-	border-radius: 2px;
-	background: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .3)) #edf1f5;
-	box-shadow: 0 1px 2px rgba(0, 0, 0, .1) inset;
-	font-family: 'Open Sans', sans-serif;
-	font-size: 11px;
-	color: #3c3c3c;
-	outline: 0;
+    padding: 6px 8px 8px;
+    box-sizing: border-box;
+    border: 1px solid #b0b6c2;
+    border-radius: 2px;
+    background: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .3)) #edf1f5;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, .1) inset;
+    font-family: 'Open Sans', sans-serif;
+    font-size: 11px;
+    color: #3c3c3c;
+    outline: 0;
 
-	&::-webkit-input-placeholder {
-		color: #979faf;
-	}
+    &::-webkit-input-placeholder {
+        color: #979faf;
+    }
 }
 
 input.search {
-	padding: 6px 15px 8px 30px;
-	box-sizing: border-box;
-	border: 1px solid $darkGrey;
-	border-radius: 20px;
-	background: url(../img/search-icon.png) no-repeat 8px 7px #edf1f5;
-	font-family: 'Open Sans', sans-serif;
-	color: #3c3c3c;
-	outline: 0;
+    padding: 6px 15px 8px 30px;
+    box-sizing: border-box;
+    border: 1px solid $darkGrey;
+    border-radius: 20px;
+    background: url(../img/search-icon.png) no-repeat 8px 7px #edf1f5;
+    font-family: 'Open Sans', sans-serif;
+    color: #3c3c3c;
+    outline: 0;
 
-	&::-webkit-input-placeholder {
-		color: #979faf;
-	}
+    &::-webkit-input-placeholder {
+        color: #979faf;
+    }
 }
 
 label {
-	font-size: 12px;
+    font-size: 12px;
 }
 
 .text-editor {
-	width: 100%;
-	min-height: 80px;
-	padding: 10px;
-	box-sizing: border-box;
-	border: 1px solid #b0b6c2;
-	background: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.3)) #edf1f5;
-	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) inset;
-	font-family: Monaco, monospace;
+    width: 100%;
+    min-height: 80px;
+    padding: 10px;
+    box-sizing: border-box;
+    border: 1px solid #b0b6c2;
+    background: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.3)) #edf1f5;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) inset;
+    font-family: Monaco, monospace;
 }
 
 .new-unit-item,
 .new-subsection-item {
-	@include grey-button;
-	margin: 5px 8px;
-	padding: 3px 10px 4px 10px;
-	font-size: 10px;
+    @include grey-button;
+    margin: 5px 8px;
+    padding: 3px 10px 4px 10px;
+    font-size: 10px;
 
-	.new-folder-icon,
-	.new-unit-icon {
-		position: relative;
-		top: 2px;
-	}
+    .new-folder-icon,
+    .new-unit-icon {
+        position: relative;
+        top: 2px;
+    }
 }
 
 .item-actions {
-	position: absolute;
-	top: 5px;
-	right: 5px;
+    position: absolute;
+    top: 5px;
+    right: 5px;
 
-	.edit-button,
-	.delete-button,
-	.visibility-toggle {
-		float: left;
-		margin-right: 13px;
-		color: #a4aab7;
-	}
+    .edit-button,
+    .delete-button,
+    .visibility-toggle {
+        float: left;
+        margin-right: 13px;
+        color: #a4aab7;
+    }
 }
 
 .item-details {
-	float: left;
-	padding: 10px 0;
+    float: left;
+    padding: 10px 0;
 }
 
 .window {
-	margin-bottom: 20px;
+    margin-bottom: 20px;
 
-	.window-contents {
-		padding: 20px;
-	}
+    .window-contents {
+        padding: 20px;
+    }
 
-	h4 {
-		padding: 6px 14px;
-		border-bottom: 1px solid #cbd1db;
-		border-radius: 3px 3px 0 0;
-		background: -webkit-linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0) 70%) #edf1f5;
-		box-shadow: 0 1px 0 rgba(255, 255, 255, .7) inset;
-		font-size: 14px;
-		font-weight: 600;
-	}
+    h4 {
+        padding: 6px 14px;
+        border-bottom: 1px solid #cbd1db;
+        border-radius: 3px 3px 0 0;
+        background: -webkit-linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0) 70%) #edf1f5;
+        box-shadow: 0 1px 0 rgba(255, 255, 255, .7) inset;
+        font-size: 14px;
+        font-weight: 600;
+    }
 
-	label {
-		display: block;
-		margin-bottom: 6px;
-		font-weight: 700;
+    label {
+        display: block;
+        margin-bottom: 6px;
+        font-weight: 700;
 
-		&.inline-label {
-			display: inline;
-		}
+        &.inline-label {
+            display: inline;
+        }
 
-		.description {
-			display: block;
-			font-size: 11px;
-			font-weight: 400;
-			font-style: italic;
-			line-height: 1.3;
-			color: #999;
-		}
-	}
+        .description {
+            display: block;
+            font-size: 11px;
+            font-weight: 400;
+            font-style: italic;
+            line-height: 1.3;
+            color: #999;
+        }
+    }
 
-	.row {
-		margin-bottom: 15px;
-		padding-bottom: 15px;
-		border-bottom: 1px solid #cbd1db;
-	}
+    .row {
+        margin-bottom: 15px;
+        padding-bottom: 15px;
+        border-bottom: 1px solid #cbd1db;
+    }
 }
+
+.wip {
+    outline: 1px solid #f00 !important;
+    position: relative;
+}
+
+.wip-box {
+    @extend .wip;
+    &:after {
+        content: "WIP";
+        font-size: 8px;
+        padding: 2px;
+        background: #f00;
+        color: #fff;
+        @include position(absolute, 0px 0px 0 0);
+    }
+}
+
diff --git a/cms/templates/overview.html b/cms/templates/overview.html
index 323e19c16d..de6df20eed 100644
--- a/cms/templates/overview.html
+++ b/cms/templates/overview.html
@@ -6,9 +6,9 @@
   <div class="main-wrapper">
     <div class="inner-wrapper">
       <h1>Courseware</h1>
-      <input type="text" class="courseware-unit-search-input search" placeholder="search units" />
+      <input type="text" class="courseware-unit-search-input search wip-box" placeholder="search units" />
       <article class="courseware-overview">
-        <a href="#" class="new-courseware-section-button"><span class="plus-icon"></span> New Section</a>
+        <a href="#" class="new-courseware-section-button wip-box"><span class="plus-icon"></span> New Section</a>
         % for section in sections:
         <section class="courseware-section branch">
           <header>
@@ -18,13 +18,13 @@
               <h4><strong>Unscheduled:</strong> <a href="#">click here to set</a></h4>
             </div>
             <div class="item-actions">
-              <a href="#" class="edit-button"><span class="delete-icon"></span></a>
-              <a href="#" class="drag-handle"></a>
+              <a href="#" class="edit-button wip"><span class="delete-icon"></span></a>
+              <a href="#" class="drag-handle wip"></a>
             </div>
           </header>
           <div class="unit-list">
             <div class="list-header">
-              <a href="#" class="new-subsection-item">
+              <a href="#" class="new-subsection-item wip-box">
                 <span class="new-folder-icon"></span>New Subsection
               </a>
             </div>
@@ -40,9 +40,9 @@
                     </a>
                   </div>
                   <div class="item-actions">
-                    <a href="#" class="delete-button"><span class="delete-icon"></span></a>
-                    <a href="#" class="visibility-toggle"><span class="toggle-icon"></span></a>
-                    <a href="#" class="drag-handle"></a>
+                    <a href="#" class="delete-button wip"><span class="delete-icon"></span></a>
+                    <a href="#" class="visibility-toggle wip"><span class="toggle-icon"></span></a>
+                    <a href="#" class="drag-handle wip"></a>
                   </div>
                 </div>
 
@@ -54,15 +54,15 @@
                         <span class="${unit.category}-icon"></span>${unit.display_name} <span class="hidden-tag">– hidden</span>
                       </a>
                       <div class="item-actions">
-                        <a href="${reverse('delete_unit', args=[unit.location])}" class="edit-button"><span class="delete-icon"></span></a>
-                        <a href="#" class="visibility-toggle hidden"><span class="toggle-icon"></span></a>
-                        <a href="#" class="drag-handle"></a>
+                        <a href="${reverse('delete_unit', args=[unit.location])}" class="edit-button wip"><span class="delete-icon"></span></a>
+                        <a href="#" class="visibility-toggle hidden wip"><span class="toggle-icon"></span></a>
+                        <a href="#" class="drag-handle wip"></a>
                       </div>
                     </div>
                   </li>
                   % endfor
                   <li>
-                    <a href="#" class="new-unit-item">
+                    <a href="#" class="new-unit-item wip">
                       <span class="new-unit-icon"></span>New Unit
                     </a>
                   </li>
diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index 4ae1794eb8..e9a31ea82d 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -48,7 +48,7 @@
         </article>
       </div>
 
-      <div class="sidebar">
+      <div class="sidebar wip-box">
         <div class="unit-properties window">
           <h4>Unit Properties</h4>
           <div class="window-contents">