diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss
index 2d381b5454..d2c8ac514b 100644
--- a/cms/static/sass/_settings.scss
+++ b/cms/static/sass/_settings.scss
@@ -211,10 +211,11 @@
       }
 
       .ui-status-indic {
+        background: transparent url('../images/correct-icon.png') 0 0 no-repeat;
         z-index: 10;
         display: inline-block;
-        height: 30px;
-        width: 20px;
+        height: 20px;
+        width: 30px;
         opacity: 0.50;
         @include transition(opacity 0.25s ease-in-out);
       }
@@ -464,6 +465,7 @@
 
         .remove-doc-data {
           display: inline-block;
+          margin-top: 0;
           width: 150px;
         }
       }
diff --git a/cms/templates/settings.html b/cms/templates/settings.html
index ab603923ee..5dae8a5d09 100644
--- a/cms/templates/settings.html
+++ b/cms/templates/settings.html
@@ -135,7 +135,7 @@
                 <div class="field">
                   <div class="input">
                     <input type="text" class="long" id="course-name-input" value="[Course Name]" disabled="disabled">
-                    <span class="tip tip-stacked">This is used in your course URL, and cannot be changed</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>
@@ -145,7 +145,7 @@
                 <div class="field">
                   <div class="input">
                     <input type="text" class="long" id="course-organization-input" value="[Course Organization]" disabled="disabled">
-                    <span class="tip tip-stacked">This is used in your course URL, and cannot be changed</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>
@@ -156,7 +156,7 @@
                   <div class="input">
                     <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 your course URL, and cannot be changed</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>
@@ -210,44 +210,6 @@
                 </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">
@@ -281,22 +243,12 @@
                 <label for="course-overview">Course Overview:</label>
                 <div class="field">
                   <div class="input">
-                    <textarea class="long" id="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">
@@ -326,16 +278,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">
@@ -345,132 +287,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 -->
 
@@ -795,24 +611,21 @@
               <div class="row row-col2">
                 <h4 class="label">Problem Randomization:</h4>
 
-                <div class="field ui-status">
-                  <div class="input ui-status-input-radio">
-                    <input checked="checked" type="radio" class="ui-status-input" 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 ui-status-input-radio">
-                    <input type="radio" class="ui-status-input" name="problems-general-randomization" id="problems-general-randomization-never" value="Never">
-                    <div class="ui-status-indic ui-status-indic-problems-general-randomization"></div>
+                  <div class="input">
+                    <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 ui-status-input-radio">
-                    <input type="radio" class="ui-status-input" name="problems-general-randomization" id="problems-general-randomization-perstudent" value="Per Student">
-                    <div class="ui-status-indic ui-status-indic-problems-general-randomization"></div>
+                  <div class="input">
+                    <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>
@@ -823,16 +636,14 @@
                 <h4 class="label">Show Answers:</h4>
 
                 <div class="field ui-status">
-                  <div class="input ui-status-input-radio">
-                    <input checked="checked" type="radio" class="ui-status-input" name="problems-general-showanswer" id="problems-general-showanswer-always" value="Always">
-                    <div class="ui-status-indic ui-status-indic-problems-general-showanswer"></div>
+                  <div class="input">
+                    <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 ui-status-input-radio">
-                    <input type="radio" class="ui-status-input" name="problems-general-showanswer" id="problems-general-showanswer-never" value="Never">
-                    <div class="ui-status-indic ui-status-indic-problems-general-showanswer"></div>
+                  <div class="input">
+                    <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>
@@ -861,23 +672,20 @@
                 <h4 class="label">Problem Randomization:</h4>
 
                 <div class="field ui-status">
-                  <div class="input ui-status-input-radio">
-                    <input checked="checked" type="radio" class="ui-status-input" name="problems-lessonexercises-randomization" id="problems-lessonexercises-randomization-always" value="Always">
-                    <div class="ui-status-indic ui-status-indic-problems-lessonexercises-randomization"></div>
+                  <div class="input">
+                    <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 ui-status-input-radio">
-                    <input type="radio" class="ui-status-input" name="problems-lessonexercises-randomization" id="problems-lessonexercises-randomization-never" value="Never">
-                    <div class="ui-status-indic ui-status-indic-problems-lessonexercises-randomization"></div>
+                  <div class="input">
+                    <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 ui-status-input-radio">
-                    <input type="radio" class="ui-status-input" name="problems-lessonexercises-randomization" id="problems-lessonexercises-randomization-perstudent" value="Per Student">
-                    <div class="ui-status-indic ui-status-indic-problems-lessonexercises-randomization"></div>
+                  <div class="input">
+                    <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>
@@ -888,16 +696,14 @@
                 <h4 class="label">Show Answers:</h4>
 
                 <div class="field ui-status">
