diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index 3777c33591..84785a362d 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -64,15 +64,17 @@
               </div>
                 % for type, templates in sorted(component_templates.items()):
                 <div class="new-component-templates new-component-${type}">
-                      <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>
+                    % 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, is_empty in templates:
@@ -92,13 +94,13 @@
                                       </li>
                                     % endif
                                 % endif
-
+                    
                               %endfor
                           </ul>
                         </div>
-                        <div class="tab" id="tab2">
-                          <ul class="new-component-template">
-                              % if type == "problem":
+                    % if type == "problem":
+                            <div class="tab" id="tab2">
+                              <ul class="new-component-template">
                                   % for name, location, has_markdown, is_empty in templates:
                                     % if not has_markdown:  
                                         % if is_empty:
@@ -118,10 +120,10 @@
                                         % endif
                                     % endif
                                   % endfor
-                              % endif
-                          </ul>
-                        </div>
+                              </ul>
+                            </div>
                     </div>
+                    % endif
                     <a href="#" class="cancel-button">Cancel</a>
                 </div>
                 % endfor