diff --git a/webapp/web/css/menupage/pageManagement.css b/webapp/web/css/menupage/pageManagement.css
index dfd3e97c9..4c2409edf 100644
--- a/webapp/web/css/menupage/pageManagement.css
+++ b/webapp/web/css/menupage/pageManagement.css
@@ -66,6 +66,7 @@ section#floatRight {
 }
 select#typeSelect {
     margin-top:0px;
+    margin-bottom:20px;
 }
 section#headerBar {
     background-color:#f5f5f5;
@@ -130,7 +131,7 @@ input#contentCheckbox {
 }
 span.deleteLinkContainer {
     float:left;
-    margin-left:100px;
+    margin-left:170px;
     margin-top:-36px;
 }
 form#managePage textarea {
diff --git a/webapp/web/js/menupage/pageManagementUtils.js b/webapp/web/js/menupage/pageManagementUtils.js
index f44ef2dfa..9370b0272 100644
--- a/webapp/web/js/menupage/pageManagementUtils.js
+++ b/webapp/web/js/menupage/pageManagementUtils.js
@@ -282,6 +282,11 @@ var pageManagementUtils = {
 			var pageName = pageManagementUtils.pageNameInput.val();
 			pageManagementUtils.menuLinkText.val(pageName);
 		}
+		if(!isMenu && linkText.length > 0) {
+			// if the isMenuCheckbox is unchecked, we need to clear the
+			// menuLinkText field; otherwise, the page remains a menu
+			pageManagementUtils.menuLinkText.val("");
+		}
 	},
 	
 	//Select content type
@@ -414,7 +419,7 @@ var pageManagementUtils = {
             "class": "pageContentContainer",
             html: "<span class='pageContentTypeLabel'>" + contentTypeLabel + " - " + varOrClass 
                         + "</span><span id='clickable" + counter 
-                        + "' class='pageContentExpand'><div class='arrow expandArrow'></div></span><div id='innerContainer" + counter 
+                        + "' class='pageContentExpand'><div id='woof' class='arrow expandArrow'></div></span><div id='innerContainer" + counter 
                         + "' class='pageContentWrapper'><span class='deleteLinkContainer'>&nbsp;or&nbsp;<a id='remove" + counter   // changed button to a link
                         + "' href='' >delete</a></span></div>"
         });
@@ -432,17 +437,18 @@ var pageManagementUtils = {
     	//Done button should just collapse the cloned content
         $newContentObj.find("input[name='doneWithContent']").click(function() {
         		var thisInnerDiv = $(this).closest("div.pageContentWrapper");
-                thisInnerDiv.slideUp(222);
-                var thisClickableSpan = $(this).closest("span.pageContentExpand");
+                var thisClickableSpan = thisInnerDiv.prev("span.pageContentExpand");
                 var thisArrowDiv = thisClickableSpan.find('div.arrow');
+                thisInnerDiv.slideUp(222);
                 thisArrowDiv.removeClass("collapseArrow");
                 thisArrowDiv.addClass("expandArrow");
+                window.setTimeout('pageManagementUtils.adjustSaveButtonHeight()', 223);
+         
         });	
     },
     bindClonedContentContainerEvents:function($newDivContainer, counter) {
     	 var $clickableSpan = $newDivContainer.children('span#clickable' + counter);
          var $innerDiv = $newDivContainer.children('div#innerContainer' + counter);
-                  
     	 //Expand/collapse toggle
         $clickableSpan.click(function() {
             if ( $innerDiv.is(':visible') ) {
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl
index 0b26408f3..f7ab08724 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl
@@ -51,7 +51,7 @@
                         </li>
                         </#list>
                     </ul><br />
-                    <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="Done" />
+                    <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="Save this content" />
                     <#if menuAction == "Add">
                         <span id="cancelContent"> or <a class="cancel" href="javascript:"  id="cancelContentLink" >Cancel</a></span>
                     </#if>
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl
index a0867b7dc..40a34192e 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl
@@ -6,7 +6,7 @@
     <input type="text" name="saveToVar" size="20" value="" id="fixedHTMLSaveToVar" role="input" />
     <label id="fixedHTMLValueLabel" for="fixedHTMLValue">Enter fixed HTML here<span id="fixedHTMLValueSpan"></span><span class="requiredHint"> *</span></label>
     <textarea id="fixedHTMLValue" name="htmlValue" cols="70" rows="15" style="margin-bottom:7px"></textarea><br />
-    <input  type="button" id="doneWithContent" name="doneWithContent" value="Done" class="doneWithContent" />
+    <input  type="button" id="doneWithContent" name="doneWithContent" value="Save this content" class="doneWithContent" />
     <#if menuAction == "Add">
         <span id="cancelContent"> or <a class="cancel" href="javascript:"  id="cancelContentLink" >Cancel</a></span>
     </#if>
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl
index 0a4556f2e..c11a952b8 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl
@@ -8,7 +8,7 @@
     <input type="text" name="queryModel" size="20" value="" id="queryModel" role="input" style="display:none"/>
     <label id="queryLabel" for="queryLabel"><span id="querySpan">Enter SPARQL query here</span><span class="requiredHint"> *</span></label>
     <textarea id="query" name="query" cols="70" rows="15" style="margin-bottom:7px"></textarea><br />
-    <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="Done" />
+    <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="Save this content" />
     <#if menuAction == "Add">
         <span id="cancelContent"> or <a class="cancel" href="javascript:"  id="cancelContentLink" >Cancel</a></span>
     </#if>
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement.ftl
index efe42090c..44db6f6ac 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement.ftl
@@ -12,7 +12,8 @@
 <#assign menuLinkText = "" />
 <#assign menuPosition = pageData.highestMenuPosition />
 <#assign addMenuItem = "" />
-<#assign pageHeading = "Add Page" />
+<#assign pageHeading = "Add New Page" />
+<#assign saveBtnText = "Save new page" />
 <#if pageData.addMenuItem?has_content>
 	<#assign addMenuItem = pageData.addMenuItem />
 </#if>
@@ -26,7 +27,8 @@
 	<#assign menuLinkText =  lvf.getFormFieldValue(editSubmission, editConfiguration, "menuLinkText")/>
 	<#assign customTemplate = lvf.getFormFieldValue(editSubmission, editConfiguration, "customTemplate")/>
 	<#assign selfContainedTemplate = lvf.getFormFieldValue(editSubmission, editConfiguration, "isSelfContainedTemplate")/>
-	<#assign pageHeading = "Edit Page" />
+	<#assign pageHeading = "Edit ${pageName} Page" />
+    <#assign saveBtnText = "Save changes" />
 	<#if customTemplate?has_content>
 	    <#if selfContainedTemplate?has_content>
 		    <#assign selectedTemplateType = "selfContained" />
@@ -128,7 +130,7 @@
         </section>
     </div>
     <section >
-        <span id="saveButton" ><input  id="pageSave" type="submit" name="submit-Add" value="Save changes" class="submit" role="input" /> or </span> 
+        <span id="saveButton" ><input  id="pageSave" type="submit" name="submit-Add" value="${saveBtnText}" class="submit" role="input" /> or </span> 
         <a class="cancel" href="${cancelUrl!}"  id="cancelPage" >Cancel</a>
         <br />
         <p class="requiredHint">* required fields</p>