diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss
index 87b82f8a3b..76c6abdad4 100644
--- a/cms/static/sass/_unit.scss
+++ b/cms/static/sass/_unit.scss
@@ -142,13 +142,6 @@
           @include box-shadow(0 1px 1px rgba(0, 0, 0, .2), 0 1px 0 rgba(255, 255, 255, .4) inset);
           @include clearfix;
 
-          .tab-group {
-            border-bottom-right-radius: 3px;
-            border-bottom-left-radius: 3px;
-            color: #3c3c3c;
-            text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3);
-          }
-
           .cancel-button {
             margin: 20px 0px 10px 10px;
             @include white-button;
@@ -216,8 +209,6 @@
             opacity:.8;
 
             &:hover {
-              @include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0));
-              @include transition(background-color .15s);
               opacity:1;
             }
 
@@ -291,7 +282,6 @@
                 width: 17;
                 height: 21px;
                 vertical-align: middle;
-                background: url(../img/problem-selector-icons.png) no-repeat;
               }
             }
 
diff --git a/cms/templates/base.html b/cms/templates/base.html
index 79958612aa..709ef80eb2 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -31,7 +31,7 @@
     <script type="text/javascript" src="${static.url('js/vendor/markitup/sets/wiki/set.js')}"></script>
     <script src="${static.url('js/vendor/symbolset.ss-standard.js')}"></script>
     <script src="${static.url('js/vendor/symbolset.ss-symbolicons.js')}"></script>
-    <script src="${static.url('js/vendor/jquery.tabs.js')}"></script>
+    <script src="${static.url('js/vendor/jquery.ui.tabs.js')}"></script>
 
     <%static:js group='main'/>
     <%static:js group='module-js'/>
diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index 999b045cf9..eaf9294e38 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -65,15 +65,15 @@
                 % for type, templates in sorted(component_templates.items()):
                 <div class="new-component-templates new-component-${type}">
                     <div class="tab-group">
-                      <ul class="problem-type-tabs nav-tabs">
-                        <li class="current">
-                          <a class="link-tab" href="#tab1">Common Problem Types</a>
-                        </li>
-                        <li>
-                          <a class="link-tab" href="#tab2">Advanced</a>
-                        </li>
-                      </ul>
                       <div class="tabs">
+                        <ul class="problem-type-tabs nav-tabs">
+                          <li class="current">
+                            <a class="link-tab" href="#tab1">Common Problem Types</a>
+                          </li>
+                          <li>
+                            <a class="link-tab" href="#tab2">Advanced</a>
+                          </li>
+                        </ul>
                         <div class="tab current" id="tab1">
                           <ul class="new-component-template">
                               % for name, location, has_markdown, is_empty in templates:
@@ -85,6 +85,12 @@
                                     </a>
                                   </li>
 
+                                % elif has_markdown:
+                                  <li class="editor-md">
+                                    <a href="#" data-location="${location}">
+                                      <span class="name"> ${name}</span>
+                                    </a>
+                                  </li>
                                 % else:
                                   <li class="editor-manual">
                                     <a href="#" data-location="${location}">
@@ -105,24 +111,16 @@
                                  % if is_empty:
                                   <li class="editor-md empty">
                                     <a href="#" data-location="${location}">
-                                      <span class="name"><i class="ss-icon ss-symbolicons-block">&#xE714;</i> ${name}</span>
-                                      <span class="editor-indicator">Simple <span class="sr">Editor</span></span>
+                                      <span class="name">${name}</span>
                                     </a>
                                   </li>
 
                                 % elif has_markdown:
-                                  <li class="editor-md">
-                                    <a href="#" data-location="${location}">
-                                      <span class="name"><i class="ss-icon ss-symbolicons-block">&#xE714;</i> ${name}</span>
-                                      <span class="editor-indicator">Simple <span class="sr">Editor</span></span>
-                                    </a>
-                                  </li>
 
                                 % else:
                                   <li class="editor-manual">
                                     <a href="#" data-location="${location}">
-                                      <span class="name"><i class="ss-icon ss-symbolicons-block">&#x1F527;</i> ${name}</span>
-                                      <span class="editor-indicator">Advanced <span class="sr">Editor</span></span>
+                                      <span class="name"> ${name}</span>
                                     </a>
 
                                   </li>