diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index c1875edb06..a91d703d0f 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -80,7 +80,8 @@ footer {
 
 input[type="text"],
 input[type="email"],
-input[type="password"] {
+input[type="password"],
+textarea {
     padding: 6px 8px 8px;
     @include box-sizing(border-box);
     border: 1px solid #b0b6c2;
diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss
index 89f7841df0..3a2292ba6f 100644
--- a/cms/static/sass/_settings.scss
+++ b/cms/static/sass/_settings.scss
@@ -122,6 +122,7 @@
 
       &.long {
         width: 100%;
+        min-width: 400px;
       }
 
       &.tall {
@@ -129,6 +130,7 @@
       }
 
       &.short {
+        min-width: 100px;
         width: 25%;
       }
 
@@ -143,13 +145,14 @@
       }
 
       &:disabled {
-        color: $darkGrey;
-        background: $lightGrey;
+        border-color: $mediumGrey;
+        color: $mediumGrey;
+        background: #fff;
       }
     }
 
-    .input-default {
-      color: $darkGrey;
+    .input-default input, .input-default textarea {
+      color: $mediumGrey;
       background: $lightGrey;
     }
 
@@ -169,7 +172,7 @@
         margin-bottom: 15px;
       }
 
-      .ui-status-input-checkbox, .ui-status-input-radio {
+      .ui-status-input-checkbox input, .ui-status-input-radio input {
         position: absolute;
         top: -9999px;
         left: -9999px;
@@ -179,7 +182,7 @@
         cursor: pointer;
       }
 
-      .ui-status-input-checkbox ~ label, .ui-status-input-radio ~ label {
+      .ui-status-input-checkbox input ~ label, .ui-status-input-radio input ~ label {
         position: relative;
         left: -30px;
         display: inline-block;
@@ -208,21 +211,24 @@
       }
 
       .ui-status-indic {
-        position: relative;
-        top: 2px;
+        background: transparent url('../images/correct-icon.png') 0 0 no-repeat;
         z-index: 10;
         display: inline-block;
-        height: 15px;
-        width: 15px;
-        border: 2px;
-        background: $offBlack;
+        height: 20px;
+        width: 30px;
         opacity: 0.50;
-        @include border-radius(50px);
-        @include box-sizing(border-box);
         @include transition(opacity 0.25s ease-in-out);
       }
 
-      .ui-status-input-checkbox:checked ~ label, .ui-status-input-radio:checked ~ label {
+      .ss-check {
+        color: $green;
+      }
+
+      .ss-delete {
+        color: $red;
+      }
+
+      .ui-status-input-checkbox input:checked ~ label, .ui-status-input-radio input:checked ~ label {
          opacity: 0.99;
 
          &:after {
@@ -236,9 +242,19 @@
          }
       }
 
-      .ui-status-input-checkbox:checked ~ .ui-status-indic, .ui-status-input-radio:checked ~ .ui-status-indic {
+      .ui-status-input-checkbox input:checked ~ .ui-status-indic, .ui-status-input-radio input:checked ~ .ui-status-indic {
+        background: transparent url('../images/correct-icon.png') 0 0 no-repeat;
         opacity: 0.99;
       }
+
+      // disabled 
+      .ui-status-input-checkbox input:disabled, .ui-status-input-radio input:disabled {
+        color: $mediumGrey;
+      }
+
+      .ui-status-input-checkbox input:disabled ~ .ui-status-indic, .ui-status-input-radio input:disabled ~ .ui-status-indic {
+        color: $mediumGrey;
+      }
     }
 
     .tip {
@@ -308,6 +324,7 @@
 
             .group {
               margin-bottom: 10px;
+              max-width: 175px;
 
               &:last-child {
                 margin-bottom: 0;
@@ -316,6 +333,10 @@
               input, .input, textarea {
 
               }
+
+              .tip-stacked {
+                margin-top: 0;
+              }
             }
           }
 
@@ -324,7 +345,8 @@
             
             .group {
               input, .input, textarea {
-                width: 100%;
+                min-width: 370px;
+                width: 370px;
               }
             }
           }
@@ -379,7 +401,7 @@
         }
 
         .field {
-          width: 400px;
+          width: 400px ! important;
         }
 
         &.multi-inline {
@@ -407,6 +429,7 @@
     .remove-item {
       clear: both;
       display: block;
+      margin-top: 10px;
       opacity: 0.75;
       font-size: 13px;
       text-align: right;
@@ -426,10 +449,25 @@
       .current {
         width: 100%;
         margin: 10px 0;
-        padding: 15px;
+        padding: 10px;
         @include box-sizing(border-box);
         @include border-radius(5px);
-        background: tint($blue, 80%);
+        font-size: 14px;
+        background: tint($lightGrey, 50%);
+        @include clearfix();
+      
+        .doc-filename {
+          display: inline-block;
+          width: 220px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
+        .remove-doc-data {
+          display: inline-block;
+          margin-top: 0;
+          width: 150px;
+        }
       }
     }
 
@@ -464,6 +502,10 @@
               border-bottom: none;
             }
           }
+
+          .remove-faculty-photo {
+            display: inline-block;
+          }
         }
 
         #course-faculty-bio-input {
@@ -474,14 +516,15 @@
         }
 
         .current-faculty-photo {
-          height: 115px;
-          width: 115px;
           overflow: hidden;
+          padding: 0;
 
           img {
             display: block;
-            min-height: 100%;
-            max-width: 100%;
+            @include box-shadow(0 1px 3px rgba(0,0,0,0.1));
+            padding: 10px;
+            border: 2px solid $mediumGrey;
+            background: #fff;
           }
         }
       }
@@ -493,7 +536,6 @@
       .course-grading-gradeweight, .course-grading-totalassignments, .course-grading-totalassignmentsdroppable {
 
         input {
-          width: 73px;
         }
       }
     }
@@ -514,6 +556,23 @@
 
     .settings-discussions {
 
+      .settings-discussions-categories .course-discussions-categories-list-item {
+
+        label {
+          display: none;
+        }
+
+        .group {
+          display: inline-block;
+        }
+
+        .remove-item {
+          display: inline-block !important;
+          margin-left: 10px;
+        }
+      }
+
+
     }
 
     // states
@@ -543,10 +602,845 @@
     //    }
     // }
 
+    input.error, textarea.error {
+      border-color: $red;
+    }
+
+    .message-error {
+      display: block;
+      margin-top: 5px;
+      color: $red;
+      font-size: 13px;
+    }
+
     // misc
     .divide {
       display: none;
     }
