diff --git a/cms/djangoapps/contentstore/features/problem-editor.py b/cms/djangoapps/contentstore/features/problem-editor.py
index 4dc86709ba..ef3f73197d 100644
--- a/cms/djangoapps/contentstore/features/problem-editor.py
+++ b/cms/djangoapps/contentstore/features/problem-editor.py
@@ -4,8 +4,6 @@
 from lettuce import world, step
 from nose.tools import assert_true, assert_equal, assert_in
 from terrain.steps import reload_the_page
-from selenium.common.exceptions import StaleElementReferenceException
-import time
 
 
 ############### ACTIONS ####################
@@ -15,5 +13,5 @@ def i_created_blank_common_problem(step):
     step.given('I have added a new subsection')
     step.given('I expand the first section')
     world.css_click('a.new-unit-item')
-    time.sleep(float(2))
-#    world.css_click('a.problem')
+    world.css_click('.large-problem-icon')
+    world.css_click('#i4x://edx/templates/problem/Blank_Common_Problem')
diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py
index 34a659ab29..3d348dc086 100644
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -149,8 +149,7 @@ def edit_unit(request, location):
             component_templates[category].append((
                 template.display_name_with_default,
                 template.location.url(),
-                hasattr(template, 'markdown') and template.markdown is not None,
-                template.cms.empty,
+                hasattr(template, 'markdown') and template.markdown is not None
             ))
 
     components = [
diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index cb34f42a09..36d643325d 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -78,22 +78,13 @@
                     % endif
                         <div class="tab current" id="tab1">
                           <ul class="new-component-template">
-                              % for name, location, has_markdown, is_empty in templates:
+                              % for name, location, has_markdown in templates:
                                 % 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>
-
-                                    % else:
-                                      <li class="editor-md">
-                                        <a href="#" data-location="${location}">
-                                          <span class="name"> ${name}</span>
-                                        </a>
-                                      </li>
-                                    % endif
+                                  <li class="editor-md">
+                                    <a href="#" id="${location}" data-location="${location}">
+                                      <span class="name"> ${name}</span>
+                                    </a>
+                                  </li>
                                 % endif
 
                               %endfor
@@ -102,23 +93,14 @@
                     % if type == "problem":
                             <div class="tab" id="tab2">
                               <ul class="new-component-template">
-                                  % for name, location, has_markdown, is_empty in templates:
+                                  % for name, location, has_markdown 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>
+                                      <li class="editor-manual">
+                                        <a href="#" id="${location}" data-location="${location}">
+                                          <span class="name"> ${name}</span>
+                                        </a>
 
-                                        % else:
-                                          <li class="editor-manual">
-                                            <a href="#" data-location="${location}">
-                                              <span class="name"> ${name}</span>
-                                            </a>
-
-                                          </li>
-                                        % endif
+                                      </li>
                                     % endif
                                   % endfor
                               </ul>
diff --git a/cms/xmodule_namespace.py b/cms/xmodule_namespace.py
index 1b509a14f4..4857fe68ca 100644
--- a/cms/xmodule_namespace.py
+++ b/cms/xmodule_namespace.py
@@ -28,4 +28,4 @@ class CmsNamespace(Namespace):
     """
     published_date = DateTuple(help="Date when the module was published", scope=Scope.settings)
     published_by = String(help="Id of the user who published this module", scope=Scope.settings)
-    empty = StringyBoolean(help="Whether this is an empty template", scope=Scope.settings, default=False)
+