-                  <div class="input ui-status-input-radio">
-                    <input checked="checked" type="radio" class="ui-status-input" name="problems-lessonexercises-showanswer" id="problems-lessonexercises-showanswer-always" value="Always">
-                    <div class="ui-status-indic ui-status-indic-problems-lessonexercises-showanswer"></div>
+                  <div class="input">
+                    <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 ui-status-input-radio">
-                    <input type="radio" class="ui-status-input" name="problems-lessonexercises-showanswer" id="problems-lessonexercises-showanswer-never" value="Never">
-                    <div class="ui-status-indic ui-status-indic-problems-lessonexercises-showanswer"></div>
+                  <div class="input">
+                    <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>
@@ -926,23 +732,20 @@
                 <h4 class="label">Problem Randomization:</h4>
 
                 <div class="field ui-status">
-                  <div class="input ui-status-input-radio">
-                    <input checked="checked" type="radio" class="ui-status-input" name="problems-labs-randomization" id="problems-labs-randomization-always" value="Always">
-                    <div class="ui-status-indic ui-status-indic-problems-labs-randomization"></div>
+                  <div class="input">
+                    <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 ui-status-input-radio">
-                    <input type="radio" class="ui-status-input" name="problems-labs-randomization" id="problems-labs-randomization-never" value="Never">
-                    <div class="ui-status-indic ui-status-indic-problems-labs-randomization"></div>
+                  <div class="input">
+                    <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 ui-status-input-radio">
-                    <input type="radio" class="ui-status-input" name="problems-labs-randomization" id="problems-labs-randomization-perstudent" value="Per Student">
-                    <div class="ui-status-indic ui-status-indic-problems-labs-randomization"></div>
+                  <div class="input">
+                    <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>
@@ -953,16 +756,14 @@
                 <h4 class="label">Show Answers:</h4>
 
                 <div class="field ui-status">
-                  <div class="input ui-status-input-radio">
-                    <input checked="checked" type="radio" class="ui-status-input" name="problems-labs-showanswer" id="problems-labs-showanswer-always" value="Always">
-                    <div class="ui-status-indic ui-status-indic-problems-labs-showanswer"></div>
+                  <div class="input">
+                    <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 ui-status-input-radio">
-                    <input type="radio" class="ui-status-input" name="problems-labs-showanswer" id="problems-labs-showanswer-never" value="Never">
-                    <div class="ui-status-indic ui-status-indic-problems-labs-showanswer"></div>
+                  <div class="input">
+                    <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>
@@ -991,23 +792,20 @@
                 <h4 class="label">Problem Randomization:</h4>
 
                 <div class="field ui-status">
-                  <div class="input ui-status-input-radio">
-                    <input checked="checked" type="radio" class="ui-status-input" name="problems-exams-randomization" id="problems-exams-randomization-always" value="Aways">
-                    <div class="ui-status-indic ui-status-indic-problems-exams-randomization"></div>
+                  <div class="input">
+                    <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 ui-status-input-radio">
-                    <input type="radio" class="ui-status-input" name="problems-exams-randomization" id="problems-exams-randomization-never" value="Never">
-                    <div class="ui-status-indic ui-status-indic-problems-exams-randomization"></div>
+                  <div class="input">
+                    <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 ui-status-input-radio">
-                    <input type="radio" class="ui-status-input" name="problems-exams-randomization" id="problems-exams-randomization-perstudent" value="Per Student">
-                    <div class="ui-status-indic ui-status-indic-problems-exams-randomization"></div>
+                  <div class="input">
+                    <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>
@@ -1018,16 +816,14 @@
                 <h4 class="label">Show Answers:</h4>
 
                 <div class="field ui-status">
-                  <div class="input ui-status-input-radio">
-                    <input checked="checked" type="radio" class="ui-status-input" name="problems-exams-showanswer" id="problems-exams-showanswer-always" value="Always">
-                    <div class="ui-status-indic ui-status-indic-problems-exams-showanswer"></div>
+                  <div class="input">
+                    <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 ui-status-input-radio">
-                    <input type="radio" class="ui-status-input" name="problems-exams-showanswer" id="problems-exams-showanswer-never" value="Never">
-                    <div class="ui-status-indic ui-status-indic-problems-exams-showanswer"></div>
+                  <div class="input">
+                    <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>
@@ -1060,16 +856,14 @@
                 <h4 class="label">Anonymous Discussions:</h4>
 
                 <div class="field ui-status">
-                  <div class="input ui-status-input-radio">
-                    <input type="radio" class="ui-status-input" name="discussions-anonymous" id="discussions-anonymous-allow" value="Allow">
-                    <div class="ui-status-indic ui-status-indic-discussions-anonymous-allow"></div>
+                  <div class="input">
+                    <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 ui-status-input-radio">
-                    <input checked="checked" type="radio" class="ui-status-input" name="discussions-anonymous" id="discussions-anonymous-dontallow" value="Do Not Allow">
-                    <div class="ui-status-indic ui-status-indic-discussions-anonymous-dontallow"></div>
+                  <div class="input">
+                    <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>