diff --git a/cms/static/css/base-style.css b/cms/static/css/base-style.css
index 518443a41c..c84ab046ff 100644
--- a/cms/static/css/base-style.css
+++ b/cms/static/css/base-style.css
@@ -210,9 +210,10 @@ a {
   text-decoration: none;
   color: #888; }
 
-input[type="submit"], .button, section.cal section.new-section > a, section.week-edit > header a,
-section.week-new > header a,
-section.sequence-edit > header a, section.video-new > section section.upload a.upload-button, section.video-edit > section section.upload a.upload-button, section.video-new > section a.save-update, section.video-edit > section a.save-update, section.problem-new > section a.save, section.problem-edit > section a.save {
+input {
+  font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif; }
+
+input[type="submit"], .button, section.cal section.new-section > a, section.video-new > section section.upload a.upload-button, section.video-edit > section section.upload a.upload-button, section.video-new > section a.save-update, section.video-edit > section a.save-update, section.problem-new > section a.save, section.problem-edit > section a.save {
   border: 1px solid #ccc;
   background: #efefef;
   -webkit-border-radius: 3px;
@@ -227,8 +228,7 @@ section.cal {
   -moz-box-sizing: border-box;
   box-sizing: border-box;
   padding: 25px;
-  zoom: 1;
-  overflow: scroll; }
+  zoom: 1; }
   section.cal:before, section.cal:after {
     content: "";
     display: table; }
@@ -360,7 +360,7 @@ section.cal {
               position: absolute;
               top: 30px;
               width: 90%;
-              background: rgba(0, 0, 0, 0.8);
+              background: rgba(0, 0, 0, 0.9);
               padding: 10px;
               -webkit-box-sizing: border-box;
               -moz-box-sizing: border-box;
@@ -371,6 +371,20 @@ section.cal {
               -o-border-radius: 3px;
               border-radius: 3px;
               z-index: 99; }
+              section.cal ol > li ul li.create-module > div:before {
+                content: "  ";
+                display: block;
+                background: rgba(0, 0, 0, 0.8);
+                width: 10px;
+                height: 10px;
+                position: absolute;
+                top: -5px;
+                left: 50%;
+                -webkit-transform: rotate(45deg);
+                -moz-transform: rotate(45deg);
+                -ms-transform: rotate(45deg);
+                -o-transform: rotate(45deg);
+                transform: rotate(45deg); }
               section.cal ol > li ul li.create-module > div ul li {
                 border-bottom: 0;
                 background: none; }
@@ -395,60 +409,71 @@ section.cal {
             section.cal ol > li ul li.create-module:hover div {
               display: block; }
   section.cal section.new-section {
-    margin-top: 10px; }
+    margin-top: 10px;
+    display: -moz-inline-box;
+    -moz-box-orient: vertical;
+    display: inline-block;
+    vertical-align: baseline;
+    zoom: 1;
+    *display: inline;
+    *vertical-align: auto;
+    position: relative; }
     section.cal section.new-section > a {
-      display: -moz-inline-box;
-      -moz-box-orient: vertical;
-      display: inline-block;
-      vertical-align: baseline;
-      zoom: 1;
-      *display: inline;
-      *vertical-align: auto; }
+      display: block; }
     section.cal section.new-section section {
-      display: none; }
-      section.cal section.new-section section header {
-        background: #fff;
-        text-align: left; }
-      section.cal section.new-section section form {
-        background: #fff;
-        width: 50%;
-        padding: 6px;
-        border: 1px solid #000;
-        margin: 0 auto;
-        -webkit-box-shadow: 0 0 2px #333333;
-        -moz-box-shadow: 0 0 2px #333333;
-        box-shadow: 0 0 2px #333333;
-        position: relative; }
-        section.cal section.new-section section form:before {
-          background: #fff;
-          border-left: 1px solid #000;
-          border-top: 1px solid #000;
-          content: "  ";
-          display: block;
-          height: 10px;
-          left: 50%;
-          position: absolute;
-          top: -6px;
-          -webkit-transform: rotate(45deg);
-          -moz-transform: rotate(45deg);
-          -ms-transform: rotate(45deg);
-          -o-transform: rotate(45deg);
-          transform: rotate(45deg);
-          width: 10px;
-          z-index: 0; }
-        section.cal section.new-section section form select {
-          margin-bottom: 6px;
-          width: 100%; }
-          section.cal section.new-section section form select option {
-            padding: 10px 0 !important; }
-        section.cal section.new-section section form input[type="submit"] {
-          display: block;
-          margin-bottom: 6px;
-          width: 100%; }
-        section.cal section.new-section section form a:first-child {
-          float: left; }
-        section.cal section.new-section section form a:last-child {
-          float: right; }
+      display: none;
+      position: absolute;
+      top: 32px;
+      background: rgba(0, 0, 0, 0.8);
+      min-width: 300px;
+      padding: 10px;
+      -webkit-box-sizing: border-box;
+      -moz-box-sizing: border-box;
+      box-sizing: border-box;
+      -webkit-border-radius: 3px;
+      -moz-border-radius: 3px;
+      -ms-border-radius: 3px;
+      -o-border-radius: 3px;
+      border-radius: 3px;
+      z-index: 99; }
+      section.cal section.new-section section:before {
+        content: "  ";
+        display: block;
+        background: rgba(0, 0, 0, 0.8);
+        width: 10px;
+        height: 10px;
+        position: absolute;
+        top: -5px;
+        left: 20%;
+        -webkit-transform: rotate(45deg);
+        -moz-transform: rotate(45deg);
+        -ms-transform: rotate(45deg);
+        -o-transform: rotate(45deg);
+        transform: rotate(45deg); }
+      section.cal section.new-section section form ul {
+        list-style: none; }
+        section.cal section.new-section section form ul li {
+          border-bottom: 0;
+          background: none;
+          margin-bottom: 6px; }
+          section.cal section.new-section section form ul li input {
+            width: 100%;
+            -webkit-box-sizing: border-box;
+            -moz-box-sizing: border-box;
+            box-sizing: border-box;
+            border-color: #000;
+            padding: 6px; }
+          section.cal section.new-section section form ul li select {
+            width: 100%;
+            -webkit-box-sizing: border-box;
+            -moz-box-sizing: border-box;
+            box-sizing: border-box; }
+            section.cal section.new-section section form ul li select option {
+              font-size: 14px; }
+          section.cal section.new-section section form ul li a {
+            float: right; }
+            section.cal section.new-section section form ul li a:first-child {
+              float: left; }
     section.cal section.new-section:hover section {
       display: block; }
 
@@ -456,6 +481,7 @@ body.content
 section.cal {
   width: 25.577%;
   float: left;
+  overflow: scroll;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box; }
@@ -468,13 +494,15 @@ section.cal {
     -moz-box-sizing: border-box;
     box-sizing: border-box;
     width: 100%; }
+    body.content
+    section.cal ol li.create-module {
+      display: none; }
 
 section.week-edit > header,
 section.week-new > header,
 section.sequence-edit > header {
-  border-bottom: 1px solid #ccc;
-  zoom: 1;
-  padding: 6px; }
+  border-bottom: 2px solid #333;
+  zoom: 1; }
   section.week-edit > header:before, section.week-edit > header:after,
   section.week-new > header:before,
   section.week-new > header:after,
