diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index f261be62fa..978bc74245 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -12,8 +12,15 @@
         state: '${unit_state}'
       })
     });
-
-
+  
+    (function() {
+      
+      $('.new-component-template').each(function(){
+          $emptyEditor = $(this).find('.empty');
+          $(this).prepend($emptyEditor);
+        });
+    })();
+    
     function setEditorTab(e) {
       e.preventDefault();
       $('.editor-tabs .current').removeClass('current');
@@ -153,18 +160,29 @@
                 <div class="new-component-templates new-component-${type}">
                     <ul class="new-component-template">
                         % for name, location, has_markdown, is_empty in templates:
-                        <li>
-                            <a href="#" data-location="${location}">
-                                <span class="name">${name} 
-                                % if has_markdown:
-                                     MD
-                                % endif
-                                % if is_empty:
-                                    <i>rasa</i>
-                                % endif
-                                </span>
-                            </a>
-                        </li>
+
+                          % 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>
+                            </li>
+                          % endif
+
                         %endfor
                     </ul>
                     <a href="#" class="cancel-button">Cancel</a>