diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index a32a2999..4e5e9d62 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -635,11 +635,11 @@
   </servlet-mapping>
 
   <servlet>
-    <servlet-name>AllClassGroupsListingController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.AllClassGroupsListingController</servlet-class>
+    <servlet-name>ListClassGroupsController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListClassGroupsController</servlet-class>
   </servlet>
   <servlet-mapping>
-    <servlet-name>AllClassGroupsListingController</servlet-name>
+    <servlet-name>ListClassGroupsController</servlet-name>
     <url-pattern>/listGroups</url-pattern>
   </servlet-mapping>
 
@@ -779,11 +779,11 @@
   </servlet-mapping>
 
   <servlet>
-    <servlet-name>VClassWebappsListingController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.VClassWebappsListingController</servlet-class>
+    <servlet-name>ListVClassWebappsController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListVClassWebappsController</servlet-class>
   </servlet>
   <servlet-mapping>
-    <servlet-name>VClassWebappsListingController</servlet-name>
+    <servlet-name>ListVClassWebappsController</servlet-name>
     <url-pattern>/listVClassWebapps</url-pattern>
   </servlet-mapping>
 
@@ -798,11 +798,11 @@
 
 
   <servlet>
-    <servlet-name>ClassHierarchyListingController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.ClassHierarchyListingController</servlet-class>
+    <servlet-name>ShowClassHierarchyController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ShowClassHierarchyController</servlet-class>
   </servlet>
   <servlet-mapping>
-    <servlet-name>ClassHierarchyListingController</servlet-name>
+    <servlet-name>ShowClassHierarchyController</servlet-name>
     <url-pattern>/showClassHierarchy</url-pattern>
   </servlet-mapping>
 
diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css
index 57e10cfe..8cb1529c 100644
--- a/themes/wilma/css/wilma.css
+++ b/themes/wilma/css/wilma.css
@@ -1617,4 +1617,23 @@ input.add-account:active {
 #associateProfileBackgroundTwo {
     padding:7px 94px 45px 0;
     margin-top:-120px; 
+}
+/* ------------------------------------------------->  */
+/* CLASS HIERARCHY  -------------------------------->  */
+/* ------------------------------------------------->  */
+span.headerSpanPlus {
+    width: 12px;
+    background: url(../images/green_plus_sign.gif) left center no-repeat;
+}
+span.headerSpanMinus {
+    width: 12px;
+    background: url(../images/green_minus_sign.gif) left center no-repeat;
+}
+span.subclassExpandPlus {
+    padding-right: 14px;
+    background: url(../images/green_plus_sign.gif) left center no-repeat;
+}
+span.subclassExpandMinus {
+    padding-right: 14px;
+    background: url(../images/green_minus_sign.gif) left center no-repeat;
 }
\ No newline at end of file