+
+    i.ss-icon {
+      position: relative;
+      top: 1px;
+      margin-right: 5px;
+    }
+  }
+
+
+
+  h3 {
+    margin-bottom: 30px;
+    font-size: 15px;
+    font-weight: 700;
+    color: $blue;
+  }
+
+  .grade-controls {
+    @include clearfix;
+  }
+
+  .new-grade-button {
+    position: relative;
+    float: left;
+    display: block;
+    width: 29px;
+    height: 29px;
+    margin: 4px 10px 0 0;
+    border-radius: 20px;
+    border: 1px solid $darkGrey;
+    @include linear-gradient(top, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0));
+    background-color: #d1dae3;
+    @include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset);
+    color: #6d788b;
+
+    .plus-icon {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      margin-left: -6px;
+      margin-top: -6px;
+    }
+  }
+
+  .grade-slider {
+    float: right;
+    width: 95%;
+    height: 80px;
+
+    .grade-bar {
+      position: relative;
+      width: 100%;
+      height: 50px;
+      background: $lightGrey;
+
+      .increments {
+        position: relative;
+
+        li {
+          position: absolute;
+          top: 52px;
+          width: 30px;
+          margin-left: -15px;
+          font-size: 9px;
+          text-align: center;
+
+          &.increment-0 {
+            left: 0;
+          }
+
+          &.increment-10 {
+            left: 10%;
+          }
+
+          &.increment-20 {
+            left: 20%;
+          }
+
+          &.increment-30 {
+            left: 30%;
+          }
+
+          &.increment-40 {
+            left: 40%;
+          }
+
+          &.increment-50 {
+            left: 50%;
+          }
+
+          &.increment-60 {
+            left: 60%;
+          }
+
+          &.increment-70 {
+            left: 70%;
+          }
+
+          &.increment-80 {
+            left: 80%;
+          }
+
+          &.increment-90 {
+            left: 90%;
+          }
+
+          &.increment-100 {
+            left: 100%;
+          }
+        }
+      }
+
+      .grades {
+        position: relative;
+
+        li {
+          position: absolute;
+          top: 0;
+          height: 50px;     
+          text-align: right;
+
+          &:hover,
+          &.is-dragging {
+            .remove-button {
+              display: block;
+            }
+          }
+
+          &.is-dragging {
+
+
+          }
+
+          .remove-button {
+            display: none;
+            position: absolute;
+            top: -17px;
+            right: 1px;
+            height: 17px;
+            font-size: 10px;
+          }
+
+          &:nth-child(1) {
+            background: #4fe696;
+          }
+
+          &:nth-child(2) {
+            background: #ffdf7e;
+          }
+
+          &:nth-child(3) {
+            background: #ffb657;
+          }
+
+          &:nth-child(4) {
+            background: #fb336c;
+          }
+
+          &:nth-child(5) {
+            background: #ef54a1;
+          }
+
+          .letter-grade {
+            display: block;
+            margin: 10px 15px 0 0;
+            font-size: 16px;
+            font-weight: 700;
+            line-height: 14px;
+          }
+
+          .range {
+            display: block;
+            margin-right: 15px;
+            font-size: 10px;
+            line-height: 12px;
+          }
+
+          .drag-bar {
+            position: absolute;
+            top: 0;
+            right: -1px;
+            height: 50px;
+            width: 2px;
+            background-color: #fff;
+            @include box-shadow(-1px 0 3px rgba(0,0,0,0.1));
+
+            cursor: ew-resize;
+            @include transition(none);
+
+            &:hover {
+              width: 6px;
+              right: -2px;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+.settings {
+  .settings-overview {
+    @extend .window;
+    @include clearfix;
+    display: table;
+    width: 100%;
+
+    // layout
+    .sidebar {
+      display: table-cell;
+      float: none;
+      width: 20%;
+      padding: 30px 0 30px 20px;
+      @include border-radius(3px 0 0 3px);
+      background: $lightGrey;      
+    }
+
+    .main-column {
+      display: table-cell;
+      float: none;
+      width: 80%;
+      padding: 30px 40px 30px 60px;
+    }
+
+    .settings-page-menu {
+      a {
+        display: block;
+        padding-left: 20px;
+        line-height: 52px;
+
+        &.is-shown {
+          background: #fff;
+          @include border-radius(5px 0 0 5px);
+        }
+      }
+    }
+
+    .settings-page-section {
+      > .alert {
+        display: none;
+
+        &.is-shown {
+          display: block;
+        }
+      }
+
+      > section {
+        display: none;
+        margin-bottom: 40px;
+
+        &.is-shown {
+          display: block;
+        }
+
+        &:last-child {
+          border-bottom: none;
+        }
+
+        > .title {
+          margin-bottom: 30px;
+          font-size: 28px;
+          font-weight: 300;
+          color: $blue;
+        }
+
+        > section {
+          margin-bottom: 100px;
+          @include clearfix;
+
+          header {
+            @include clearfix;
+            border-bottom: 1px solid $mediumGrey;
+            margin-bottom: 20px;
+            padding-bottom: 10px;
+
+            h3 {
+              color: $darkGrey;
+              float: left;
+
+              margin: 0 40px 0 0;
+              text-transform: uppercase;
+            }
+
+            .detail {
+              float: right;
+              marign-top: 3px;
+              color: $mediumGrey;
+              font-size: 13px;
+            }
+          }
+
+          &:last-child {
+            padding-bottom: 0;
+            border-bottom: none;
+          }
+        }
+      }
+    }
+
+    // form basics
+    label, .label {
+      padding: 0;
+      border: none;
+      background: none;
+      font-size: 15px;
+      font-weight: 400;
+
+      &.check-label {
+        display: inline;
+        margin-left: 10px;
+      }
+
+      &.ranges {
+        margin-bottom: 20px;
+      }
+    }
+
+    input, textarea {
+      @include transition(all 1s ease-in-out);
+      @include box-sizing(border-box);
+      font-size: 15px;
+
+      &.long {
+        width: 100%;
+        min-width: 400px;
+      }
+
+      &.tall {
+        height: 200px;
+      }
+
+      &.short {
+        min-width: 100px;
+        width: 25%;
+      }
+
+      &.date {
+
+      }
+
+      &:focus {
+        @include linear-gradient(tint($blue, 80%), tint($blue, 90%));
+        border-color: $blue;
+        outline: 0;
+      }
+
+      &:disabled {
+        border-color: $mediumGrey;
+        color: $mediumGrey;
+        background: #fff;
+      }
+    }
+
+    .input-default input, .input-default textarea {
+      color: $mediumGrey;
+      background: $lightGrey;
+    }
+
+    ::-webkit-input-placeholder {
+      color: $mediumGrey;
+      font-size: 13px;
+    }
+    :-moz-placeholder {  
+      color: $mediumGrey;  
+      font-size: 13px;
+    }
+
+    .field.ui-status {
+
+      > .input {
+        display: block !important;
+        margin-bottom: 15px;
+      }
+
+      .ui-status-input-checkbox input, .ui-status-input-radio input {
+        position: absolute;
+        top: -9999px;
+        left: -9999px;
+      }
+
+      label {
+        cursor: pointer;
+      }
+
+      .ui-status-input-checkbox input ~ label, .ui-status-input-radio input ~ label {
+        position: relative;
+        left: -30px;
+        display: inline-block;
+        z-index: 100;
+        margin: 0 0 0 5px;
+        padding-left: 30px;
+        color: $offBlack;
+        opacity: 0.50;
+        cursor: pointer;
+        @include transition(opacity 0.25s ease-in-out);
+
+        &:before {
+          display: inline-block;
+          margin-right: 10px;
+        }
+
+        &:after {
+         display: inline-block;
+         margin-left: 10px;
+        }
+
+        ~ .tip {
+         margin-top: 0;
+         @include transition(color 0.25s ease-in-out);
+        }
+      }
+
+      .ui-status-indic {
+        background: transparent url('../images/correct-icon.png') 0 0 no-repeat;
+        z-index: 10;
+        display: inline-block;
+        height: 20px;
+        width: 30px;
+        opacity: 0.50;
+        @include transition(opacity 0.25s ease-in-out);
+      }
+
+      .ss-check {
+        color: $green;
+      }
+
+      .ss-delete {
+        color: $red;
+      }
+
+      .ui-status-input-checkbox input:checked ~ label, .ui-status-input-radio input:checked ~ label {
+         opacity: 0.99;
+
+         &:after {
+         }
+
+         &:before {
+         }
+
+         ~ .tip {
+          color: $darkGrey;
+         }
+      }
+
+      .ui-status-input-checkbox input:checked ~ .ui-status-indic, .ui-status-input-radio input:checked ~ .ui-status-indic {
+        background: transparent url('../images/correct-icon.png') 0 0 no-repeat;
+        opacity: 0.99;
+      }
+
+      // disabled 
+      .ui-status-input-checkbox input:disabled, .ui-status-input-radio input:disabled {
+        color: $mediumGrey;
+      }
+
+      .ui-status-input-checkbox input:disabled ~ .ui-status-indic, .ui-status-input-radio input:disabled ~ .ui-status-indic {
+        color: $mediumGrey;
+      }
+    }
+
+    .tip {
+      color: $mediumGrey;
+      font-size: 13px;
+    }
+
+
+    // form layouts
+    .row {
+      margin-bottom: 30px;
+      padding-bottom: 30px;
+      border-bottom: 1px solid $lightGrey;
+
+      &:last-child {
+        margin-bottom: 0;
+        padding-bottom: 0;
+        border-bottom: none;
+      }
+
+      // structural labels, not semantic labels per se
+      > label, .label {
+        display: inline-block;
+        vertical-align: top;
+      }
+
+      // tips
+      .tip-inline {
+        display: inline-block;
+        margin-left: 10px;
+      }
+
+      .tip-stacked {
+        display: block;
+        margin-top: 10px;
+      }
+
+      // structural field, not semantic fields per se
+      .field {
+        display: inline-block;
+        width: 100%;
+
+        > input, > textarea, .input {
+          display: inline-block;
+
+          &:last-child {
+            margin-bottom: 0;
+          }
+
+          .group {
+            input, textarea {
+              margin-bottom: 5px;
+            }
+
+            .label, label {
+              font-size: 13px;
+            }
+          }
+
+          // multi-field
+          &.multi {
+            display: block;
+            background: tint($lightGrey, 50%);
+            padding: 15px;
+            @include border-radius(4px);
+            @include box-sizing(border-box);
+
+            .group {
+              margin-bottom: 10px;
+              max-width: 175px;
+
+              &:last-child {
+                margin-bottom: 0;
+              }
+
+              input, .input, textarea {
+
+              }
+
+              .tip-stacked {
+                margin-top: 0;
+              }
+            }
+          }
+
+          // multi stacked
+          &.multi-stacked {
+            
+            .group {
+              input, .input, textarea {
+                min-width: 370px;
+                width: 370px;
+              }
+            }
+          }
+
+          // multi-field inline
+          &.multi-inline {
+            @include clearfix;
+
+            .group {
+              float: left;
+              margin-right: 20px;
+
+              &:nth-child(2) {
+                margin-right: 0;
+              }
+
+              .input, input, textarea {
+                width: 100%;
+              }
+            }
+
+            .remove-item {
+              float: right;
+            }       
+          }
+        }
+
+        // input-list
+        .input-list {
+
+          .input {
+            margin-bottom: 15px;
+            padding-bottom: 15px;
+            border-bottom: 1px dotted $lightGrey;
+
+            &:last-child {
+              border: 0;
+            }
+          }
+        }
+
+        // enumerated inputs
+        &.enum {
+        }
+      }
+      
+      // layout - aligned label/field pairs 
+      &.row-col2 {
+
+        > label, .label {
+          width: 200px;
+        }
+
+        .field {
+          width: 400px ! important;
+        }
+
+        &.multi-inline {
+          @include clearfix;
+
+          .group {
+            width: 170px;
+          }  
+        }
+      }
+    }
+
+    // editing controls - adding
+    .new-item, .replace-item {
+      clear: both;
+      display: block;
+      margin-top: 10px;
+      padding-bottom: 10px;
+      @include grey-button;
+      @include box-sizing(border-box);
+    }
+
+
+    // editing controls - removing
+    .remove-item {
+      clear: both;
+      display: block;
+      margin-top: 10px;
+      opacity: 0.75;
+      font-size: 13px;
+      text-align: right;
+      @include transition(opacity 0.25s ease-in-out);
+
+
+      &:hover {
+        color: $blue;
+        opacity: 0.99;
+      }
+    }
+
+    // editing controls - preview
+    .input-existing {
+      display: block !important;
+
+      .current {
+        width: 100%;
+        margin: 10px 0;
+        padding: 10px;
+        @include box-sizing(border-box);
+        @include border-radius(5px);
+        font-size: 14px;
+        background: tint($lightGrey, 50%);
+        @include clearfix();
+      
+        .doc-filename {
+          display: inline-block;
+          width: 220px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
+        .remove-doc-data {
+          display: inline-block;
+          margin-top: 0;
+          width: 150px;
+        }
+      }
+    }
+
+    // specific sections
+    .settings-details {
+
+    }
+
+    .settings-faculty {
+
+      .settings-faculty-members {
+
+        > header {
+          display: none;
+        }
+
+        .field .multi {
+          display: block;
+          margin-bottom: 40px;
+          padding: 20px;
+          background: tint($lightGrey, 50%);
+          @include border-radius(4px);
+          @include box-sizing(border-box);
+        }
+
+        .course-faculty-list-item {
+
+          .row {
+
+            &:nth-child(4) {
+              padding-bottom: 0;
+              border-bottom: none;
+            }
+          }
+
+          .remove-faculty-photo {
+            display: inline-block;
+          }
+        }
+
+        #course-faculty-bio-input {
+          margin-bottom: 0;
+        }
+
+        .new-course-faculty-item {
+        }
+
+        .current-faculty-photo {
+          overflow: hidden;
+          padding: 0;
+
+          img {
+            display: block;
+            @include box-shadow(0 1px 3px rgba(0,0,0,0.1));
+            padding: 10px;
+            border: 2px solid $mediumGrey;
+            background: #fff;
+          }
+        }
+      }
+    }
+
+    .settings-grading {
+
+
+      .course-grading-gradeweight, .course-grading-totalassignments, .course-grading-totalassignmentsdroppable {
+
+        input {
+        }
+      }
+    }
+
+    .settings-handouts {
+
+    }
+
+    .settings-problems {
+
+      > section {
+
+        &.is-shown {
+          display: block;
+        }
+      }
+    }
+
+    .settings-discussions {
+
+      .settings-discussions-categories .course-discussions-categories-list-item {
+
+        label {
+          display: none;
+        }
+
+        .group {
+          display: inline-block;
+        }
+
+        .remove-item {
+          display: inline-block !important;
+          margin-left: 10px;
+        }
+      }
+
+
+    }
+
+    // states
+    label.is-focused {
+      color: $blue;
+      @include transition(color 1s ease-in-out);
+    }
+
+    // extras/abbreviations
+    // .settings-extras {
+
+    //   > header {
+    //     cursor: pointer;
+
+    //     &.active {
+
+    //     }
+    //   }
+      
+    //    > div {
+    //     display: none;
+    //     @include transition(display 0.25s ease-in-out);
+
+    //     &.is-shown {
+    //       display: block;
+    //     }
+    //    }
+    // }
+
+    input.error, textarea.error {
+      border-color: $red;
+    }
+
+    .message-error {
+      display: block;
+      margin-top: 5px;
+      color: $red;
+      font-size: 13px;
+    }
+
+    // misc
+    .divide {
+      display: none;
+    }
+
+    i.ss-icon {
+      position: relative;
+      top: 1px;
+      margin-right: 5px;
+    }
   }
 
 
diff --git a/cms/static/sass/_variables.scss b/cms/static/sass/_variables.scss
index fec65e4e11..8666dc192c 100644
--- a/cms/static/sass/_variables.scss
+++ b/cms/static/sass/_variables.scss
@@ -13,8 +13,11 @@ $body-line-height: golden-ratio(.875em, 1);
 $pink: rgb(182,37,104);
 $error-red: rgb(253, 87, 87);
 
+$offBlack: #3c3c3c;
 $blue: #5597dd;
 $orange: #edbd3c;
+$red: #b20610;
+$green: #108614;
 $lightGrey: #edf1f5;
 $mediumGrey: #ced2db;
 $darkGrey: #8891a1;
diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss
index 6a6105c109..73812125a8 100644
--- a/cms/static/sass/base-style.scss
+++ b/cms/static/sass/base-style.scss
@@ -18,6 +18,7 @@
 @import "static-pages";
 @import "users";
 @import "import";
+@import "settings";
 @import "course-info";
 @import "landing";
 @import "graphics";
diff --git a/cms/templates/base.html b/cms/templates/base.html
index ba91b2f400..33fe02aadd 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -9,6 +9,9 @@
     <%static:css group='base-style'/>
     <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/markitup/skins/simple/style.css')}" />
     <link rel="stylesheet" type="text/css" href="${static.url('js/vendor/markitup/sets/wiki/style.css')}" />
+    <link rel="stylesheet" type="text/css" href="${static.url('css/vendor/symbolset.ss-standard.css')}" />
+    <link rel="stylesheet" type="text/css" href="${static.url('css/vendor/symbolset.ss-symbolicons-block.css')}" />
+
     <title><%block name="title"></%block></title>
     <meta name="viewport" content="width=device-width,initial-scale=1">
 
@@ -33,6 +36,9 @@
     <script src="${static.url('js/vendor/jquery.leanModal.min.js')}"></script>
     <script src="${static.url('js/vendor/jquery.tablednd.js')}"></script>
     <script src="${static.url('js/vendor/jquery.form.js')}"></script>
+    <script type="text/javascript" src="${static.url('js/vendor/symbolset.ss-standard.js')}"></script>
+    <script type="text/javascript" src="${static.url('js/vendor/symbolset.ss-symbolicons.js')}"></script>
+
     <script type="text/javascript">
       document.write('\x3Cscript type="text/javascript" src="' +
           document.location.protocol + '//www.youtube.com/player_api">\x3C/script>');
diff --git a/cms/templates/settings.html b/cms/templates/settings.html
index 3f7094fad8..5d9fed9464 100644
--- a/cms/templates/settings.html
+++ b/cms/templates/settings.html
@@ -72,7 +72,6 @@
       $(this).closest('li').remove();
     }
 
-
     function showSettingsExtras(e) {
       e.preventDefault();
       $(this).toggleClass('active');
@@ -146,7 +145,8 @@
                 <label for="course-name-input">Course Name:</label>
                 <div class="field">
                   <div class="input">
-                    <input type="text" class="long" id="course-name-input" disabled="disabled">
+                    <input type="text" class="long" id="course-name-input" value="[Course Name]" disabled="disabled">
+                    <span class="tip tip-stacked">This is used in <a href="[COURSE_SUMMARY_URL]">your course URL</a>, and cannot be changed</span>
                   </div>
                 </div>
               </div>
@@ -155,7 +155,8 @@
                 <label for="course-organization-input">Organization:</label>
                 <div class="field">
                   <div class="input">
-                    <input type="text" class="long" id="course-organization-input" disabled="disabled">      
+                    <input type="text" class="long" id="course-organization-input" value="[Course Organization]" disabled="disabled">
+                    <span class="tip tip-stacked">This is used in <a href="[COURSE_SUMMARY_URL]">your course URL</a>, and cannot be changed</span>     
                   </div>
                 </div>
               </div>
@@ -164,8 +165,9 @@
                 <label for="course-number-input">Course Number:</label>
                 <div class="field">
                   <div class="input">
-                    <input type="text" class="short" id="course-number-input" disabled="disabled">
+                    <input type="text" class="short" id="course-number-input" value="[Course No.]" disabled="disabled">
                     <span class="tip tip-inline">e.g. 101x</span>
+                    <span class="tip tip-stacked">This is used in <a href="[COURSE_SUMMARY_URL]">your course URL</a>, and cannot be changed</span>
                   </div>
                 </div>
               </div>
@@ -180,74 +182,54 @@
               </header>
 
               <div class="row row-col2">
-                <label for="course-start-date-input">Course Start Date:</label>
+                <h4 class="label">Course Dates:</h4>
+                
                 <div class="field">
-                  <div class="input">
-                    <input type="text" class="start-date date set-date" id="course-start-date-input" placeholder="MM/DD/YYYY">
-                    <span class="tip tip-inline">First day the class begins</span>          
+                  <div class="input multi multi-inline">
+                    <div class="group">
+                      <label for="course-start-date-input">Start Date</label>
+                      <input type="text" class="start-date date set-date" id="course-start-date-input" placeholder="MM/DD/YYYY">
+                      <span class="tip tip-stacked">First day the course begins</span>          
+                    </div>
+
+                    <div class="group">
+                      <label for="course-end-date-input">End Date</label>
+                      <input type="text" class="start-date date set-date" id="course-end-date-input" placeholder="MM/DD/YYYY">
+                      <span class="tip tip-stacked">Last day the course is active</span>          
+                    </div>
                   </div>
                 </div>
               </div>
 
               <div class="row row-col2">
-                <label for="course-end-date-input">Course End Date:</label>
+                <h4 class="label">Enrollment Dates:</h4>
+                
                 <div class="field">
-                  <div class="input">
-                    <input type="text" class="end-date date set-date" id="course-end-date-input" placeholder="MM/DD/YYYY">
-                    <span class="tip tip-inline">Last day the class begins</span>
+                  <div class="input multi multi-inline">
+                    <div class="group">
+                      <label for="course-enrollment-start-date-input">Start Date</label>
+                      <input type="text" class="start-date date set-date" id="course-enrollment-start-date-input" placeholder="MM/DD/YYYY">
+                      <span class="tip tip-stacked">First day students can enroll</span>          
+                    </div>
+
+                    <div class="group">
+                      <label for="course-enrollment-end-date-input">End Date</label>
+                      <input type="text" class="start-date date set-date" id="course-enrollment-end-date-input" placeholder="MM/DD/YYYY">
+                      <span class="tip tip-stacked">Last day students can enroll</span>          
+                    </div>
                   </div>
                 </div>
               </div>
 
-              <div class="row row-col2">
-                <h4 class="label">Milestones:</h4>
-
-                <div class="field enum">
-                  <ul class="input-list course-milestone-list">
-                    <li class="input input-existing multi multi-inline course-milestone-list-item">
-                      <div class="group">
-                        <label for="course-milestone-1-date-input">Milestone Date</label>
-                        <input type="text" id="course-milestone-1-date-input" class="course-milestone-date-input date set-date" placeholder="MM/DD/YYYY">
-                      </div>
-
-                      <div class="group">
-                        <label for="course-milestone-1-name-input">Milestone Name</label>
-                        <input type="text" class="course-milestone-name-input" id="course-milestone-1-name-input">
-                      </div>
-
-                      <a href="#" class="remove-item remove-milestone-data"><span class="delete-icon"></span> Delete Milestone</a>
-                    </li>
-
-                    <li class="input multi multi-inline course-milestone-list-item">
-                      <div class="group">
-                        <label for="course-milestone-2-date-input">Milestone Date</label>
-                        <input type="text" class="course-milestone-date-input date set-date" id="course-milestone-2-date-input" placeholder="MM/DD/YYYY">
-                      </div>
-
-                      <div class="group">
-                        <label for="course-milestone-2-name-input">Milestone Name</label>
-                        <input type="text" class="course-milestone-name-input" id="course-milestone-2-name-input">
-                      </div>
-                    </li>
-                  </ul>
-
-                  <a href="#" class="new-item new-course-milestone-item add-milestone-data">
-                    <span class="plus-icon"></span>New Course Milestone
-                  </a>
-                </div>
-              </div>
-
               <div class="row row-col2">
                 <label for="course-syllabus-input">Course Syllabus</label>
                 <div class="field">
                   <div class="input input-existing">
                     <div class=" current current-course-syllabus">
-                      <span class="pdf doc-filename">CS184x_syllabus.pdf</span>
+                      <span class="doc-filename"><a href="[link to file]".pdf> <i class="ss-icon ss-standard">&#x1F4C4;</i>CS184x_syllabus.pdf</a></span>
+
+                      <a href="#" class="remove-item remove-course-syllabus remove-doc-data"><span class="delete-icon"></span> Delete Syllabus</a>
                     </div>
-
-                    <a href="#" class="remove-item remove-course-syllabus remove-doc-data"><span class="delete-icon"></span> Delete Syllabus</a>
-
-                    <span class="tip tip-inline">PDF formatting preferred</span>          
                   </div>
 
                   <div class="input">
@@ -272,31 +254,21 @@
                 <label for="course-overview">Course Overview:</label>
                 <div class="field">
                   <div class="input">
-                    <textarea class="long tall" input="course-overview"></textarea>
-                    <span class="tip tip-stacked">Detailed summary of concepts and lessons covered</span>
+                    <textarea class="long tall edit-box tinymce" id="course-overview"></textarea>
+                    <span class="tip tip-stacked">Introductions, prerequisites, FAQs that are used on <a href="[COURSE_SUMMARY_URL]">your course summary page</a></span>
                   </div>
                 </div>      
               </div>
 
-              <div class="row row-col2">
-                <label for="course-shortdescription">Course Statement:</label>
-                <div class="field">
-                  <div class="input">
-                    <textarea class="long" id="course-shortdescription"></textarea>
-                    <span class="tip tip-stacked">1-2 sentences used to introduce your class to perspective students</span>
-                  </div>
-                </div>
-              </div>
-
               <div class="row row-col2">
                 <label for="course-introduction-video">Introduction Video:</label>
                 <div class="field">
                   <div class="input input-existing">
                     <div class=" current current-course-introduction-video">
-                      <iframe width="400" height="225" src="http://www.youtube.com/embed/6F0pR-ANmXY" frameborder="0" allowfullscreen></iframe>
-                    </div>
+                      <iframe width="380" height="215" src="http://www.youtube.com/embed/6F0pR-ANmXY" frameborder="0" allowfullscreen></iframe>
 
-                    <a href="#" class="remove-item remove-course-introduction-video remove-video-data"><span class="delete-icon"></span> Delete Video</a>
+                      <a href="#" class="remove-item remove-course-introduction-video remove-video-data"><span class="delete-icon"></span> Delete Video</a>
+                    </div>
                   </div>
 
                   <div class="input">
@@ -317,16 +289,6 @@
                 <span class="detail">Expectations of the students taking this course</span>
               </header>
 
-              <div class="row row-col2">
-                <label for="course-requirements">Requirements:</label>
-                <div class="field">
-                  <div class="input">
-                    <textarea class="long tall" id="course-requirements"></textarea>  
-                    <span class="tip tip-stacked">Supplies, software, and set-up that students will need</span>     
-                  </div>
-                </div>
-              </div>
-
               <div class="row row-col2">
                 <label for="course-effort">Hours of Effort per Week:</label>
                 <div class="field">
@@ -336,132 +298,6 @@
                   </div>
                 </div>
               </div>
-
-              <div class="row row-col2">
-                <h4 class="label">Textbooks:</h4>
-
-                <div class="field enum">
-                  <ul class="input-list course-textbooks-list">
-                    <li class="input input-existing multi multi-stacked course-textbooks-list-item">
-                      <div class="group">
-                        <label for="course-textbooks-1-name-input">Textbook Name</label>
-                        <input type="text" class="course-textbooks-name-input" id="course-textbooks-1-name-input" placeholder="">
-                      </div>
-
-                      <div class="group optional">
-                        <label for="course-textbooks-1-link-input">Textbook Link</label>
-                        <input type="text" class="course-textbooks-link-input" id="course-textbooks-1-link-input">
-                      </div>
-
-                      <a href="#" class="remove-item remove-textbooks-data"><span class="delete-icon"></span> Delete Textbook</a>
-                    </li>
-                    
-                    <li class="input multi multi-stacked course-textbooks-list-item">
-                      <div class="group">
-                        <label for="course-textbooks-2-name-input">Textbook Name</label>
-                        <input type="text" class="course-textbooks-name-input" id="course-textbooks-2-name-input">
-                      </div>
-
-                      <div class="group optional">
-                        <label for="course-textbooks-2-link-input">Textbook Link</label>
-                        <input type="text" class="course-textbooks-link-input" id="course-textbooks-2-link-input">
-                      </div>
-
-                    </li>
-                  </ul>
-
-                  <a href="#" class="new-item new-course-textbooks-item add-textbooks-data">
-                    <span class="plus-icon"></span>New Textbook
-                  </a>
-                </div>
-              </div>
-
-              <div class="row row-col2">
-                <h4 class="label">Prerequisites:</h4>
-
-                <div class="field enum">
-                  <ul class="input-list course-prerequisites-list">
-                    <li class="input input-existing multi multi-stacked course-prerequisites-list-item">
-                      <div class="group">
-                        <label for="course-prerequisites-1-name-input">Prerequisite</label>
-                        <input type="text" class="course-prerequisites-name-input" id="course-prerequisites-1-name-input">
-                      </div>
-
-                      <div class="group">
-                        <label for="course-prerequisites-1-link-input">Prerequisite Link</label>
-                        <input type="text" class="course-prerequisites-link-input" id="course-prerequisites-1-link-input">
-                      </div>
-
-                      <a href="#" class="remove-item remove-prerequisite-data"><span class="delete-icon"></span> Delete Prerequisite</a>
-                    </li>
-                    
-                    <li class="input multi multi-stacked course-prerequisites-list-item">
-                      <div class="group">
-                        <label for="course-prerequisites-2-name-input">Prerequisite</label>
-                        <input type="text" class="course-prerequisites-name-input" id="course-prerequisites-2-name-input">
-                      </div>
-
-                      <div class="group">
-                        <label for="course-prerequisites-2-link-input">Prerequisite Link</label>
-                        <input type="text" class="course-prerequisites-link-input" id="course-prerequisites-2-link-input">
-                      </div>
-                    </li>
-                  </ul>
-
-                  <a href="#" class="new-item new-course-prerequisite-item add-prerequisite-data">
-                    <span class="plus-icon"></span>New Prerequisite
-                  </a>
-                </div>
-              </div>
-            </section>
-
-            <hr class="divide" />
-
-            <section class="settings-details-more">
-              <header>
-                <h3>More Information</h3>
-                <span class="detail">Other helpful information about the course</span>
-              </header>
-
-              <div class="row row-col2">
-                <h4 class="label">FAQs:</h4>
-
-                <div class="field enum">
-                  <ul class="input-list course-faq-list">
-                    <li class="input multi multi-stacked course-faq-list-item">
-                      <div class="group">
-                        <label for="course-faq-1-question-input">Question</label>
-                        <input type="text" class="long course-faq-question-input" id="course-faq-1-question-input">
-                      </div>
-
-                      <div class="group optional">
-                        <label for="course-faq-1-answer-input">Answer</label>
-                        <textarea class="long tall course-faq-answer-input" id="course-faq-1-answer-input"></textarea>
-                      </div>
-
-                      <a href="#" class="remove-item remove-faq-data"><span class="delete-icon"></span> Delete Question &amp; Answer</a>
-                    </li>
-                    
-                    <li class="input multi multi-stacked course-faq-list-item">
-                      <div class="group">
-                        <label for="course-faq-2-question-input">Question</label>
-                        <input type="text" class="long course-faq-question-input" id="course-faq-2-question-input">
-                      </div>
-
-                      <div class="group optional">
-                        <label for="course-faq-2-answer-input">Answer</label>
-                        <textarea class="long tall course-faq-answer-input" id="course-faq-2-answer-input"></textarea>
-                      </div>
-
-                      <a href="#" class="remove-item remove-faq-data"><span class="delete-icon"></span> Delete Question &amp; Answer</a>
-                    </li>
-                  </ul>
-
-                  <a href="#" class="new-item new-course-faq-item add-faq-data">
-                    <span class="plus-icon"></span>New Question &amp; Answer
-                  </a>
-                </div>
-              </div>
             </section>
           </section><!-- .settings-details -->
 
@@ -478,44 +314,36 @@
                 <div class="field enum">
                   <ul class="input-list course-faculty-list">
                     <li class="input input-existing multi course-faculty-list-item">
-                      <div class="row row-col2">
+                      <div class="row">
                         <label for="course-faculty-firstname-input">Faculty First Name:</label>
                         <div class="field">
                           <input type="text" class="long" id="course-faculty-firstname-input">
                         </div>
                       </div>
 
-                      <div class="row row-col2">
+                      <div class="row">
                         <label for="course-faculty-lastname-input">Faculty Last Name:</label>
                         <div class="field">
                           <input type="text" class="long" id="course-faculty-lastname-input">
                         </div>
                       </div>
 
-                      <div class="row row-col2">
+                      <div class="row">
                         <label for="course-faculty-photo-input">Faculty Photo</label>
                         <div class="field">
-                          <div class="input">
-                            <a href="#" class="new-item new-faculty-photo add-faculty-photo-data" id="course-faculty-photo-input">
-                              <span class="upload-icon"></span>Upload Faculty Photo
-                            </a>
-                            <span class="tip tip-inline">Max size: 30KB</span>          
-                          </div>
-
                           <div class="input input-existing">
-                            <div class=" current current-faculty-photo">
-                              <img src="http://dummyimage.com/800x600/4d494d/686a82.gif&text=faculty+photo" alt="Faculty Photo" />
+                            <div class="current current-faculty-photo">
+                              <img src="http://placehold.it/400x300&text=Faculty+Photo" alt="Faculty Photo" />
+                              <a href="#" class="remove-item remove-faculty-photo remove-video-data"><span class="delete-icon"></span> Delete Faculty Photo</a>
                             </div>
-
-                            <a href="#" class="remove-item remove-faculty-photo remove-video-data"><span class="delete-icon"></span> Delete Faculty Photo</a>
                           </div>
                         </div>
                       </div>
 
-                      <div class="row row-col2">
+                      <div class="row">
                         <label for="course-faculty-bio-input">Faculty Bio:</label>
                         <div class="field">
-                          <textarea class="long tall" id="course-faculty-bio-input"></textarea>
+                          <textarea class="long tall edit-box tinymce" id="course-faculty-bio-input"></textarea>
                           <span class="tip tip-stacked">A brief description of your education, experience, and expertise</span>
                         </div>      
                       </div>
@@ -524,21 +352,21 @@
                     </li>
 
                     <li class="input multi course-faculty-list-item">
-                      <div class="row row-col2">
+                      <div class="row">
                         <label for="course-faculty-firstname-input">Faculty First Name:</label>
                         <div class="field">
                           <input type="text" class="long" id="course-faculty-firstname-input">
                         </div>
                       </div>
 
-                      <div class="row row-col2">
+                      <div class="row">
                         <label for="course-faculty-lastname-input">Faculty Last Name:</label>
                         <div class="field">
                           <input type="text" class="long" id="course-faculty-lastname-input">
                         </div>
                       </div>
 
-                      <div class="row row-col2">
+                      <div class="row">
                         <label for="course-faculty-photo-input">Faculty Photo</label>
                         <div class="field">
                           <div class="input">
@@ -547,25 +375,14 @@
                             </a>
                             <span class="tip tip-inline">Max size: 30KB</span>          
                           </div>
-
-                          <div class="input input-existing">
-                            <div class=" current current-course-faculty-photo">
-
-                            </div>
-
-                            <a href="#" class="replace-item replace-faculty-photo add-faculty-photo-data" id="course-faculty-photo-input">
-                              <span class="upload-icon"></span>Upload Faculty Photo
-                            </a>
-                            <span class="tip tip-inline">Max size: 30KB</span>          
-                          </div>
                         </div>
                       </div>
 
-                      <div class="row row-col2">
+                      <div class="row">
                         <label for="course-faculty-bio-input">Faculty Bio:</label>
                         <div class="field">
                           <div clas="input">
-                            <textarea class="long tall" id="course-faculty-bio-input"></textarea>
+                            <textarea class="long tall edit-box tinymce" id="course-faculty-bio-input"></textarea>
                             <span class="tip tip-stacked">A brief description of your education, experience, and expertise</span>
                           </div>
                         </div>      
@@ -653,20 +470,20 @@
 
                 <div class="field">
                   <div class="input">
-                    <input type="text" id="course-grading-duetime" placeholder="HH:MM">
-                    <span class="tip tip-stacked">Boston, MA Local Time (UTC/GMT -5 hours)</span>
+                    <input type="text" class="short" id="course-grading-duetime" placeholder="HH:MM">
+                    <span class="tip tip-inline">Boston, MA Local Time (UTC/GMT -5 hours)</span>
                     <span class="tip tip-stacked"><a href="http://www.worldtimeserver.com/convert_time_in_UTC.aspx">Convert to your time zone</a></span>
                   </div>
                 </div>
               </div>
 
               <div class="row row-col2">
-                <label for="course-grading-graceperiod">Deadline Grace Period:</label>
+                <label for="course-grading-graceperiod">Grace Period on Deadline:</label>
 
                 <div class="field">
                   <div class="input">
-                    <input type="text" class="short" id="course-grading-graceperiod">
-                    <span class="tip tip-inline">e.g. +5 minutes</span>
+                    <input type="text" class="short" id="course-grading-graceperiod" placeholder="e.g. 10 minutes">
+                    <span class="tip tip-inline">leeway on due dates</span>
                   </div>
                 </div>
               </div>
@@ -805,24 +622,21 @@
               <div class="row row-col2">
                 <h4 class="label">Problem Randomization:</h4>
 
-                <div class="field ui-status">
-                  <div class="input">
-                    <input checked="checked" type="radio" class="ui-status-input ui-status-input-radio" name="problems-general-randomization" id="problems-general-randomization-always" value="Always">
-                    <div class="ui-status-indic ui-status-indic-problems-general-randomization"></div>
+                <div class="field">
+                  <div class="input input-radio">
+                    <input checked="checked" type="radio" name="problems-general-randomization" id="problems-general-randomization-always" value="Always">
                     <label for="problems-general-randomization-always">Always</label>
                     <span class="tip tip-stacked"><strong>randomize all</strong> problems</span>
                   </div>
 
                   <div class="input">
-                    <input type="radio" class="ui-status-input ui-status-input-radio" name="problems-general-randomization" id="problems-general-randomization-never" value="Never">
-                    <div class="ui-status-indic ui-status-indic-problems-general-randomization"></div>
+                    <input type="radio" name="problems-general-randomization" id="problems-general-randomization-never" value="Never">
                     <label for="problems-general-randomization-never">Never</label>
                     <span class="tip tip-stacked"><strong>do not randomize</strong> problems</span>
                   </div>
 
                   <div class="input">
-                    <input type="radio" class="ui-status-input ui-status-input-radio" name="problems-general-randomization" id="problems-general-randomization-perstudent" value="Per Student">
-                    <div class="ui-status-indic ui-status-indic-problems-general-randomization"></div>
+                    <input type="radio" name="problems-general-randomization" id="problems-general-randomization-perstudent" value="Per Student">
                     <label for="problems-general-randomization-perstudent">Per Student</label>
                     <span class="tip tip-stacked">randomize problems <strong>per student</strong></span>
                   </div>
@@ -834,15 +648,13 @@
 
                 <div class="field ui-status">
                   <div class="input">
-                    <input checked="checked" type="radio" class="ui-status-input ui-status-input-radio" name="problems-general-showanswer" id="problems-general-showanswer-always" value="Always">
-                    <div class="ui-status-indic ui-status-indic-problems-general-showanswer"></div>
+                    <input checked="checked" type="radio" name="problems-general-showanswer" id="problems-general-showanswer-always" value="Always">
                     <label for="problems-general-showanswer-always">Always</label>
                     <span class="tip tip-stacked">Answers will be shown after the number of attempts has been met</span>
                   </div>
 
                   <div class="input">
-                    <input type="radio" class="ui-status-input ui-status-input-radio" name="problems-general-showanswer" id="problems-general-showanswer-never" value="Never">
-                    <div class="ui-status-indic ui-status-indic-problems-general-showanswer"></div>
+                    <input type="radio" name="problems-general-showanswer" id="problems-general-showanswer-never" value="Never">
                     <label for="problems-general-showanswer-never">Never</label>
                     <span class="tip tip-stacked">Answers will never be shown, regardless of attempts</span>
                   </div>
@@ -872,22 +684,19 @@
 
                 <div class="field ui-status">
                   <div class="input">
-                    <input checked="checked" type="radio" class="ui-status-input ui-status-input-radio" name="problems-lessonexercises-randomization" id="problems-lessonexercises-randomization-always" value="Always">
-                    <div class="ui-status-indic ui-status-indic-problems-lessonexercises-randomization"></div>
+                    <input checked="checked" type="radio" name="problems-lessonexercises-randomization" id="problems-lessonexercises-randomization-always" value="Always">
                     <label for="problems-lessonexercises-randomization-always">Always</label>
                     <span class="tip tip-stacked"><strong>randomize all</strong> problems</span>
                   </div>
 
                   <div class="input">
-                    <input type="radio" class="ui-status-input ui-status-input-radio" name="problems-lessonexercises-randomization" id="problems-lessonexercises-randomization-never" value="Never">
-                    <div class="ui-status-indic ui-status-indic-problems-lessonexercises-randomization"></div>
+                    <input type="radio" name="problems-lessonexercises-randomization" id="problems-lessonexercises-randomization-never" value="Never">
                     <label for="problems-lessonexercises-randomization-never">Never</label>
                     <span class="tip tip-stacked"><strong>do not randomize</strong> problems</span>
                   </div>
 
                   <div class="input">
-                    <input type="radio" class="ui-status-input ui-status-input-radio" name="problems-lessonexercises-randomization" id="problems-lessonexercises-randomization-perstudent" value="Per Student">
-                    <div class="ui-status-indic ui-status-indic-problems-lessonexercises-randomization"></div>
+                    <input type="radio" name="problems-lessonexercises-randomization" id="problems-lessonexercises-randomization-perstudent" value="Per Student">
                     <label for="problems-lessonexercises-randomization-perstudent">Per Student</label>
                     <span class="tip tip-stacked">randomize problems <strong>per student</strong></span>
                   </div>
@@ -899,15 +708,13 @@
 
                 <div class="field ui-status">
                   <div class="input">
-                    <input checked="checked" type="radio" class="ui-status-input ui-status-input-radio" name="problems-lessonexercises-showanswer" id="problems-lessonexercises-showanswer-always" value="Always">
-                    <div class="ui-status-indic ui-status-indic-problems-lessonexercises-showanswer"></div>
+                    <input checked="checked" type="radio" name="problems-lessonexercises-showanswer" id="problems-lessonexercises-showanswer-always" value="Always">
                     <label for="problems-lessonexercises-showanswer-always">Always</label>
                     <span class="tip tip-stacked">Answers will be shown after the number of attempts has been met</span>
                   </div>
 
                   <div class="input">
-                    <input type="radio" class="ui-status-input ui-status-input-radio" name="problems-lessonexercises-showanswer" id="problems-lessonexercises-showanswer-never" value="Never">
-                    <div class="ui-status-indic ui-status-indic-problems-lessonexercises-showanswer"></div>
+                    <input type="radio" name="problems-lessonexercises-showanswer" id="problems-lessonexercises-showanswer-never" value="Never">
                     <label for="problems-lessonexercises-showanswer-never">Never</label>
                     <span class="tip tip-stacked">Answers will never be shown, regardless of attempts</span>
                   </div>
@@ -937,22 +744,19 @@
 
                 <div class="field ui-status">
                   <div class="input">
-                    <input checked="checked" type="radio" class="ui-status-input ui-status-input-radio" name="problems-labs-randomization" id="problems-labs-randomization-always" value="Always">
-                    <div class="ui-status-indic ui-status-indic-problems-labs-randomization"></div>
+                    <input checked="checked" type="radio" name="problems-labs-randomization" id="problems-labs-randomization-always" value="Always">
                     <label for="problems-labs-randomization-always">Always</label>
                     <span class="tip tip-stacked"><strong>randomize all</strong> problems</span>
                   </div>
 
                   <div class="input">
-                    <input type="radio" class="ui-status-input ui-status-input-radio" name="problems-labs-randomization" id="problems-labs-randomization-never" value="Never">
-                    <div class="ui-status-indic ui-status-indic-problems-labs-randomization"></div>
+                    <input type="radio" name="problems-labs-randomization" id="problems-labs-randomization-never" value="Never">
                     <label for="problems-labs-randomization-never">Never</label>
                     <span class="tip tip-stacked"><strong>do not randomize</strong> problems</span>
                   </div>
 
                   <div class="input">
-                    <input type="radio" class="ui-status-input ui-status-input-radio" name="problems-labs-randomization" id="problems-labs-randomization-perstudent" value="Per Student">
-                    <div class="ui-status-indic ui-status-indic-problems-labs-randomization"></div>
+                    <input type="radio" name="problems-labs-randomization" id="problems-labs-randomization-perstudent" value="Per Student">
                     <label for="problems-labs-randomization-perstudent">Per Student</label>
                     <span class="tip tip-stacked">randomize problems <strong>per student</strong></span>
                   </div>
@@ -964,15 +768,13 @@
 
                 <div class="field ui-status">
                   <div class="input">
-                    <input checked="checked" type="radio" class="ui-status-input ui-status-input-radio" name="problems-labs-showanswer" id="problems-labs-showanswer-always" value="Always">
-                    <div class="ui-status-indic ui-status-indic-problems-labs-showanswer"></div>
+                    <input checked="checked" type="radio" name="problems-labs-showanswer" id="problems-labs-showanswer-always" value="Always">
                     <label for="problems-labs-showanswer-always">Always</label>
                     <span class="tip tip-stacked">Answers will be shown after the number of attempts has been met</span>
                   </div>
 
                   <div class="input">
-                    <input type="radio" class="ui-status-input ui-status-input-radio" name="problems-labs-showanswer" id="problems-labs-showanswer-never" value="Never">
-                    <div class="ui-status-indic ui-status-indic-problems-labs-showanswer"></div>
+                    <input type="radio" name="problems-labs-showanswer" id="problems-labs-showanswer-never" value="Never">
                     <label for="problems-labs-showanswer-never">Never</label>
                     <span class="tip tip-stacked">Answers will never be shown, regardless of attempts</span>
                   </div>
@@ -1002,22 +804,19 @@
 
                 <div class="field ui-status">
                   <div class="input">
-                    <input checked="checked" type="radio" class="ui-status-input ui-status-input-radio" name="problems-exams-randomization" id="problems-exams-randomization-always" value="Aways">
-                    <div class="ui-status-indic ui-status-indic-problems-exams-randomization"></div>
+                    <input checked="checked" type="radio" name="problems-exams-randomization" id="problems-exams-randomization-always" value="Aways">
                     <label for="problems-exams-randomization-always">Always</label>
                     <span class="tip tip-stacked"><strong>randomize all</strong> problems</span>
                   </div>
 
                   <div class="input">
-                    <input type="radio" class="ui-status-input ui-status-input-radio" name="problems-exams-randomization" id="problems-exams-randomization-never" value="Never">
-                    <div class="ui-status-indic ui-status-indic-problems-exams-randomization"></div>
+                    <input type="radio" name="problems-exams-randomization" id="problems-exams-randomization-never" value="Never">
                     <label for="problems-exams-randomization-never">Never</label>
                     <span class="tip tip-stacked"><strong>do not randomize</strong> problems</span>
                   </div>
 
                   <div class="input">
-                    <input type="radio" class="ui-status-input ui-status-input-radio" name="problems-exams-randomization" id="problems-exams-randomization-perstudent" value="Per Student">
-                    <div class="ui-status-indic ui-status-indic-problems-exams-randomization"></div>
+                    <input type="radio" name="problems-exams-randomization" id="problems-exams-randomization-perstudent" value="Per Student">
                     <label for="problems-exams-randomization-perstudent">Per Student</label>
                     <span class="tip tip-stacked">randomize problems <strong>per student</strong></span>
                   </div>
@@ -1029,15 +828,13 @@
 
                 <div class="field ui-status">
                   <div class="input">
-                    <input checked="checked" type="radio" class="ui-status-input ui-status-input-radio" name="problems-exams-showanswer" id="problems-exams-showanswer-always" value="Always">
-                    <div class="ui-status-indic ui-status-indic-problems-exams-showanswer"></div>
+                    <input checked="checked" type="radio" name="problems-exams-showanswer" id="problems-exams-showanswer-always" value="Always">
                     <label for="problems-exams-showanswer-always">Always</label>
                     <span class="tip tip-stacked">Answers will be shown after the number of attempts has been met</span>
                   </div>
 
                   <div class="input">
-                    <input type="radio" class="ui-status-input ui-status-input-radio" name="problems-exams-showanswer" id="problems-exams-showanswer-never" value="Never">
-                    <div class="ui-status-indic ui-status-indic-problems-exams-showanswer"></div>
+                    <input type="radio" name="problems-exams-showanswer" id="problems-exams-showanswer-never" value="Never">
                     <label for="problems-exams-showanswer-never">Never</label>
                     <span class="tip tip-stacked">Answers will never be shown, regardless of attempts</span>
                   </div>
@@ -1071,20 +868,17 @@
 
                 <div class="field ui-status">
                   <div class="input">
-                    <input type="radio" class="ui-status-input ui-status-input-radio" name="discussions-anonymous" id="discussions-anonymous-allow" value="Allow">
-                    <div class="ui-status-indic ui-status-indic-discussions-anonymous-allow"></div>
+                    <input type="radio" name="discussions-anonymous" id="discussions-anonymous-allow" value="Allow">
                     <label for="discussions-anonymous-allow">Allow</label>
                     <span class="tip tip-stacked">Students and faculty <strong>will be able to post anonymously</strong></span>
                   </div>
 
                   <div class="input">
-                    <input checked="checked" type="radio" class="ui-status-input ui-status-input-radio" name="discussions-anonymous" id="discussions-anonymous-dontallow" value="Do Not Allow">
-                    <div class="ui-status-indic ui-status-indic-discussions-anonymous-dontallow"></div>
+                    <input checked="checked" type="radio" name="discussions-anonymous" id="discussions-anonymous-dontallow" value="Do Not Allow">
                     <label for="discussions-anonymous-dontallow">Do not allow</label>
                     <span class="tip tip-stacked"><strong>Posting anonymously is not allowed</strong>. Any previous anonymous posts <strong>will be reverted to non-anonymous</strong></span>
                   </div>
                 </div>
-              </div>
             </section><!-- .settings-discussions-general -->
 
             <section class="settings-discussions-categories">
@@ -1118,6 +912,8 @@
                       <div class="group">
                         <label for="course-discussions-categories-4-name-input">Category Name: </label>
                         <input type="text" class="course-discussions-categories-name-input" id="course-discussions-categories-4-name-input" placeholder="" value="Study Groups">
+
+                        <a href="#" class="remove-item remove-course-discussions-categories-data"><span class="delete-icon"></span> Delete Category</a>
                       </div>
                     </li>
 
@@ -1127,7 +923,7 @@
                         <input type="text" class="course-discussions-categories-name-input" id="course-discussions-categories-5-name-input" placeholder="" value="Lectures">
                       </div>
 
-                      <a href="#" class="remove-item remove-course-discussions-categories-data"><span class="delete-icon"></span> Delete Discussion Category</a>
+                      <a href="#" class="remove-item remove-course-discussions-categories-data"><span class="delete-icon"></span> Delete Category</a>
                     </li>
 
                     <li class="input course-discussions-categories-list-item">
@@ -1136,7 +932,7 @@
                         <input type="text" class="course-discussions-categories-name-input" id="course-discussions-categories-6-name-input" placeholder="">
                       </div>
 
-                      <a href="#" class="remove-item remove-course-discussions-categories-data"><span class="delete-icon"></span> Delete Discussion Category</a>
+                      <a href="#" class="remove-item remove-course-discussions-categories-data"><span class="delete-icon"></span> Delete Category</a>
                     </li>
                   </ul>
 
@@ -1145,18 +941,6 @@
                   </a>
                 </div>
               </div>
-
-              <div class="row row-col2">
-                <h4 class="label">Create Discussion Categories per Unit</h4>
-
-                <div class="field ui-status">
-                  <div class="input">
-                    <input type="radio" class="ui-status-input ui-status-input-radio" name="discussions-categories-perunit" id="discussions-categories-perunit-allow" value="Allow" disabled="disabled">
-                    <div class="ui-status-indic ui-status-indic-discussions-categories-perunit-allow"></div>
-                    <label for="discussions-categories-perunit-allow">Allow</label>
-                    <span class="tip tip-stacked">This option is automatically set currently</span>
-                  </div>
-                </div>
               </div>
             </section>
           </section><!-- .settings-discussions -->
diff --git a/cms/urls.py b/cms/urls.py
index 5f14400f06..7fc2a152a3 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -43,6 +43,7 @@ urlpatterns = ('',
     url(r'^edit_static/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.edit_static', name='edit_static'),
     url(r'^edit_tabs/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.edit_tabs', name='edit_tabs'),
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/assets/(?P<name>[^/]+)$', 'contentstore.views.asset_index', name='asset_index'),
+    url(r'^settings/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.settings', name='settings'),
 
     # temporary landing page for a course
     url(r'^edge/(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)$', 'contentstore.views.landing', name='landing'),