diff --git a/webapp/web/templates/freemarker/edit/forms/menuManagementForm.ftl b/webapp/web/templates/freemarker/edit/forms/menuManagementForm.ftl
index 97caef28c..4faa859e7 100644
--- a/webapp/web/templates/freemarker/edit/forms/menuManagementForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/menuManagementForm.ftl
@@ -1,6 +1,7 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#-- Template for menu items management. Based on menu management wireframes -->
+<#--    Template for menu items management. 
+        Based on menu management wireframes: edit page: screen 3a -->
 
 <#-- Assignment of validation error variables -->
 
@@ -26,7 +27,8 @@
 </#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 does the job -->
+    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>
 
@@ -51,35 +53,28 @@
         
         <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" />*
+        </#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>
-        
-        <#list classGroups as classGroup>
-            <input type="checkbox" name="classGroup" value="${classGroup.uri}" <#if selectedClassGroup = "${classGroup.uri}">checked</#if> />
-            <label class="inline" for="$classGroup.label}"> ${classGroup.label}</label>
-            <span class="ui-icon-sortable"></span> <#--sortable icon for dragging and dropping menu items-->
-            <br />
-        </#list>
-    
-        <#-- NICK, this is a better markup for making sortable classGroups using http://jqueryui.com/demos/sortable/
-        <p>Select content to display</p>
 
         <section>
             <ul>
-            <#list classGroups as classGroup>
+            <#list classesInClassGroup as classInClassGroup>
                 <li class="ui-state-default">
-                    <input type="checkbox" name="classGroup" value="${classGroup.uri}" <#if selectedClassGroup = "${classGroup.uri}">checked</#if> />
-                    <label class="inline" for="$classGroup.label}"> ${classGroup.label}</label>
-                    <span class="ui-icon-sortable"></span>
+                    <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>-->
-
+        </section>
     
         <input type="text" name="display-${associatedPage}" value="${associatedPage}" id="display-${associatedPage}" />
         <label for="display-${associatedPage}">Only display ${associatedPage} within my institution</label> 
@@ -90,6 +85,28 @@
     </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" />')}