diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/MenuManagementController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/MenuManagementController.java
index 2628a612a..751c7e3b3 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/MenuManagementController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/MenuManagementController.java
@@ -39,7 +39,7 @@ public class MenuManagementController extends FreemarkerHttpServlet {
     protected final static String SUBMIT_FORM = "/processEditDisplayModel"; 
     protected final static String CANCEL_FORM = "/individual?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fontologies%2Fdisplay%2F1.1%23DefaultMenu&switchToDisplayModel=true"; 
     protected final static String DELETE_FORM = "menuManagement-remove.ftl";
-    protected final static String EDIT_FORM = "testMenuManagement.ftl"; 
+    protected final static String EDIT_FORM = "menuManagement.ftl"; 
     protected final static String CMD_PARAM = "cmd";
     protected final static String EDIT_PARAM_VALUE = "edit";
     protected final static String DELETE_PARAM_VALUE = "delete";
diff --git a/webapp/web/templates/freemarker/edit/forms/testMenuManagement.ftl b/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
similarity index 83%
rename from webapp/web/templates/freemarker/edit/forms/testMenuManagement.ftl
rename to webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
index 691641891..3d9f25adf 100644
--- a/webapp/web/templates/freemarker/edit/forms/testMenuManagement.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
@@ -64,19 +64,19 @@
             <p id="selectClassesMessage" name="selectClassesMessage">Select content to display</p>
 
             <section id="internal-class" role="region">
-                    <#if internalClass?has_content>
-                        <#assign enableInternalClass = '' />
-                        <#assign disableClass = 'class="inline"' />
-                    <#else>
-                        <#assign enableInternalClass = '<p class="note">To enable this option, you must first select an <a href="${urls.base}/processInstitutionalInternalClass">institutional internal class</a> for your instance</p>' />
-                        <#assign disableClass = 'class="disable inline" disabled="disabled"' />
-                    </#if>
-
-                    <input type="checkbox" ${disableClass} name="display-internalClass" value="${internalClassUri}" id="display-internalClass" <#if pageInternalOnly?has_content>checked</#if> role="input" />
-                    <label ${disableClass} class="inline" for="display-internalClass">Only display <em>${associatedPage}</em> within my institution</label>
-
-                    ${enableInternalClass}
-                </section>
+                <#if internalClass?has_content>
+                    <#assign enableInternalClass = '' />
+                    <#assign disableClass = 'class="inline"' />
+                <#else>
+                    <#assign enableInternalClass = '<p class="note">To enable this option, you must first select an <a href="${urls.base}/processInstitutionalInternalClass">institutional internal class</a> for your instance</p>' />
+                    <#assign disableClass = 'class="disable inline" disabled="disabled"' />
+                </#if>
+                
+                <input type="checkbox" ${disableClass} name="display-internalClass" value="${internalClassUri}" id="display-internalClass" <#if pageInternalOnly?has_content>checked</#if> role="input" />
+                <label ${disableClass} class="inline" for="display-internalClass">Only display <em>${associatedPage}</em> within my institution</label>
+                
+                ${enableInternalClass}
+            </section>
                 
             <ul id="selectedClasses" name="selectedClasses" role="menu">
                 <#--Adding a default class for "ALL" in case all classes selected-->
@@ -95,6 +95,7 @@
                             </#list>
                     </#if> />
                     <label class="inline" for="${classInClassGroup.name}"> ${classInClassGroup.name}</label>
+                    <#-- PLACEHOLDER - not yet implemented) -->
                     <span class="ui-icon-sortable"></span> <#--sortable icon for dragging and dropping menu items-->
                 </li>
                 </#list>
diff --git a/webapp/web/templates/freemarker/edit/forms/menuManagementForm.ftl b/webapp/web/templates/freemarker/edit/forms/menuManagementForm.ftl
deleted file mode 100644
index e8233a324..000000000
--- a/webapp/web/templates/freemarker/edit/forms/menuManagementForm.ftl
+++ /dev/null
@@ -1,116 +0,0 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#--    Template for menu items management. 
-        Based on menu management wireframes: edit page: screen 3a -->
-
-<#-- Assignment of validation error variables -->
-
-<#if errorNameIsEmpty??>
-      <#assign errorMessage = "Text for error message" />
-</#if>
-
-<#if errorPrettyUrlIsEmpty??>
-      <#assign errorMessage = "Text for error message" />
-</#if>
-
-<#if errorTemplateTypeLIsEmpty??>
-      <#assign errorMessage = "Text for error message" />
-</#if>
-
-<#-- Other error messages -->
-
-<#if errorMessage?has_content>
-      <section id="error-alert" role="alert">
-          <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon"/>
-          <p>${errorMessage}</p>
-      </section>
-</#if>
-
-<#--Since we are going to use one template for adding and editing a menu item,
-    it will be necessary to provide a freemarker variable that lets us know if you are in edit or add mode. bThis is up 
-    to you Huda the way you implement it. -->
-    
-<h3>${menuAction} menu item</h3>
-
-<section>
-    <form method="POST" action="${formUrls}">
-        <legend>${menuAction} menu item</legend>
-         
-        <label for="menu-name">Name *</label>
-        <input type="text" name="menuName" value="${menuName}" />
-
-        <label for="pretty-url">Pretty URL *</label> 
-        <input type="text" name="prettyUrl" value="${prettyUrl}" />
-        <p>(Format: /<prettyURL> - ie. /people)</p>
-
-        
-        <p>Template *</p>
-        
-        <input type="radio" name="default" value="default" <#if selectedTemplateType = "default">checked</#if> />
-        <label class="inline" for="default"> Default</label>
-        
-        <br />
-        
-        <input type="radio" name="custom" value="custom" <#if selectedTemplateType = "custom">checked</#if> />
-        <label class="inline" for="custom"> Custom template</label>
-        
-        <#if selectedTemplateType = "custom">
-            <input type="text" name="customTemplate" value="${customTemplate}"/>*
-        </#if>
-            
-        <p>Select content type for the associated page</p>
-    
-        <p><span>${associatedPage}</span> <a href="#">Change content type</a></p>
-
-        <p>Select content to display</p>
-
-        <section>
-            <ul>
-            <#list classesInClassGroup as classInClassGroup>
-                <li class="ui-state-default">
-                    <input type="checkbox" name="classInClassGroup" value="${classInClassGroup.uri}" <#if selectedClassInClassGroup = "${classInClassGroup.uri}">checked</#if> />
-                    <label class="inline" for="${classInClassGroup.label}"> ${classInClassGroup.label}</label>
-                    <span class="ui-icon-sortable"></span> <#--sortable icon for dragging and dropping menu items-->
-                </li>
-            </#list>
-            </ul>
-        </section>
-    
-        <input type="text" name="display-${associatedPage}" value="${associatedPage}" id="display-${associatedPage}" />
-        <label for="display-${associatedPage}">Only display ${associatedPage} within my institution</label> 
-    
-        <input type="submit" name="submit-${menuAction}" value="Save changes" class="submit" /> or <a class="cancel" href="${formUrls}">Cancel</a>
-
-        <p>* required fields</p>
-    </form>
-</section>
-
-<#-- Based on menu management wireframes: edit page: screen 3b 
-     Snippet for selecting class groups or content types-->
-    
-    <label for="selectClassGroup">Select content type for the associated page *</label>
-    <select name="selectClassGroup">
-        <#list classGroups as classGroup>
-        <option value="${classGroup.uri}">${classGroup.label}</option>
-        </#list>
-    </select>
-
-<#-- Based on menu management wireframes: add page: screen 3c 
-     Snippet if there is no institutional internal class selected-->
-     
-     <#if internalClass?has_content>
-        <#assign disableClass = 'class="disable"' />
-        <#assign enableInternalClass = '<p>To enable this option, you must first select an <a href="' + internalClass.uri + '">institutional internal class for your instance</a></p>' />
-     <#/if>
-     
-     <input type="text" ${disableClass} name="display-${associatedPage}" value="${associatedPage}" id="display-${associatedPage}" />
-     <label ${disableClass} for="display-${associatedPage}">Only display ${associatedPage} within my institution</label>
-     ${enableInternalClass}
-
-<#-- Add necessary css files associated with this page
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/menupage/menupage.css" />')}-->
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
-
-<#-- Add necessary javascript files associated with this page
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/file-sample.js"></script>')}   
--->
\ No newline at end of file