@@ -490,146 +518,87 @@ section.sequence-edit > header {
   section.week-new > header h1,
   section.sequence-edit > header h1 {
     font-size: 18px;
-    float: left;
-    margin-top: 8px 6px; }
-  section.week-edit > header a,
-  section.week-new > header a,
-  section.sequence-edit > header a {
-    float: right;
-    display: block; }
-section.week-edit section header,
-section.week-new section header,
-section.sequence-edit section header {
-  background: #666;
-  color: #fff;
-  padding: 6px;
-  border-bottom: 1px solid #333;
-  -webkit-font-smoothing: antialiased; }
-  section.week-edit section header h2,
-  section.week-new section header h2,
-  section.sequence-edit section header h2 {
-    font-size: 14px; }
-section.week-edit section.sidebar,
-section.week-new section.sidebar,
-section.sequence-edit section.sidebar {
-  width: 34.368%;
-  float: left;
-  background: #ccc;
-  border-right: 1px solid #333;
+    margin: 8px 6px;
+    text-transform: uppercase;
+    letter-spacing: 1px; }
+  section.week-edit > header section.goals,
+  section.week-new > header section.goals,
+  section.sequence-edit > header section.goals {
+    background: #eee;
+    padding: 6px;
+    border-top: 1px solid #ccc; }
+    section.week-edit > header section.goals header h2,
+    section.week-new > header section.goals header h2,
+    section.sequence-edit > header section.goals header h2 {
+      font-size: 14px;
+      display: -moz-inline-box;
+      -moz-box-orient: vertical;
+      display: inline-block;
+      vertical-align: baseline;
+      zoom: 1;
+      *display: inline;
+      *vertical-align: auto; }
+    section.week-edit > header section.goals header p,
+    section.week-new > header section.goals header p,
+    section.sequence-edit > header section.goals header p {
+      display: -moz-inline-box;
+      -moz-box-orient: vertical;
+      display: inline-block;
+      vertical-align: baseline;
+      zoom: 1;
+      *display: inline;
+      *vertical-align: auto; }
+    section.week-edit > header section.goals ul,
+    section.week-new > header section.goals ul,
+    section.sequence-edit > header section.goals ul {
+      list-style: none;
+      margin-top: 6px;
+      color: #999; }
+section.week-edit > section.content,
+section.week-new > section.content,
+section.sequence-edit > section.content {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
-  box-sizing: border-box; }
-  section.week-edit section.sidebar section,
-  section.week-new section.sidebar section,
-  section.sequence-edit section.sidebar section {
-    height: 50%; }
-    section.week-edit section.sidebar section > ul,
-    section.week-new section.sidebar section > ul,
-    section.sequence-edit section.sidebar section > ul {
-      list-style: none; }
-      section.week-edit section.sidebar section > ul > li,
-      section.week-new section.sidebar section > ul > li,
-      section.sequence-edit section.sidebar section > ul > li {
-        padding: 6px;
-        border-bottom: 1px solid #666;
-        background: #eee; }
-        section.week-edit section.sidebar section > ul > li.new-module,
-        section.week-new section.sidebar section > ul > li.new-module,
-        section.sequence-edit section.sidebar section > ul > li.new-module {
-          position: relative; }
-          section.week-edit section.sidebar section > ul > li.new-module ul.new-dropdown,
-          section.week-new section.sidebar section > ul > li.new-module ul.new-dropdown,
-          section.sequence-edit section.sidebar section > ul > li.new-module ul.new-dropdown {
-            list-style: none; }
-            section.week-edit section.sidebar section > ul > li.new-module ul.new-dropdown li,
-            section.week-new section.sidebar section > ul > li.new-module ul.new-dropdown li,
-            section.sequence-edit section.sidebar section > ul > li.new-module ul.new-dropdown li {
-              display: none; }
-              section.week-edit section.sidebar section > ul > li.new-module ul.new-dropdown li:first-child,
-              section.week-new section.sidebar section > ul > li.new-module ul.new-dropdown li:first-child,
-              section.sequence-edit section.sidebar section > ul > li.new-module ul.new-dropdown li:first-child {
-                display: block; }
-            section.week-edit section.sidebar section > ul > li.new-module ul.new-dropdown:hover li,
-            section.week-new section.sidebar section > ul > li.new-module ul.new-dropdown:hover li,
-            section.sequence-edit section.sidebar section > ul > li.new-module ul.new-dropdown:hover li {
-              display: block;
-              padding: 6px 0; }
-              section.week-edit section.sidebar section > ul > li.new-module ul.new-dropdown:hover li:first-child,
-              section.week-new section.sidebar section > ul > li.new-module ul.new-dropdown:hover li:first-child,
-              section.sequence-edit section.sidebar section > ul > li.new-module ul.new-dropdown:hover li:first-child {
-                padding-top: 0; }
-    section.week-edit section.sidebar section p,
-    section.week-new section.sidebar section p,
-    section.sequence-edit section.sidebar section p {
-      padding: 6px;
-      border-bottom: 1px solid #666; }
-section.week-edit section.weeks-content,
-section.week-new section.weeks-content,
-section.sequence-edit section.weeks-content {
-  width: 65.632%;
-  float: left;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box; }
-  section.week-edit section.weeks-content header,
-  section.week-new section.weeks-content header,
-  section.sequence-edit section.weeks-content header {
-    zoom: 1; }
-    section.week-edit section.weeks-content header:before, section.week-edit section.weeks-content header:after,
-    section.week-new section.weeks-content header:before,
-    section.week-new section.weeks-content header:after,
-    section.sequence-edit section.weeks-content header:before,
-    section.sequence-edit section.weeks-content header:after {
+  box-sizing: border-box;
+  padding: 20px; }
+  section.week-edit > section.content section.filters,
+  section.week-new > section.content section.filters,
+  section.sequence-edit > section.content section.filters {
+    zoom: 1;
+    margin-bottom: 10px;
+    background: #efefef;
+    border: 1px solid #ddd; }
+    section.week-edit > section.content section.filters:before, section.week-edit > section.content section.filters:after,
+    section.week-new > section.content section.filters:before,
+    section.week-new > section.content section.filters:after,
+    section.sequence-edit > section.content section.filters:before,
+    section.sequence-edit > section.content section.filters:after {
       content: "";
       display: table; }
-    section.week-edit section.weeks-content header:after,
-    section.week-new section.weeks-content header:after,
-    section.sequence-edit section.weeks-content header:after {
+    section.week-edit > section.content section.filters:after,
+    section.week-new > section.content section.filters:after,
+    section.sequence-edit > section.content section.filters:after {
       clear: both; }
-    section.week-edit section.weeks-content header h2,
-    section.week-new section.weeks-content header h2,
-    section.sequence-edit section.weeks-content header h2 {
-      float: left; }
-    section.week-edit section.weeks-content header form,
-    section.week-new section.weeks-content header form,
-    section.sequence-edit section.weeks-content header form {
-      float: right;
-      margin: -2px 0; }
-      section.week-edit section.weeks-content header form input,
-      section.week-new section.weeks-content header form input,
-      section.sequence-edit section.weeks-content header form input {
-        border: 1px solid #000;
-        background: #ddd;
-        padding: 2px 4px;
-        -webkit-border-radius: 2px;
-        -moz-border-radius: 2px;
-        -ms-border-radius: 2px;
-        -o-border-radius: 2px;
-        border-radius: 2px; }
-  section.week-edit section.weeks-content section.filters,
-  section.week-new section.weeks-content section.filters,
-  section.sequence-edit section.weeks-content section.filters {
-    border-bottom: 1px solid #999; }
-    section.week-edit section.weeks-content section.filters ul,
-    section.week-new section.weeks-content section.filters ul,
-    section.sequence-edit section.weeks-content section.filters ul {
+    section.week-edit > section.content section.filters ul,
+    section.week-new > section.content section.filters ul,
+    section.sequence-edit > section.content section.filters ul {
       zoom: 1;
       list-style: none;
       padding: 6px; }
-      section.week-edit section.weeks-content section.filters ul:before, section.week-edit section.weeks-content section.filters ul:after,
-      section.week-new section.weeks-content section.filters ul:before,
-      section.week-new section.weeks-content section.filters ul:after,
-      section.sequence-edit section.weeks-content section.filters ul:before,
-      section.sequence-edit section.weeks-content section.filters ul:after {
+      section.week-edit > section.content section.filters ul:before, section.week-edit > section.content section.filters ul:after,
+      section.week-new > section.content section.filters ul:before,
+      section.week-new > section.content section.filters ul:after,
+      section.sequence-edit > section.content section.filters ul:before,
+      section.sequence-edit > section.content section.filters ul:after {
         content: "";
         display: table; }
-      section.week-edit section.weeks-content section.filters ul:after,
-      section.week-new section.weeks-content section.filters ul:after,
-      section.sequence-edit section.weeks-content section.filters ul:after {
+      section.week-edit > section.content section.filters ul:after,
+      section.week-new > section.content section.filters ul:after,
+      section.sequence-edit > section.content section.filters ul:after {
         clear: both; }
-      section.week-edit section.weeks-content section.filters ul li,
-      section.week-new section.weeks-content section.filters ul li,
-      section.sequence-edit section.weeks-content section.filters ul li {
+      section.week-edit > section.content section.filters ul li,
+      section.week-new > section.content section.filters ul li,
+      section.sequence-edit > section.content section.filters ul li {
         display: -moz-inline-box;
         -moz-box-orient: vertical;
         display: inline-block;
@@ -637,25 +606,136 @@ section.sequence-edit section.weeks-content {
         zoom: 1;
         *display: inline;
         *vertical-align: auto; }
-        section.week-edit section.weeks-content section.filters ul li.advanced,
-        section.week-new section.weeks-content section.filters ul li.advanced,
-        section.sequence-edit section.weeks-content section.filters ul li.advanced {
+        section.week-edit > section.content section.filters ul li.advanced,
+        section.week-new > section.content section.filters ul li.advanced,
+        section.sequence-edit > section.content section.filters ul li.advanced {
           float: right; }
-  section.week-edit section.weeks-content section.modules ul,
-  section.week-new section.weeks-content section.modules ul,
-  section.sequence-edit section.weeks-content section.modules ul {
-    list-style: none; }
-    section.week-edit section.weeks-content section.modules ul li,
-    section.week-new section.weeks-content section.modules ul li,
-    section.sequence-edit section.weeks-content section.modules ul li {
-      padding: 6px;
-      font-weight: bold;
-      font-size: 16px;
-      border-bottom: 1px solid #333; }
-      section.week-edit section.weeks-content section.modules ul li a,
-      section.week-new section.weeks-content section.modules ul li a,
-      section.sequence-edit section.weeks-content section.modules ul li a {
-        color: #000; }
+  section.week-edit > section.content > div,
+  section.week-new > section.content > div,
+  section.sequence-edit > section.content > div {
+    display: table;
+    border: 1px solid;
+    width: 100%; }
+    section.week-edit > section.content > div section header,
+    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; }
+      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; }
+    section.week-edit > section.content > div section.modules,
+    section.week-new > section.content > div section.modules,
+    section.sequence-edit > section.content > div section.modules {
+      -webkit-box-sizing: border-box;
+      -moz-box-sizing: border-box;
+      box-sizing: border-box;
+      display: table-cell;
+      width: 65.632%;
+      border-right: 1px solid #333; }
+      section.week-edit > section.content > div section.modules ol,
+      section.week-new > section.content > div section.modules ol,
+      section.sequence-edit > section.content > div section.modules ol {
+        list-style: none;
+        border-bottom: 1px solid #333; }
+        section.week-edit > section.content > div section.modules ol li,
+        section.week-new > section.content > div section.modules ol li,
+        section.sequence-edit > section.content > div section.modules ol li {
+          border-bottom: 1px solid #333; }
+          section.week-edit > section.content > div section.modules ol li:last-child,
+          section.week-new > section.content > div section.modules ol li:last-child,
+          section.sequence-edit > section.content > div section.modules ol li:last-child {
+            border-bottom: 0; }
+          section.week-edit > section.content > div section.modules ol li a,
+          section.week-new > section.content > div section.modules ol li a,
+          section.sequence-edit > section.content > div section.modules ol li a {
+            color: #000; }
+          section.week-edit > section.content > div section.modules ol li ol,
+          section.week-new > section.content > div section.modules ol li ol,
+          section.sequence-edit > section.content > div section.modules ol li ol {
+            list-style: none; }
+            section.week-edit > section.content > div section.modules ol li ol li,
+            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 0 6px 6px; }
+              section.week-edit > section.content > div section.modules ol li ol li h3,
+              section.week-new > section.content > div section.modules ol li ol li h3,
+              section.sequence-edit > section.content > div section.modules ol li ol li h3 {
+                text-transform: uppercase;
+                letter-spacing: 1px;
+                font-size: 12px; }
+              section.week-edit > section.content > div section.modules ol li ol li ol,
+              section.week-new > section.content > div section.modules ol li ol li ol,
+              section.sequence-edit > section.content > div section.modules ol li ol li ol {
+                border-left: 1px solid; }
+    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 {
+      -webkit-box-sizing: border-box;
+      -moz-box-sizing: border-box;
+      box-sizing: border-box;
+      display: table-cell;
+      width: 34.368%; }
+      section.week-edit > section.content > div section.scratch-pad ol,
+      section.week-new > section.content > div section.scratch-pad ol,
+      section.sequence-edit > section.content > div section.scratch-pad ol {
+        list-style: none;
+        border-bottom: 1px solid #999; }
+        section.week-edit > section.content > div section.scratch-pad ol li,
+        section.week-new > section.content > div section.scratch-pad ol li,
+        section.sequence-edit > section.content > div section.scratch-pad ol li {
+          border-bottom: 1px solid #999;
+          background: #f9f9f9; }
+          section.week-edit > section.content > div section.scratch-pad ol li:last-child,
+          section.week-new > section.content > div section.scratch-pad ol li:last-child,
+          section.sequence-edit > section.content > div section.scratch-pad ol li:last-child {
+            border-bottom: 0; }
+          section.week-edit > section.content > div section.scratch-pad ol li ul,
+          section.week-new > section.content > div section.scratch-pad ol li ul,
+          section.sequence-edit > section.content > div section.scratch-pad ol li ul {
+            list-style: none; }
+            section.week-edit > section.content > div section.scratch-pad ol li ul li,
+            section.week-new > section.content > div section.scratch-pad ol li ul li,
+            section.sequence-edit > section.content > div section.scratch-pad ol li ul li {
+              padding: 6px; }
+              section.week-edit > section.content > div section.scratch-pad ol li ul li a,
+              section.week-new > section.content > div section.scratch-pad ol li ul li a,
+              section.sequence-edit > section.content > div section.scratch-pad ol li ul li a {
+                color: #000; }
+          section.week-edit > section.content > div section.scratch-pad ol li.new-module,
+          section.week-new > section.content > div section.scratch-pad ol li.new-module,
+          section.sequence-edit > section.content > div section.scratch-pad ol li.new-module {
+            position: relative; }
+            section.week-edit > section.content > div section.scratch-pad ol li.new-module ul.new-dropdown,
+            section.week-new > section.content > div section.scratch-pad ol li.new-module ul.new-dropdown,
+            section.sequence-edit > section.content > div section.scratch-pad ol li.new-module ul.new-dropdown {
+              list-style: none; }
+              section.week-edit > section.content > div section.scratch-pad ol li.new-module ul.new-dropdown li,
+              section.week-new > section.content > div section.scratch-pad ol li.new-module ul.new-dropdown li,
+              section.sequence-edit > section.content > div section.scratch-pad ol li.new-module ul.new-dropdown li {
+                display: none; }
+                section.week-edit > section.content > div section.scratch-pad ol li.new-module ul.new-dropdown li:first-child,
+                section.week-new > section.content > div section.scratch-pad ol li.new-module ul.new-dropdown li:first-child,
+                section.sequence-edit > section.content > div section.scratch-pad ol li.new-module ul.new-dropdown li:first-child {
+                  display: block; }
+              section.week-edit > section.content > div section.scratch-pad ol li.new-module ul.new-dropdown:hover li,
+              section.week-new > section.content > div section.scratch-pad ol li.new-module ul.new-dropdown:hover li,
+              section.sequence-edit > section.content > div section.scratch-pad ol li.new-module ul.new-dropdown:hover li {
+                display: block;
+                padding: 6px 0; }
+                section.week-edit > section.content > div section.scratch-pad ol li.new-module ul.new-dropdown:hover li:first-child,
+                section.week-new > section.content > div section.scratch-pad ol li.new-module ul.new-dropdown:hover li:first-child,
+                section.sequence-edit > section.content > div section.scratch-pad ol li.new-module ul.new-dropdown:hover li:first-child {
+                  padding-top: 0; }
+      section.week-edit > section.content > div section.scratch-pad p,
+      section.week-new > section.content > div section.scratch-pad p,
+      section.sequence-edit > section.content > div section.scratch-pad p {
+        padding: 6px;
+        border-bottom: 1px solid #666; }
 
 section.video-new > section section.upload, section.video-edit > section section.upload {
   padding: 6px;
diff --git a/cms/static/js/main.js b/cms/static/js/main.js
index e7bdff0f14..2d72edc4bf 100644
--- a/cms/static/js/main.js
+++ b/cms/static/js/main.js
@@ -31,29 +31,28 @@ $(document).ready(function(){
 
   setHeight = function(){
     var windowHeight = $(this).height();
-    var calHeight = windowHeight - 29;
-    var sidebarHeight = windowHeight - 73;
+    var contentHeight = windowHeight - 29;
 
-    $('.sidebar').css('height', sidebarHeight);
-    $('body.content .cal').css('height', calHeight);
+    $('section.main-content > section').css('min-height', contentHeight);
+    $('body.content .cal').css('height', contentHeight);
 
     $('.edit-week').click( function() {
       $('body').addClass('content');
-      $('body.content .cal').css('height', calHeight);
+      $('body.content .cal').css('height', contentHeight);
       $('section.week-new').show();
       return false;
     });
 
     $('.cal ol li header h1 a').click( function() {
       $('body').addClass('content');
-      $('body.content .cal').css('height', calHeight);
+      $('body.content .cal').css('height', contentHeight);
       $('section.week-edit').show();
       return false;
     });
 
     $('a.sequence-edit').click(function(){
       $('body').addClass('content');
-      $('body.content .cal').css('height', calHeight);
+      $('body.content .cal').css('height', contentHeight);
       $('section.sequence-edit').show();
       return false;
     });
diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index d06998c38a..406532d8a6 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -2,6 +2,7 @@
 $fg-column: 70px;
 $fg-gutter: 26px;
 $fg-max-columns: 12;
+$body-font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
 
 html {
   height: 100%;
@@ -10,7 +11,7 @@ html {
 body {
   @include clearfix();
   height: 100%;
-  font: 14px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
+  font: 14px $body-font-family;
 
   > section {
     display: table;
@@ -57,6 +58,10 @@ a {
   color: #888;
 }
 
+input {
+  font-family: $body-font-family;
+}
+
 input[type="submit"], .button {
   border: 1px solid #ccc;
   background: #efefef;
diff --git a/cms/static/sass/_calendar.scss b/cms/static/sass/_calendar.scss
index 06ac62f549..c0f23945f2 100644
--- a/cms/static/sass/_calendar.scss
+++ b/cms/static/sass/_calendar.scss
@@ -2,7 +2,6 @@ section.cal {
   @include box-sizing(border-box);
   padding: 25px;
   @include clearfix;
-  overflow: scroll;
 
   > header {
     @include clearfix;
@@ -106,12 +105,22 @@ section.cal {
               display: none;
               @include position(absolute, 30px 0 0 0);
               width: 90%;
-              background: rgba(#000, .8);
+              background: rgba(#000, .9);
               padding: 10px;
               @include box-sizing(border-box);
               @include border-radius(3px);
               z-index: 99;
 
+              &:before {
+                content: "  ";
+                display: block;
+                background: rgba(#000, .8);
+                width: 10px;
+                height: 10px;
+                @include position(absolute, -5px 0 0 50%);
+                @include transform(rotate(45deg));
+              }
+
               ul {
                 li {
                   border-bottom: 0;
@@ -157,67 +166,67 @@ section.cal {
 
   section.new-section {
     margin-top: 10px;
+    @include inline-block();
+    position: relative;
 
     > a {
       @extend .button;
-      @include inline-block();
+      display: block;
     }
 
     section {
       display: none;
+      @include position(absolute, 32px 0 0 0);
+      background: rgba(#000, .8);
+      min-width: 300px;
+      padding: 10px;
+      @include box-sizing(border-box);
+      @include border-radius(3px);
+      z-index: 99;
 
-      header {
-        background: #fff;
-        text-align: left;
+      &:before {
+        content: "  ";
+        display: block;
+        background: rgba(#000, .8);
+        width: 10px;
+        height: 10px;
+        @include position(absolute, -5px 0 0 20%);
+        @include transform(rotate(45deg));
       }
 
       form {
-        background: #fff;
-        width: 50%;
-        padding: 6px;
-        border: 1px solid #000;
-        margin: 0 auto;
-        @include box-shadow(0 0 2px #333);
-        position: relative;
 
-        &:before {
-          background: #fff;
-          border-left: 1px solid #000;
-          border-top: 1px solid #000;
-          content: "  ";
-          display: block;
-          height: 10px;
-          left: 50%;
-          position: absolute;
-          top: -6px;
-          @include transform(rotate(45deg));
-          width: 10px;
-          z-index: 0;
-        }
+        ul {
+          list-style: none;
 
-        select {
-          margin-bottom: 6px;
-          width: 100%;
+          li {
+            border-bottom: 0;
+            background: none;
+            margin-bottom: 6px;
 
-          option {
-            padding: 10px 0 !important;
-          }
-        }
+            input {
+              width: 100%;
+              @include box-sizing(border-box);
+              border-color: #000;
+              padding: 6px;
+            }
 
-        input[type="submit"] {
-          display: block;
-          margin-bottom: 6px;
-          width: 100%;
-        }
+            select {
+              width: 100%;
+              @include box-sizing(border-box);
 
-        a {
+              option {
+                font-size: 14px;
+              }
+            }
 
-          &:first-child {
-            float: left;
-          }
+            a {
+              float: right;
 
-          &:last-child {
-            float: right;
+              &:first-child {
+                float: left;
+              }
+            }
           }
         }
       }
@@ -232,19 +241,24 @@ section.cal {
 }
 
 body.content
-    section.cal {
-      width: flex-grid(3) + flex-gutter();
-      float: left;
-      @include box-sizing(border-box);
+section.cal {
+  width: flex-grid(3) + flex-gutter();
+  float: left;
+  overflow: scroll;
+  @include box-sizing(border-box);
 
-      > header ul {
+  > header ul {
+    display: none;
+  }
+
+  ol {
+    li {
+      @include box-sizing(border-box);
+      width: 100%;
+
+      &.create-module {
         display: none;
       }
-
-      ol {
-        li {
-          @include box-sizing(border-box);
-          width: 100%;
-        }
-      }
     }
+  }
+}
diff --git a/cms/static/sass/_week.scss b/cms/static/sass/_week.scss
index 1a32557db5..1c03ff7962 100644
--- a/cms/static/sass/_week.scss
+++ b/cms/static/sass/_week.scss
@@ -3,152 +3,190 @@ section.week-new,
 section.sequence-edit {
 
   > header {
-    border-bottom: 1px solid #ccc;
+    border-bottom: 2px solid #333;
     @include clearfix();
-    padding: 6px;
 
     h1 {
       font-size: 18px;
-      float: left;
-      margin-top: 8px 6px;
+      margin: 8px 6px;
+      text-transform: uppercase;
+      letter-spacing: 1px;
     }
 
-    a {
-      float: right;
-      @extend .button;
-      display: block;
+    section.goals {
+      background: #eee;
+      padding: 6px;
+      border-top: 1px solid #ccc;
+
+      header {
+        h2 {
+          font-size: 14px;
+          @include inline-block();
+        }
+
+        p {
+          @include inline-block();
+        }
+
+      }
+
+      ul {
+        list-style: none;
+        margin-top: 6px;
+        color: #999;
+      }
     }
   }
 
-  section {
-    header {
-      background: #666;
-      color: #fff;
-      padding: 6px;
-      border-bottom: 1px solid #333;
-      -webkit-font-smoothing: antialiased;
+  > section.content {
+    @include box-sizing(border-box);
+    padding: 20px;
 
-      h2 {
-        font-size: 14px;
+    section.filters {
+      @include clearfix;
+      margin-bottom: 10px;
+      background: #efefef;
+      border: 1px solid #ddd;
+
+      ul {
+        @include clearfix();
+        list-style: none;
+        padding: 6px;
+
+        li {
+          @include inline-block();
+
+          &.advanced {
+            float: right;
+          }
+        }
       }
     }
 
-    &.sidebar {
-      width: flex-grid(3, 9) + flex-gutter(9);
-      float: left;
-      background: #ccc;
-      border-right: 1px solid #333;
-      @include box-sizing(border-box);
-
+    > div {
+      display: table;
+      border: 1px solid;
+      width: 100%;
       section {
-        height: 50%;
+        header {
+          background: #eee;
+          padding: 10px;
+          border-bottom: 1px solid #ccc;
 
-        > ul {
-          list-style: none;
+          h2 {
+            text-transform: uppercase;
+            letter-spacing: 1px;
+            font-size: 12px;
+          }
+        }
 
-          > li {
-            padding: 6px;
-            border-bottom: 1px solid #666;
-            background: #eee;
+        &.modules {
+          @include box-sizing(border-box);
+          display: table-cell;
+          width: flex-grid(6, 9);
+          border-right: 1px solid #333;
 
-            &.new-module {
-              position: relative;
+          ol {
+            list-style: none;
+            border-bottom: 1px solid #333;
 
-              ul.new-dropdown {
+            li {
+              border-bottom: 1px solid #333;
+
+              &:last-child{
+                border-bottom: 0;
+              }
+
+              a {
+                color: #000;
+              }
+
+              ol {
                 list-style: none;
 
                 li {
-                  display: none;
+                  padding: 6px 0 6px 6px;
 
-                  &:first-child {
-                    display: block;
+                  h3 {
+                    text-transform: uppercase;
+                    letter-spacing: 1px;
+                    font-size: 12px;
+                  }
+
+                  ol {
+                    border-left: 1px solid;
                   }
                 }
+              }
+            }
+          }
+        }
+
+        &.scratch-pad {
+          @include box-sizing(border-box);
+          display: table-cell;
+          width: flex-grid(3, 9) + flex-gutter(9);
+
+          ol {
+            list-style: none;
+            border-bottom: 1px solid #999;
+
+            li {
+              border-bottom: 1px solid #999;
+              background: #f9f9f9;
+
+              &:last-child {
+                border-bottom: 0;
+              }
+
+              ul {
+                list-style: none;
+
+                li {
+                  padding: 6px;
+
+                  a {
+                    color: #000;
+                  }
+                }
+              }
+
+              &.new-module {
+                position: relative;
+
+                ul.new-dropdown {
+                  list-style: none;
 
-                &:hover {
                   li {
-                    display: block;
-                    padding: 6px 0;
+                    display: none;
 
                     &:first-child {
-                      padding-top: 0;
+                      display: block;
+                    }
+                  }
+
+                  &:hover {
+                    li {
+                      display: block;
+                      padding: 6px 0;
+
+                      &:first-child {
+                        padding-top: 0;
+                      }
                     }
                   }
                 }
               }
             }
           }
-        }
 
-        p {
-          padding: 6px;
-          border-bottom: 1px solid #666;
-        }
-      }
-    }
-
-    &.weeks-content {
-      width: flex-grid(6, 9);
-      float: left;
-      @include box-sizing(border-box);
-
-      header {
-        @include clearfix;
-
-        h2 {
-          float: left;
-        }
-
-        form {
-          float: right;
-          margin: -2px 0;
-
-          input {
-            border: 1px solid #000;
-            background: #ddd;
-            padding: 2px 4px;
-            @include border-radius(2px);
-          }
-        }
-      }
-
-
-      section {
-        &.filters {
-          border-bottom: 1px solid #999;
-
-          ul {
-            @include clearfix();
-            list-style: none;
+          p {
             padding: 6px;
-
-            li {
-              @include inline-block();
-
-              &.advanced {
-                float: right;
-              }
-            }
-          }
-        }
-
-        &.modules {
-          ul {
-            list-style: none;
-
-            li {
-              padding: 6px;
-              font-weight: bold;
-              font-size: 16px;
-              border-bottom: 1px solid #333;
-
-              a {
-                color: #000;
-              }
-            }
+            border-bottom: 1px solid #666;
           }
         }
       }
     }
   }
 }
+
diff --git a/cms/templates/widgets/navigation.html b/cms/templates/widgets/navigation.html
index 2edef08a12..808c569e74 100644
--- a/cms/templates/widgets/navigation.html
+++ b/cms/templates/widgets/navigation.html
@@ -40,7 +40,7 @@
         <h1><a href="#">Week 1</a></h1>
         <ul>
           <li class="goal editable"><strong>Goal title:</strong> This is a goal that will be in the header of the week</li>
-          <li class="goal editable"><strong>Goal title two:</strong> This is another fgoal for this week so that students have two things to learn</li>
+          <li class="goal editable"><strong>Goal title two:</strong> This is another goal for this week so that students have two things to learn</li>
         </ul>
       </header>
 
@@ -146,7 +146,7 @@
       <form>
         <ul>
           <li>
-            <input type="text" name="" id="" placeholder="Moldule title" />
+            <input type="text" name="" id="" placeholder="Section title" />
           </li>
           <li>
             <select>
@@ -157,8 +157,11 @@
           </li>
           <li>
             <input type="submit" value="Save and edit week" class="edit-week" />
-            <a href="#" class="close">Save without edit</a>
-            <a href="#" class="close">cancel</a>
+
+            <div>
+              <a href="#" class="close">Save without edit</a>
+              <a href="#" class="close">cancel</a>
+            </div>
           </li>
         </ul>
       </form>
diff --git a/cms/templates/widgets/week-edit.html b/cms/templates/widgets/week-edit.html
index 348185be80..81f28b3de8 100644
--- a/cms/templates/widgets/week-edit.html
+++ b/cms/templates/widgets/week-edit.html
@@ -1,107 +1,145 @@
 <section class="week-edit">
   <header>
     <h1 class="editable">Week 3</h1>
-    <p><a href="#">+ new goal</a></p>
 
     <section class="goals">
-      <h2>Weeks goals:</h2>
+      <header>
+        <h2>Weeks goals:</h2>
+        <p><a href="#">+ new goal</a></p>
+      </header>
+
       <ul>
         <li>
-          <h3>Goal title</h2>
-          <p>This is the goal body</p>
+          <p><strong>Goal title:</strong> This is the goal body and is wehre 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>
 
-  <section class="weeks-content">
-    <header>
-      <h2>Weeks Content</h2>
-      <form>
+      <li class="advanced">
+        <a href="#">Advanced filters</a>
+      </li>
+
+      <li>
         <input type="search" name="" id="" value="" />
-      </form>
-    </header>
-
-    <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>
-      </ul>
-    </section>
-
+      </li>
+    </ul>
+  </section>
+    <div>
     <section class="modules">
-      <ul>
+      <ol>
         <li>
-          <h2><a href="#">Lecture Sequence</a></h2>
+          <header>
+            <h2><a href="#">Lecture Sequence</a></h2>
+          </header>
 
-          <ul>
+          <ol>
             <li><a href="#" class="problem-edit">Problem title 11</a></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>
-          </ul>
+          </ol>
         </li>
         <li>
+          <header>
           <h2><a href="#">Lecture Sequence</a></h2>
+          </header>
 
-          <ul>
-            <li><a href="#" class="problem-edit">Problem title 11</a></li>
+          <ol>
+            <li>
+              <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>
-          </ul>
+          </ol>
         </li>
         <li>
+          <header>
           <h2><a href="#">Homework 1a</a></h2>
+          </header>
 
-          <ul>
+          <ol>
             <li><a href="#" class="problem-edit">Problem title 11</a></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>
-          </ul>
+          </ol>
         </li>
 
         <li class="new-module">
           <%include file="new-module.html"/>
         </li>
-      </ul>
+      </ol>
     </section>
-  </section>
 
   <section class="scratch-pad">
-    <header>
-      <h2>Scratchpad</h2>
-    </header>
+    <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>
 
-    <ul>
-      <li>Problem title 11</li>
-      <li>Problem title 13</li>
-      <li>Problem title 14</li>
-      <li>Video 3</li>
-      <%include file="new-module.html"/>
-    </ul>
+      <li class="new-module">
+        <%include file="new-module.html"/>
+      </li>
+    </ol>
+  </section>
+    </div>
   </section>
 </section>
diff --git a/cms/templates/widgets/week-new.html b/cms/templates/widgets/week-new.html
index fe286a74b3..46aba9b778 100644
--- a/cms/templates/widgets/week-new.html
+++ b/cms/templates/widgets/week-new.html
@@ -1,10 +1,13 @@
 <section class="week-new">
   <header>
     <h1>Week 6</h1>
-    <p><a href="#">+ new goal</a></p>
 
     <section class="goals">
-      <h2>Weeks goals:</h2>
+      <header>
+        <h2>Weeks goals:</h2>
+        <p><a href="#">+</a></p>
+      </header>
+
       <ul>
         <li>
           <h3>Create new goal</h2>
@@ -40,32 +43,32 @@
       </li>
 
       <li>
-      <form>
-        <input type="search" name="" id="" value="" />
-      </form>
+        <form>
+          <input type="search" name="" id="" value="" />
+        </form>
       </li>
     </ul>
   </section>
 
-  <section>
-  <section class="scratch-pad">
-    <header>
-      <h2>Scratch pad</h2>
-    </header>
+  <section class="content">
 
-    <ul>
-      <li class="new-module">
-      <%include file="new-module.html"/>
-    </li>
-    </ul>
-  </section>
+    <section class="weeks-content">
+      <header>
+        <h2>Weeks Content</h2>
+      </header>
+    </section>
 
-  <section class="weeks-content">
-    <header>
-      <h2>Weeks Content</h2>
-    </header>
+    <section class="scratch-pad">
+      <header>
+        <h2>Scratch pad</h2>
+      </header>
 
-  </section>
+      <ul>
+        <li class="new-module">
+          <%include file="new-module.html"/>
+        </li>
+      </ul>
+    </section>
   </section>
 
   <section class="new-bar">
@@ -83,4 +86,5 @@
         <a href="#">New Lab</a>
       </li>
     </ul>
+  </section>
 </section>