diff --git a/cms/static/sass/_cms_mixins.scss b/cms/static/sass/_cms_mixins.scss
index 8ca737f33d..e4ecc953e9 100644
--- a/cms/static/sass/_cms_mixins.scss
+++ b/cms/static/sass/_cms_mixins.scss
@@ -153,7 +153,7 @@
 		}
 
 		&.editing {
-			background: #d1dae3;
+			background: #fffcf1;
 		}
 
 		.draft-item,
diff --git a/cms/static/sass/_courseware.scss b/cms/static/sass/_courseware.scss
index 020548e08a..a888b65ed5 100644
--- a/cms/static/sass/_courseware.scss
+++ b/cms/static/sass/_courseware.scss
@@ -1,7 +1,5 @@
 input.courseware-unit-search-input {
-	position: absolute;
-	right: 0;
-	top: 5px;
+	float: left;
 	width: 260px;
 	background-color: #fff;
 }
diff --git a/cms/static/sass/_login.scss b/cms/static/sass/_login.scss
index 48216636d0..960a44272b 100644
--- a/cms/static/sass/_login.scss
+++ b/cms/static/sass/_login.scss
@@ -13,6 +13,7 @@
 		box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2), 0 -1px 0px rgba(255, 255, 255, 0.05) inset, 0 1px 0 rgba(255, 255, 255, .25) inset;
 
 		h1 {
+			float: none;
 			margin: 5px 0;
 			font-size: 15px;
 			font-weight: 300;
diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss
index 0cc855a56f..8c9e54cc0f 100644
--- a/cms/static/sass/_unit.scss
+++ b/cms/static/sass/_unit.scss
@@ -220,6 +220,10 @@
     }
   }
 
+  .xmodule_display {
+    padding: 10px 20px;
+  }
+
   .component-editor {
     @include edit-box;
     display: none;
@@ -382,7 +386,7 @@
       }
 
       .new-unit-item {
-        margin-left: 50px;
+        margin: 0 0 15px 50px;
       }
     }
   }
diff --git a/cms/templates/overview.html b/cms/templates/overview.html
index f4ae4abe4d..d650f5e6df 100644
--- a/cms/templates/overview.html
+++ b/cms/templates/overview.html
@@ -9,7 +9,9 @@
   <div class="main-wrapper">
     <div class="inner-wrapper">
       <h1>Courseware</h1>
-      <input type="text" class="courseware-unit-search-input search wip-box" placeholder="search units" />
+      <div class="page-actions">
+        <input type="text" class="courseware-unit-search-input search wip-box" placeholder="search units" />
+      </div>
       <article class="courseware-overview">
         <a href="#" class="new-courseware-section-button wip-box"><span class="plus-icon"></span> New Section</a>
         % for section in sections:
diff --git a/cms/templates/signup.html b/cms/templates/signup.html
index 67c70b5cac..77a5df7856 100644
--- a/cms/templates/signup.html
+++ b/cms/templates/signup.html
@@ -51,7 +51,7 @@
     </div>
   </form>
   <div class="log-in-extra">
-    <p>Not enrolled? <a href="/">Sign up.</a></p>
+    <p>Already enrolled? <a href="/">Log In.</a></p>
   </div>
 </article>
 
diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index 16d337f57b..3d48461231 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -92,46 +92,25 @@
           <h4>Unit Location</h4>
           <div class="window-contents">
             <div><input type="text" class="url" value="/courseware/${section.url_name}/${subsection.url_name}" disabled /></div>
-            <section class="courseware-section branch">
-              <header>
-                <div class="item-details">
-                  <h3>${section.display_name}</h3>
-                </div>
-              </header>
-              <div class="unit-list">
+            <ol>
+              <li>
+                <a href="#" class="section-item">${section.display_name}</a>
                 <ol>
-                  <li class="branch">
-                    <div class="section-item">
-                      <div>
-                        <a href="${reverse('edit_subsection', args=[subsection.location])}">
-                          <span class="folder-icon"></span>
-                          <span class="subsection-name"><span class="subsection-name-value">${subsection.display_name}</span></span>
-                        </a>
-                      </div>
-                    </div>
-                    ${units.enum_units(subsection, actions=False, selected=unit.location)}
+                  <li>
+                    <a href="${reverse('edit_subsection', args=[subsection.location])}" class="section-item">
+                      <span class="folder-icon"></span>
+                      <span class="subsection-name"><span class="subsection-name-value">${subsection.display_name}</span></span>
+                    </a>
+                    <ol>
+                      ${units.enum_units(subsection, actions=False, selected=unit.location)}
+                    </ol>
                   </li>
                 </ol>
-              </div>
-            </section>
+              </li>
+            </ol>            
           </div>
         </div>
       </div>
     </div>
   </div>
-
-  <div class="history-modal">
-    <div class="modal-body">
-      <h2>S3V2: Properties of Linearity</h2>
-      <div class="video-unit"><img src="images/video-module.png"></div>
-      <p><span class="textbook-icon"></span>More information given in the text.</p>
-      <p><span class="slides-icon"></span>Lecture Slides Handout [Clean] [Annotated]</p>
-    </div>
-    <div class="modal-actions">
-      <a href="#" class="revert-button">Revert to this version</a>
-      <a href="#" class="close-button">Close</a>
-    </div>
-  </div>
-
-  <div class="modal-cover"></div>
 </%block>