diff --git a/cms/static/css/base-style.css b/cms/static/css/base-style.css
index c4bfc6c415..abed82cc05 100644
--- a/cms/static/css/base-style.css
+++ b/cms/static/css/base-style.css
@@ -256,7 +256,9 @@ section.sequence-edit > section.content > div section.scratch-pad ol li ul li.em
   width: 7px;
   min-height: 14px;
   background: url("../img/drag-handle.png") no-repeat center;
-  text-indent: -9999px; }
+  text-indent: -9999px;
+  display: block;
+  float: right; }
 
 section.cal {
   -webkit-box-sizing: border-box;
@@ -679,14 +681,27 @@ section.sequence-edit > section.content {
     section.week-new > section.content > div section header,
     section.sequence-edit > section.content > div section header {
       background: #eee;
-      padding: 10px;
-      border-bottom: 1px solid #ccc; }
+      padding: 6px;
+      border-bottom: 1px solid #ccc;
+      zoom: 1; }
+      section.week-edit > section.content > div section header:before, section.week-edit > section.content > div section header:after,
+      section.week-new > section.content > div section header:before,
+      section.week-new > section.content > div section header:after,
+      section.sequence-edit > section.content > div section header:before,
+      section.sequence-edit > section.content > div section header:after {
+        content: "";
+        display: table; }
+      section.week-edit > section.content > div section header:after,
+      section.week-new > section.content > div section header:after,
+      section.sequence-edit > section.content > div section header:after {
+        clear: both; }
       section.week-edit > section.content > div section header h2,
       section.week-new > section.content > div section header h2,
       section.sequence-edit > section.content > div section header h2 {
         text-transform: uppercase;
         letter-spacing: 1px;
-        font-size: 12px; }
+        font-size: 12px;
+        float: left; }
     section.week-edit > section.content > div section.modules,
     section.week-new > section.content > div section.modules,
     section.sequence-edit > section.content > div section.modules {
@@ -737,26 +752,37 @@ section.sequence-edit > section.content {
             section.week-new > section.content > div section.modules ol li ol li,
             section.sequence-edit > section.content > div section.modules ol li ol li {
               padding: 6px; }
+              section.week-edit > section.content > div section.modules ol li ol li:hover a.draggable,
+              section.week-new > section.content > div section.modules ol li ol li:hover a.draggable,
+              section.sequence-edit > section.content > div section.modules ol li ol li:hover a.draggable {
+                opacity: 1; }
+              section.week-edit > section.content > div section.modules ol li ol li a.draggable,
+              section.week-new > section.content > div section.modules ol li ol li a.draggable,
+              section.sequence-edit > section.content > div section.modules ol li ol li a.draggable {
+                float: right;
+                opacity: .5; }
               section.week-edit > section.content > div section.modules ol li ol li.group,
               section.week-new > section.content > div section.modules ol li ol li.group,
               section.sequence-edit > section.content > div section.modules ol li ol li.group {
-                padding: 0;
-                border-left: 4px solid #999; }
+                padding: 0; }
                 section.week-edit > section.content > div section.modules ol li ol li.group header,
                 section.week-new > section.content > div section.modules ol li ol li.group header,
                 section.sequence-edit > section.content > div section.modules ol li ol li.group header {
-                  padding: 3px 6px;
+                  padding: 6px;
                   background: none; }
                   section.week-edit > section.content > div section.modules ol li ol li.group header h3,
                   section.week-new > section.content > div section.modules ol li ol li.group header h3,
                   section.sequence-edit > section.content > div section.modules ol li ol li.group header h3 {
-                    text-transform: uppercase;
-                    letter-spacing: 1px;
-                    font-size: 12px; }
-                section.week-edit > section.content > div section.modules ol li ol li.group ol li:last-child,
-                section.week-new > section.content > div section.modules ol li ol li.group ol li:last-child,
-                section.sequence-edit > section.content > div section.modules ol li ol li.group ol li:last-child {
+                    font-size: 14px; }
+                section.week-edit > section.content > div section.modules ol li ol li.group ol,
+                section.week-new > section.content > div section.modules ol li ol li.group ol,
+                section.sequence-edit > section.content > div section.modules ol li ol li.group ol {
+                  border-left: 4px solid #999;
                   border-bottom: 0; }
+                  section.week-edit > section.content > div section.modules ol li ol li.group ol li:last-child,
+                  section.week-new > section.content > div section.modules ol li ol li.group ol li:last-child,
+                  section.sequence-edit > section.content > div section.modules ol li ol li.group ol li:last-child {
+                    border-bottom: 0; }
     section.week-edit > section.content > div section.scratch-pad,
     section.week-new > section.content > div section.scratch-pad,
     section.sequence-edit > section.content > div section.scratch-pad {
diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index 4bc24e662f..3a2ef86363 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -108,4 +108,6 @@ input[type="submit"], .button {
   min-height: 14px;
   background: url('../img/drag-handle.png') no-repeat center;
   text-indent: -9999px;
+  display: block;
+  float: right;
 }
diff --git a/cms/static/sass/_week.scss b/cms/static/sass/_week.scss
index de7b1e6f9e..e5283cbc55 100644
--- a/cms/static/sass/_week.scss
+++ b/cms/static/sass/_week.scss
@@ -67,16 +67,19 @@ section.sequence-edit {
       display: table;
       border: 1px solid;
       width: 100%;
+
       section {
         header {
           background: #eee;
-          padding: 10px;
+          padding: 6px;
           border-bottom: 1px solid #ccc;
+          @include clearfix;
 
           h2 {
             text-transform: uppercase;
             letter-spacing: 1px;
             font-size: 12px;
+            float: left;
           }
         }
 
@@ -118,22 +121,34 @@ section.sequence-edit {
                 li {
                   padding: 6px;
 
+                  &:hover {
+                    a.draggable {
+                      opacity: 1;
+                    }
+                  }
+
+                  a.draggable {
+                    float: right;
+                    opacity: .5;
+                  }
+
                   &.group {
                     padding: 0;
-                    border-left: 4px solid #999;
 
                     header {
-                      padding: 3px 6px;
+                      padding: 6px;
                       background: none;
 
                       h3 {
-                        text-transform: uppercase;
-                        letter-spacing: 1px;
-                        font-size: 12px;
+                        font-size: 14px;
                       }
                     }
 
+
                     ol {
+                    border-left: 4px solid #999;
+                    border-bottom: 0;
+
                       li {
                         &:last-child {
                           border-bottom: 0;
@@ -185,9 +200,9 @@ section.sequence-edit {
                     padding: 12px;
 
                     a {
-                    @extend .button;
-                    display: block;
-                    text-align: center;
+                      @extend .button;
+                      display: block;
+                      text-align: center;
                     }
                   }
 
diff --git a/cms/templates/widgets/navigation.html b/cms/templates/widgets/navigation.html
index 808c569e74..28b92979d9 100644
--- a/cms/templates/widgets/navigation.html
+++ b/cms/templates/widgets/navigation.html
@@ -45,10 +45,22 @@
       </header>
 
       <ul>
-        <li class="seq"><a href="#" class="sequence-edit">Lecture Sequence</a></li>
-        <li class="seq"><a href="#" class="sequence-edit">Lecture Sequence</a></li>
-        <li class="lab"><a href="#" class="lab-edit">Lab</a></li>
-        <li class="hw">Homework</li>
+        <li class="seq">
+          <a href="#" class="sequence-edit">Lecture Sequence</a>
+          <a href="#" class="draggable">handle</a>
+        </li>
+        <li class="seq">
+          <a href="#" class="sequence-edit">Lecture Sequence
+          <a href="#" class="draggable">handle</a>
+        </a></li>
+        <li class="lab">
+          <a href="#" class="lab-edit">Lab</a>
+          <a href="#" class="draggable">handle</a>
+        </li>
+        <li class="hw">
+          <a href="#">Homework</a>
+          <a href="#" class="draggable">handle</a>
+        </li>
         <%include file="module-dropdown.html"/>
       </ul>
     </li>
@@ -61,10 +73,22 @@
       </header>
 
       <ul>
-        <li class="seq">Lecture Sequence</li>
-        <li class="seq">Lecture Sequence</li>
-        <li class="lab">Lab</li>
-        <li class="hw">Homework</li>
+        <li class="seq">
+          <a href="#" class="sequence-edit">Lecture Sequence</a>
+          <a href="#" class="draggable">handle</a>
+        </li>
+        <li class="seq">
+          <a href="#" class="sequence-edit">Lecture Sequence
+          <a href="#" class="draggable">handle</a>
+        </a></li>
+        <li class="lab">
+          <a href="#" class="lab-edit">Lab</a>
+          <a href="#" class="draggable">handle</a>
+        </li>
+        <li class="hw">
+          <a href="#">Homework</a>
+          <a href="#" class="draggable">handle</a>
+        </li>
         <%include file="module-dropdown.html"/>
       </ul>
     </li>
@@ -77,9 +101,19 @@
       </header>
 
       <ul>
-        <li class="lab">Lab</li>
-        <li class="lab">Lab</li>
-        <li class="hw">Homework</li>
+        <li class="lab">
+          <a href="#" class="lab-edit">Lab</a>
+          <a href="#" class="draggable">handle</a>
+        </li>
+        <li class="lab">
+          <a href="#" class="lab-edit">Lab</a>
+          <a href="#" class="draggable">handle</a>
+        </li>
+        <li class="hw">
+          <a href="#">Homework</a>
+          <a href="#" class="draggable">handle</a>
+        </li>
+
         <%include file="module-dropdown.html"/>
       </ul>
     </li>
@@ -93,10 +127,22 @@
       </header>
 
       <ul>
-        <li class="seq">Lecture Sequence</li>
-        <li class="lab">Lab</li>
-        <li class="hw">Homework</li>
-        <li class="hw">Homework</li>
+        <li class="seq">
+          <a href="#" class="sequence-edit">Lecture Sequence</a>
+          <a href="#" class="draggable">handle</a>
+        </li>
+        <li class="lab">
+          <a href="#" class="lab-edit">Lab</a>
+          <a href="#" class="draggable">handle</a>
+        </li>
+        <li class="hw">
+          <a href="#">Homework</a>
+          <a href="#" class="draggable">handle</a>
+        </li>
+        <li class="hw">
+          <a href="#">Homework</a>
+          <a href="#" class="draggable">handle</a>
+        </li>
         <%include file="module-dropdown.html"/>
       </ul>
     </li>
@@ -137,6 +183,30 @@
         <%include file="module-dropdown.html"/>
       </ul>
     </li>
+    <li>
+      <header>
+        <h1>Course Scratch Pad</h1>
+      </header>
+
+      <ul>
+        <li>
+          <a href="#" class="problem-edit">Problem title 11</a>
+          <a href="#" class="draggable">handle</a>
+        </li>
+        <li>
+          <a href="#" class="problem-edit">Problem title 13 </a>
+          <a href="#" class="draggable">handle</a>
+        </li>
+        <li>
+          <a href="#" class="problem-edit"> Problem title 14</a>
+          <a href="#" class="draggable">handle</a>
+        </li>
+        <li>
+          <a href="" class="video-edit">Video 3</a>
+          <a href="#" class="draggable">handle</a>
+        </li>
+      </ul>
+    </li>
   </ol>
 
   <section class="new-section">
diff --git a/cms/templates/widgets/week-edit.html b/cms/templates/widgets/week-edit.html
index 6e59c44468..2e37520fde 100644
--- a/cms/templates/widgets/week-edit.html
+++ b/cms/templates/widgets/week-edit.html
@@ -10,160 +10,201 @@
 
       <ul>
         <li>
-          <p><strong>Goal title:</strong> This is the goal body and is wehre the goal will be further explained</p>
+          <p><strong>Goal title:</strong> This is the goal body and is where the goal will be further explained</p>
         </li>
       </ul>
     </section>
   </header>
 
   <section class="content">
-  <section class="filters">
-    <ul>
-      <li>
-        <label for="">Sort by</label>
-        <select>
-          <option value="">Recently Modified</option>
-        </select>
-      </li>
-
-      <li>
-        <label for="">Display</label>
-        <select>
-          <option value="">All content</option>
-        </select>
-      </li>
-      <li>
-        <select>
-          <option value="">Internal Only</option>
-        </select>
-      </li>
-
-      <li class="advanced">
-        <a href="#">Advanced filters</a>
-      </li>
-
-      <li>
-        <input type="search" name="" id="" value="" />
-      </li>
-    </ul>
-  </section>
-    <div>
-    <section class="modules">
-      <ol>
+    <section class="filters">
+      <ul>
         <li>
-          <header>
-            <h2><a href="#">Lecture Sequence</a></h2>
-          </header>
+          <label for="">Sort by</label>
+          <select>
+            <option value="">Recently Modified</option>
+          </select>
+        </li>
 
-          <ol>
-            <li>
-              <a href="" class="problem-edit">Problem title 11</a>
-              <a href="#" class="draggable">handle</a>
-            </li>
-            <li>
-              <a href="#" class="sequence-edit">Problem Group</a>
-              <a href="#" class="draggable">handle</a>
-            </li>
-            <li>
-              <a href="#" class="problem-edit">Problem title 14</a>
-              <a href="#" class="draggable">handle</a>
-            </li>
-            <li>
-              <a href="#" class="video-edit">Video 3</a>
-              <a href="#" class="draggable">handle</a>
-            </li>
-          </ol>
+        <li>
+          <label for="">Display</label>
+          <select>
+            <option value="">All content</option>
+          </select>
         </li>
         <li>
-          <header>
-          <h2><a href="#">Lecture Sequence</a></h2>
-          </header>
-
-          <ol>
-            <li class="group">
-              <header>
-                <h3>
-                  <a href="#" class="problem-edit">Problem group</a>
-                </h3>
-              </header>
-              <ol>
-                <li>
-                  <a href="#" class="problem-edit">Problem title 11</a>
-                </li>
-                <li>
-                  <a href="#" class="problem-edit">Problem title 11</a>
-                </li>
-                <li>
-                  <a href="#" class="problem-edit">Problem title 11</a>
-                </li>
-              </ol>
-            </li>
-            <li><a href="#" class="problem-edit">Problem title 13</a></li>
-            <li><a href="#" class="problem-edit">Problem title 14</a></li>
-            <li><a href="#" class="video-edit">Video 3</a></li>
-          </ol>
+          <select>
+            <option value="">Internal Only</option>
+          </select>
         </li>
+
+        <li class="advanced">
+          <a href="#">Advanced filters</a>
+        </li>
+
         <li>
-          <header>
-          <h2><a href="#">Homework 1a</a></h2>
-          </header>
-
-          <ol>
-            <li>
-              <a href="" class="problem-edit">Problem title 11</a>
-              <a href="#" class="draggable">handle</a>
-            </li>
-            <li>
-              <a href="#" class="sequence-edit">Problem Group</a>
-              <a href="#" class="draggable">handle</a>
-            </li>
-            <li>
-              <a href="#" class="problem-edit">Problem title 14</a>
-              <a href="#" class="draggable">handle</a>
-            </li>
-            <li>
-              <a href="#" class="video-edit">Video 3</a>
-              <a href="#" class="draggable">handle</a>
-            </li>
-          </ol>
+          <input type="search" name="" id="" value="" />
         </li>
-
-        <li class="new-module">
-          <%include file="new-module.html"/>
-        </li>
-      </ol>
+      </ul>
     </section>
 
-  <section class="scratch-pad">
-    <ol>
-      <li>
-        <header>
-        <h2>Section Scratch</h2>
-        </header>
-        <ul>
-          <li>Problem title 11</li>
-          <li>Problem title 13</li>
-          <li>Problem title 14</li>
-          <li>Video 3</li>
-        </ul>
-      </li>
-      <li>
-        <header>
-        <h2>Course Scratch</h2>
-        </header>
-        <ul>
-          <li>Problem title 11</li>
-          <li>Problem title 13</li>
-          <li>Problem title 14</li>
-          <li>Video 3</li>
-        </ul>
-      </li>
+    <div>
+      <section class="modules">
+        <ol>
+          <li>
+            <header>
+              <h2><a href="#">Lecture Sequence</a></h2>
+              <a href="#" class="draggable">handle</a>
+            </header>
 
-      <li class="new-module">
-        <%include file="new-module.html"/>
-      </li>
-    </ol>
-  </section>
+            <ol>
+              <li>
+                <a href="" class="problem-edit">Problem title 11</a>
+                <a href="#" class="draggable">handle</a>
+              </li>
+              <li>
+                <a href="#" class="sequence-edit">Problem Group</a>
+                <a href="#" class="draggable">handle</a>
+              </li>
+              <li>
+                <a href="#" class="problem-edit">Problem title 14</a>
+                <a href="#" class="draggable">handle</a>
+              </li>
+              <li>
+                <a href="#" class="video-edit">Video 3</a>
+                <a href="#" class="draggable">handle</a>
+              </li>
+            </ol>
+          </li>
+          <li>
+            <header>
+              <h2><a href="#">Lecture Sequence</a></h2>
+              <a href="#" class="draggable">handle</a>
+            </header>
+
+            <ol>
+              <li class="group">
+                <header>
+                  <h3>
+                    <a href="#" class="problem-edit">Problem group</a>
+                    <a href="#" class="draggable">handle</a>
+                  </h3>
+                </header>
+                <ol>
+                  <li>
+                    <a href="#" class="problem-edit">Problem title 11</a>
+                    <a href="#" class="draggable">handle</a>
+                  </li>
+                  <li>
+                    <a href="#" class="problem-edit">Problem title 11</a>
+                    <a href="#" class="draggable">handle</a>
+                  </li>
+                  <li>
+                    <a href="#" class="problem-edit">Problem title 11</a>
+                    <a href="#" class="draggable">handle</a>
+                  </li>
+                </ol>
+              </li>
+              <li>
+                <a href="#" class="problem-edit">Problem title 13</a>
+                <a href="#" class="draggable">handle</a>
+              </li>
+              <li>
+                <a href="#" class="problem-edit">Problem title 14</a>
+                <a href="#" class="draggable">handle</a>
+              </li>
+              <li>
+                <a href="#" class="video-edit">Video 3</a>
+                <a href="#" class="draggable">handle</a>
+              </li>
+            </ol>
+          </li>
+          <li>
+            <header>
+              <h2><a href="#">Homework 1a</a></h2>
+            </header>
+
+            <ol>
+              <li>
+                <a href="" class="problem-edit">Problem title 11</a>
+                <a href="#" class="draggable">handle</a>
+              </li>
+              <li>
+                <a href="#" class="sequence-edit">Problem Group</a>
+                <a href="#" class="draggable">handle</a>
+              </li>
+              <li>
+                <a href="#" class="problem-edit">Problem title 14</a>
+                <a href="#" class="draggable">handle</a>
+              </li>
+              <li>
+                <a href="#" class="video-edit">Video 3</a>
+                <a href="#" class="draggable">handle</a>
+              </li>
+            </ol>
+          </li>
+
+          <!-- <li class="new-module"> -->
+          <!--   <%include file="new-module.html"/> -->
+          <!-- </li> -->
+        </ol>
+      </section>
+
+      <section class="scratch-pad">
+        <ol>
+          <li>
+            <header>
+              <h2>Section Scratch</h2>
+            </header>
+            <ul>
+              <li>
+                <a href="#" class="problem-edit">Problem title 11</a>
+                <a href="#" class="draggable">handle</a>
+              </li>
+              <li>
+                <a href="#" class="problem-edit">Problem title 13 </a>
+              <a href="#" class="draggable">handle</a>
+              </li>
+              <li>
+                <a href="#" class="problem-edit"> Problem title 14</a>
+              <a href="#" class="draggable">handle</a>
+              </li>
+              <li>
+                <a href="" class="video-edit">Video 3</a>
+                <a href="#" class="draggable">handle</a>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <header>
+              <h2>Course Scratch</h2>
+            </header>
+
+            <ul>
+              <li>
+                <a href="#" class="problem-edit">Problem title 11</a>
+                <a href="#" class="draggable">handle</a>
+              </li>
+              <li>
+                <a href="#" class="problem-edit">Problem title 13 </a>
+                <a href="#" class="draggable">handle</a>
+              </li>
+              <li>
+                <a href="#" class="problem-edit"> Problem title 14</a>
+                <a href="#" class="draggable">handle</a>
+              </li>
+              <li>
+                <a href="" class="video-edit">Video 3</a>
+                <a href="#" class="draggable">handle</a>
+              </li>
+            </ul>
+          </li>
+
+          <!-- <li class="new-module"> -->
+          <!--   <%include file="new-module.html"/> -->
+          <!-- </li> -->
+        </ol>
+      </section>
     </div>
   </section>
 </section>