diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index 87a2943773..1ae0757393 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -273,7 +273,7 @@ def edit_unit(request, location):
                 template.display_name,
                 template.location.url(),
                 'markdown' in template.metadata,
-                template.location.name == 'Empty'
+                'empty' in template.metadata
             ))
 
     components = [
diff --git a/cms/templates/base.html b/cms/templates/base.html
index 709ef80eb2..84f10fc2d1 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -31,7 +31,6 @@
     <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.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 eaf9294e38..3777c33591 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -64,8 +64,7 @@
               </div>
                 % for type, templates in sorted(component_templates.items()):
                 <div class="new-component-templates new-component-${type}">
-                    <div class="tab-group">
-                      <div class="tabs">
+                      <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>
@@ -77,59 +76,51 @@
                         <div class="tab current" id="tab1">
                           <ul class="new-component-template">
                               % for name, location, has_markdown, is_empty in templates:
-
-                                 % if is_empty:
-                                  <li class="editor-md empty">
-                                    <a href="#" data-location="${location}">
-                                      <span class="name"> ${name}</span>
-                                    </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}">
-                                      <span class="name">${name}</span>
-
-                                    </a>
+                                % if has_markdown or type != "problem":
+                                    % if is_empty:
+                                      <li class="editor-md empty">
+                                        <a href="#" data-location="${location}">
+                                          <span class="name"> ${name}</span>
+                                        </a>
+                                      </li>
                                     
-                                  </li>
+                                    % else:
+                                      <li class="editor-md">
+                                        <a href="#" data-location="${location}">
+                                          <span class="name"> ${name}</span>
+                                        </a>
+                                      </li>
+                                    % endif
                                 % endif
 
                               %endfor
                           </ul>
                         </div>
                         <div class="tab" id="tab2">
-                          <ul class="new-component-template" id="tab2">
-                              % for name, location, has_markdown, is_empty in templates:
-
-                                 % if is_empty:
-                                  <li class="editor-md empty">
-                                    <a href="#" data-location="${location}">
-                                      <span class="name">${name}</span>
-                                    </a>
-                                  </li>
-
-                                % elif has_markdown:
-
-                                % else:
-                                  <li class="editor-manual">
-                                    <a href="#" data-location="${location}">
-                                      <span class="name"> ${name}</span>
-                                    </a>
-
-                                  </li>
-                                % endif
-
-                              %endfor
+                          <ul class="new-component-template">
+                              % if type == "problem":
+                                  % for name, location, has_markdown, is_empty in templates:
+                                    % if not has_markdown:  
+                                        % if is_empty:
+                                          <li class="editor-manual empty">
+                                            <a href="#" data-location="${location}">
+                                              <span class="name">${name}</span>
+                                            </a>
+                                          </li>
+                                        
+                                        % else:
+                                          <li class="editor-manual">
+                                            <a href="#" data-location="${location}">
+                                              <span class="name"> ${name}</span>
+                                            </a>
+                                        
+                                          </li>
+                                        % endif
+                                    % endif
+                                  % endfor
+                              % endif
                           </ul>
                         </div>
-                      </div>
                     </div>
                     <a href="#" class="cancel-button">Cancel</a>
                 </div>
diff --git a/common/lib/xmodule/xmodule/templates/html/empty.yaml b/common/lib/xmodule/xmodule/templates/html/empty.yaml
index 1262ed37cf..b6d867d7d6 100644
--- a/common/lib/xmodule/xmodule/templates/html/empty.yaml
+++ b/common/lib/xmodule/xmodule/templates/html/empty.yaml
@@ -1,6 +1,7 @@
 ---
 metadata:
-      display_name: Empty
+    display_name: Blank HTML Page
+    empty: True
 
 data: |
 
diff --git a/common/lib/xmodule/xmodule/templates/problem/empty.yaml b/common/lib/xmodule/xmodule/templates/problem/empty.yaml
index 346f49609c..39c9e7671c 100644
--- a/common/lib/xmodule/xmodule/templates/problem/empty.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/empty.yaml
@@ -1,10 +1,11 @@
 ---
 metadata:
-    display_name: Empty
+    display_name: Blank Common Problem
     rerandomize: never
     showanswer: always
     markdown: ""
     weight: ""
+    empty: True
     attempts: ""
 data: |
   <problem>
diff --git a/common/lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml b/common/lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml
new file mode 100644
index 0000000000..bba7b3a8ac
--- /dev/null
+++ b/common/lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml
@@ -0,0 +1,13 @@
+---
+metadata:
+    display_name: Blank Advanced Problem
+    rerandomize: never
+    showanswer: always
+    weight: ""
+    attempts: ""
+    empty: True
+data: |
+  <problem>
+  </problem>
+
+children: []