diff --git a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
index da1eb3b8ea..21240593e9 100644
--- a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
+++ b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
@@ -32,7 +32,7 @@ def click_component_from_menu(instance_id, expected_css):
     if len(elements) == 1:  # Multiple templates
         world.css_click(elem_css)
     else:  # Single template
-        assert(len(filter(lambda ele: ele.has_class('single_template'), elements)) == 1)
+        assert(len(filter(lambda ele: ele.has_class('single-template'), elements)) == 1)
     assert_equal(1, len(world.css_find(expected_css)))
 
 
diff --git a/cms/static/coffee/src/views/unit.coffee b/cms/static/coffee/src/views/unit.coffee
index 11d219a546..058bcf0ce1 100644
--- a/cms/static/coffee/src/views/unit.coffee
+++ b/cms/static/coffee/src/views/unit.coffee
@@ -1,7 +1,7 @@
 class CMS.Views.UnitEdit extends Backbone.View
   events:
-    'click .new-component .new-component-type a.multiple_templates': 'showComponentTemplates'
-    'click .new-component .new-component-type a.single_template': 'saveNewComponent'
+    'click .new-component .new-component-type a.multiple-templates': 'showComponentTemplates'
+    'click .new-component .new-component-type a.single-template': 'saveNewComponent'
     'click .new-component .cancel-button': 'closeNewComponent'
     'click .new-component-templates .new-component-template a': 'saveNewComponent'
     'click .new-component-templates .cancel-button': 'closeNewComponent'
diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index bb2a8f5193..aba9889b14 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -54,12 +54,12 @@
                 <h5>Add New Component</h5>
                 <ul class="new-component-type">
                   % for type, templates in sorted(component_templates.items()):
-		  <li>
-		    % if type == 'advanced' or len(templates) > 1:
-		    <a href="#" class="multiple_templates" data-type="${type}">
-		    % else:
-                    <a href="#" class="single_template" data-type="${type}" data-location="${templates[0][1]}">
-		    % endif
+                  <li>
+                  % if type == 'advanced' or len(templates) > 1:
+                    <a href="#" class="multiple-templates" data-type="${type}">
+                  % else:
+                    <a href="#" class="single-template" data-type="${type}" data-location="${templates[0][1]}">
+                  % endif
                       <span class="large-template-icon large-${type}-icon"></span>
                       <span class="name">${type}</span>
                     </a>
@@ -68,50 +68,52 @@
                 </ul>
               </div>
                 % for type, templates in sorted(component_templates.items()):
+	          % if len(templates) > 1 or type == 'advanced':
                 <div class="new-component-templates new-component-${type}">
                     % if type == "problem":
-                    <div class="tab-group 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>
-                    % endif
-                        <div class="tab current" id="tab1">
-                          <ul class="new-component-template">
-                              % for name, location, has_markdown in templates:
-                                % if has_markdown or type != "problem":
-                                  <li class="editor-md">
-                                    <a href="#" id="${location}" data-location="${location}">
-                                      <span class="name"> ${name}</span>
-                                    </a>
-                                  </li>
-                                % endif
-
-                              %endfor
-                          </ul>
-                        </div>
-                    % if type == "problem":
-                            <div class="tab" id="tab2">
-                              <ul class="new-component-template">
-                                  % for name, location, has_markdown in templates:
-                                    % if not has_markdown:
-                                      <li class="editor-manual">
-                                        <a href="#" id="${location}" data-location="${location}">
-                                          <span class="name"> ${name}</span>
-                                        </a>
-                                      </li>
-                                    % endif
-                                  % endfor
+                      <div class="tab-group 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>
-                    </div>
-                    % endif
-                    <a href="#" class="cancel-button">Cancel</a>
-                </div>
+                      % endif
+                          <div class="tab current" id="tab1">
+                            <ul class="new-component-template">
+                                % for name, location, has_markdown in templates:
+                                  % if has_markdown or type != "problem":
+                                    <li class="editor-md">
+                                      <a href="#" id="${location}" data-location="${location}">
+                                        <span class="name"> ${name}</span>
+                                      </a>
+                                    </li>
+                                  % endif
+  
+                                %endfor
+                            </ul>
+                          </div>
+                      % if type == "problem":
+                              <div class="tab" id="tab2">
+                                <ul class="new-component-template">
+                                    % for name, location, has_markdown in templates:
+                                      % if not has_markdown:
+                                        <li class="editor-manual">
+                                          <a href="#" id="${location}" data-location="${location}">
+                                            <span class="name"> ${name}</span>
+                                          </a>
+                                        </li>
+                                      % endif
+                                    % endfor
+                                </ul>
+                              </div>
+                      </div>
+                      % endif
+                      <a href="#" class="cancel-button">Cancel</a>
+                  </div>
+		  % endif
                 % endfor
             </li>
           </ol>