diff --git a/cms/static/coffee/src/views/unit.coffee b/cms/static/coffee/src/views/unit.coffee
index 416e3204fd..6f9b939af2 100644
--- a/cms/static/coffee/src/views/unit.coffee
+++ b/cms/static/coffee/src/views/unit.coffee
@@ -185,6 +185,7 @@ class CMS.Views.UnitEdit.NameEdit extends Backbone.View
     # Treat the metadata dictionary as immutable
     metadata = $.extend({}, @model.get('metadata'))
     metadata.display_name = @$('.unit-display-name-input').val()
+    $('.unit-location .editing .unit-name').html(metadata.display_name)
     @model.set('metadata', metadata)
 
 class CMS.Views.UnitEdit.LocationState extends Backbone.View
diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index 0f4f999599..3a184d65ba 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -108,9 +108,7 @@
                       <span class="folder-icon"></span>
                       <span class="subsection-name"><span class="subsection-name-value">${subsection.display_name}</span></span>
                     </a>
-                    <ol>
-                      ${units.enum_units(subsection, actions=False, selected=unit.location)}
-                    </ol>
+                    ${units.enum_units(subsection, actions=False, selected=unit.location)}
                   </li>
                 </ol>
               </li>
diff --git a/cms/templates/widgets/units.html b/cms/templates/widgets/units.html
index 13bf73fec6..fe955baafe 100644
--- a/cms/templates/widgets/units.html
+++ b/cms/templates/widgets/units.html
@@ -18,7 +18,7 @@ This def will enumerate through a passed in subsection and list all of the units
     <div class="section-item ${selected_class}">
       <a href="${reverse('edit_unit', args=[unit.location])}" class="${unit_state}-item">
         <span class="${unit.category}-icon"></span>
-        ${unit.display_name}
+        <span class="unit-name">${unit.display_name}</span>
       </a>
       % if actions:
       <div class="item-actions">