diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/AjaxServer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/AjaxServer.java
index 4977c05..210bd5f 100644
--- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/AjaxServer.java
+++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/AjaxServer.java
@@ -638,32 +638,7 @@ public class AjaxServer extends HttpServlet
 	String siteId = null;
 	try {
 	    Long itemNum = Long.parseLong(itemId);
-	    item = simplePageToolDao.findItem(itemNum);
-	    if (item.getType() != SimplePageItem.BREAK) {
-		// hopefully this is the first item, in an old page that doesnbt' begin with a page break
-		List<SimplePageItem>items = simplePageToolDao.findItemsOnPage(item.getPageId());
-		if (items.get(0).getId() == itemNum) {
-		    // this is first item on page, add a section break before it
-		    item = simplePageToolDao.makeItem(item.getPageId(), 1, SimplePageItem.BREAK, null, null);
-		    item.setFormat("section");
-		    simplePageToolDao.quickSaveItem(item);
-		    int seq = 2;
-		    // and bump sequence numbers
-		    for (SimplePageItem i: items) {
-			i.setSequence(seq);
-			simplePageToolDao.quickUpdate(i);
-			seq++;
-		    }
-		} else if (items.get(0).getType() == SimplePageItem.BREAK &&
-			   items.get(1).getId() == itemNum) {
-		    // maybe we just inserted a break before our item. 
-		    // If so, use the break;
-		    item = items.get(0);
-		} else {
-		    log.error("Ajax setcolumnproperties passed item not a break: " + itemId);
-		}
-		    
-	    }
+	    item = getCorrectBreakItem(itemNum);
 	    page = simplePageToolDao.getPage(item.getPageId());
 	    siteId = page.getSiteId();
 	} catch (Exception e) {
@@ -703,6 +678,94 @@ public class AjaxServer extends HttpServlet
 
     }
 
+	public static String setSectionCollapsible(String itemId, String collapsible, String sectionTitle, String defaultClosed, String csrfToken) {
+		if (itemId == null || collapsible == null || sectionTitle == null) {
+			log.error("Ajax setSectionCollapsible passed null argument");
+			return null;
+		}
+
+		itemId = itemId.trim();
+		// we don't actually use the integers. Just for syntax checking
+		int collapsiblei = 0;
+		int defaultClosedi = 0;
+		try {
+			collapsiblei = Integer.parseInt(collapsible);
+			defaultClosedi = Integer.parseInt(defaultClosed);
+		} catch (Exception e) {
+			log.error("Ajax setSectionCollapsible passed non-numeric collapsible or defaultClosed");
+			return null;
+		}
+
+		// currently this is only needed by the instructor
+
+		SimplePageItem item = null;
+		SimplePage page = null;
+		String siteId = null;
+		try {
+			Long itemNum = Long.parseLong(itemId);
+			item = getCorrectBreakItem(itemNum);
+			page = simplePageToolDao.getPage(item.getPageId());
+			siteId = page.getSiteId();
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.error("Ajax setSectionCollapsible passed invalid data " + e);
+			return null;
+		}
+		if (siteId == null) {
+			log.error("Ajax setSectionCollapsible passed null site id");
+			return null;
+		}
+
+		String ref = "/site/" + siteId;
+		if (!SecurityService.unlock(SimplePage.PERMISSION_LESSONBUILDER_UPDATE, ref) || !checkCsrf(csrfToken)) {
+			log.error("Ajax setSectionCollapsible passed itemid " + itemId + " but user doesn't have permission");
+			return null;
+		}
+
+		if (collapsible.trim().equals("1"))
+			item.setAttribute("collapsible", collapsible);
+		else
+			item.removeAttribute("collapsible");
+
+		if (defaultClosed.trim().equals("1"))
+			item.setAttribute("defaultClosed", defaultClosed);
+		else
+			item.removeAttribute("defaultClosed");
+
+		item.setName(sectionTitle);
+
+		simplePageToolDao.quickUpdate(item);
+		return "ok";
+	}
+
+	private static SimplePageItem getCorrectBreakItem(Long itemNum) {
+		SimplePageItem item = simplePageToolDao.findItem(itemNum);
+		if (item.getType() != SimplePageItem.BREAK) {
+			// hopefully this is the first item, in an old page that doesn't begin with a page break
+			List<SimplePageItem>items = simplePageToolDao.findItemsOnPage(item.getPageId());
+			if (items.get(0).getId() == itemNum) {
+				// this is first item on page, add a section break before it
+				item = simplePageToolDao.makeItem(item.getPageId(), 1, SimplePageItem.BREAK, null, null);
+				item.setFormat("section");
+				simplePageToolDao.quickSaveItem(item);
+				int seq = 2;
+				// and bump sequence numbers
+				for (SimplePageItem i: items) {
+					i.setSequence(seq);
+					simplePageToolDao.quickUpdate(i);
+					seq++;
+				}
+			} else if (items.get(0).getType() == SimplePageItem.BREAK &&
+					items.get(1).getId() == itemNum) {
+				// maybe we just inserted a break before our item.
+				// If so, use the break;
+				item = items.get(0);
+			} else {
+				log.error("Ajax setSectionCollapsible passed item not a break: " + itemNum);
+			}
+		}
+		return item;
+	}
 
     public static String deleteItem(String itemId, String csrfToken) {
 	if (itemId == null) {
@@ -819,6 +882,13 @@ public class AjaxServer extends HttpServlet
 	  String color = req.getParameter("color");
 	  String csrfToken = req.getParameter("csrf");
 	  out.println(setColumnProperties(itemId, width, split, color, csrfToken));
+	  } else if (op.equals("setsectioncollapsible")) {
+	  String itemId = req.getParameter("itemid");
+	  String collapsible = req.getParameter("collapsible");
+	  String sectionTitle = req.getParameter("sectiontitle");
+	  String defaultClosed = req.getParameter("defaultclosed");
+	  String csrfToken = req.getParameter("csrf");
+	  out.println(setSectionCollapsible(itemId, collapsible, sectionTitle, defaultClosed, csrfToken));
       } else if (op.equals("deleteitem")) {
 	  String itemId = req.getParameter("itemid");
 	  String csrfToken = req.getParameter("csrf");
diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java
index bcf4cd6..3e3a0d1 100644
--- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java
+++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java
@@ -1110,6 +1110,7 @@ public class ShowPageProducer implements ViewComponentProducer, DefaultView, Nav
 			int cols = 0;
 			int colnum = 0;
 
+			UIBranchContainer sectionWrapper = null;
 			UIBranchContainer sectionContainer = null;
 			UIBranchContainer columnContainer = null;
 			UIBranchContainer tableContainer = null;
@@ -1124,7 +1125,22 @@ public class ShowPageProducer implements ViewComponentProducer, DefaultView, Nav
 				if (first || i.getType() == SimplePageItem.BREAK) {
 				    boolean sectionbreak = false;
 				    if (first || "section".equals(i.getFormat())) {
-					sectionContainer = UIBranchContainer.make(container, "section:");
+					sectionWrapper = UIBranchContainer.make(container, "sectionWrapper:");
+					boolean collapsible = i.getAttribute("collapsible") != null && (!"0".equals(i.getAttribute("collapsible")));
+					boolean defaultClosed = i.getAttribute("defaultClosed") != null && (!"0".equals(i.getAttribute("defaultClosed")));
+					UIOutput sectionHeader = UIOutput.make(sectionWrapper, "sectionHeader", i.getName() == null ? "" : i.getName());
+					sectionHeader.decorate(new UIStyleDecorator(i.getName() == null || i.getName().isEmpty() ? "skip" : ""));
+					sectionContainer = UIBranchContainer.make(sectionWrapper, "section:");
+					if (collapsible) {
+						sectionHeader.decorate(new UIStyleDecorator("collapsibleSectionHeader"));
+						sectionContainer.decorate(new UIStyleDecorator("collapsible"));
+						if (defaultClosed ) {
+							sectionHeader.decorate(new UIStyleDecorator("closedSectionHeader"));
+							sectionContainer.decorate(new UIStyleDecorator("defaultClosed"));
+						} else {
+							sectionHeader.decorate(new UIStyleDecorator("openSectionHeader"));
+						}
+					}
 					cols = colCount(itemList, i.getId());
 					sectionbreak = true;
 					colnum = 0;
diff --git a/lessonbuilder/tool/src/resources/messages.properties b/lessonbuilder/tool/src/resources/messages.properties
index d379002..ada8470 100644
--- a/lessonbuilder/tool/src/resources/messages.properties
+++ b/lessonbuilder/tool/src/resources/messages.properties
@@ -229,6 +229,12 @@ simplepage.columnblue=Blue
 simplepage.columngreen=Green
 simplepage.columnyellow=Yellow
 
+simplepage.collapsible=Collapsible
+simplepage.sectionTitle=Section Title
+simplepage.default.closed=Start closed
+simplepage.expand.all=Expand All
+simplepage.collapse.all=Collapse All
+
 simplepage.textItemUnavailable=This text item will show when all pre-requisites, as marked by an asterisk (*), have been completed
 simplepage.multimediaItemUnavailable=This multimedia item will show when all pre-requisites, as marked by an asterisk (*), have been completed
 
diff --git a/lessonbuilder/tool/src/webapp/css/Simplepagetool.css b/lessonbuilder/tool/src/webapp/css/Simplepagetool.css
index 8e2b555..f4a10a1 100644
--- a/lessonbuilder/tool/src/webapp/css/Simplepagetool.css
+++ b/lessonbuilder/tool/src/webapp/css/Simplepagetool.css
@@ -1289,6 +1289,64 @@ padding:1px;
 color: #666;
 }
 
+.sectionHeader {
+    padding: .5em;
+}
+
+.closedSectionHeader:before {
+    content: "\f065"; /* fa-expand */
+    font-family: FontAwesome;
+    float: right;
+}
+
+.openSectionHeader:before {
+    content: "\f066";  /* fa-compress */
+    font-family: FontAwesome;
+    float: right;
+}
+
+#expandCollapseButtons {
+    width: 100%;
+    text-align: right;
+}
+
+.defaultClosed {
+    display:none;
+}
+
+.collapsibleSectionHeader {
+    position: relative;
+}
+
+.collapsibleSectionHeader:after {
+    content: 'Click to expand/collapse';
+    position: absolute;
+    opacity: 0;
+    z-index: 1000000;
+    -webkit-transition: 0.3s ease;
+    -moz-transition: 0.3s ease;
+    pointer-events: none;
+    background: rgba(0, 0, 0, 0.8);
+    color: white;
+    padding: 8px 10px;
+    font-size: 12px;
+    white-space: nowrap;
+    box-shadow: 4px 4px 8px rgba(0, 0, 0, 0.3);
+    top: 100%;
+    left: 50%;
+    margin: -2px 0 0 -10px;
+}
+
+.collapsibleSectionHeader:hover {
+    cursor: pointer;
+    background-color: #eee;
+}
+
+.collapsibleSectionHeader:hover:after {
+    opacity: 1;
+    margin-top: 6px;
+}
+
 /* position relative with no args does nothing, but editsection's position absolute needs it as a refernce */
 .column {
    position:relative;
diff --git a/lessonbuilder/tool/src/webapp/js/show-page.js b/lessonbuilder/tool/src/webapp/js/show-page.js
index 278bfc4..ee57367 100644
--- a/lessonbuilder/tool/src/webapp/js/show-page.js
+++ b/lessonbuilder/tool/src/webapp/js/show-page.js
@@ -16,6 +16,10 @@ var delete_orphan_enabled = true;
 $(window).load(function () {
 	window.onbeforeunload = null;
 	fixupHeights();
+	// Show expand collapse all if needed
+	if($('.collapsibleSectionHeader').length) {
+		$('#expandCollapseButtons').show();
+	}
 });
 
 function msg(s) {
@@ -81,6 +85,61 @@ $(document).ready(function() {
 
 	});
 
+	$(".sectionHeader").on("click", function(){
+		var section = $(this).next("div.section");
+		if (section.hasClass("collapsible")) {
+			section.slideToggle();
+			$(this).toggleClass("closedSectionHeader");
+			$(this).toggleClass("openSectionHeader");
+		}
+	});
+
+	$("#collapsible").on("change", function(){
+		if(this.checked) {
+			$("#defaultClosedSpan").show();
+		} else {
+			$("#defaultClosed").prop('checked', false);
+			$("#defaultClosedSpan").hide();
+		}
+	});
+
+	$("#sectionTitle").keyup(function(){
+		if($("#sectionTitle").val()) {
+			$("#collapsible").removeProp('disabled');
+		} else {
+			$("#collapsible").prop('checked', false);
+			$("#collapsible").prop('disabled', true);
+			$("#defaultClosed").prop('checked', false);
+			$("#defaultClosedSpan").hide();
+		}
+	});
+
+	$("#expandAllSections").on("click", function(){
+		$(".sectionHeader").each(function(){
+			var section = $(this).next("div.section");
+			if (section.hasClass("collapsible")) {
+				section.slideDown();
+				$(this).removeClass("closedSectionHeader");
+				$(this).addClass("openSectionHeader");
+			}
+		});
+		$("#expandAllSections").hide();
+		$("#collapseAllSections").show();
+	});
+
+	$("#collapseAllSections").on("click", function(){
+		$(".sectionHeader").each(function(){
+			var section = $(this).next("div.section");
+			if (section.hasClass("collapsible")) {
+				section.slideUp();
+				$(this).addClass("closedSectionHeader");
+				$(this).removeClass("openSectionHeader");
+			}
+		});
+		$("#collapseAllSections").hide();
+		$("#expandAllSections").show();
+	});
+
 	// This is called in comments.js as well, however this may be faster.
 	//if(sakai.editor.editors.ckeditor==undefined) {
 //		$(".evolved-box :not(textarea)").hide();
@@ -2016,9 +2075,19 @@ $(document).ready(function() {
 		var tail_uls = addAboveLI.parent().nextAll();
 		var tail_cols = addAboveLI.parent().parent().nextAll();
 		var section = addAboveLI.parent().parent().parent();
-		section.after('<div class="section"><div class="column"><div class="editsection"><span class="sectionedit"><h3 class="offscreen">' + msg('simplepage.break-here') + '</h3><a href="/' + newitem + '" title="' + msg('simplepage.join-items') + '" class="section-merge-link" onclick="return false"><span aria-hidden="true" class="fa-compress fa-edit-icon sectioneditfont"></span></a></span><span class="sectionedit sectionedit2"><a href="/lessonbuilder-tool/templates/#" title="' + msg('simplepage.columnopen') + '" class="columnopen"><span aria-hidden="true" class="fa-cog fa-edit-icon sectioneditfont"></span></a></span></div><span class="sectionedit addbottom"><a href="#" title="Add new item at bottom of this column" class="add-bottom"><span aria-hidden="true" class="fa-plus fa-edit-icon plus-edit-icon"></span></a></span><ul border="0" role="list" style="z-index: 1;" class="indent mainList"><li class="breaksection" role="listitem"><span style="display:none" class="itemid">' + newitem + '</span></li></ul></div></div>');
+		section.prev('.sectionHeader').parent().after('<div><h3 class="sectionHeader skip"></h3><div class="section"><div class="column"><div class="editsection"><span class="sectionedit"><h3 class="offscreen">' + msg('simplepage.break-here') + '</h3><a href="/' + newitem + '" title="' + msg('simplepage.join-items') + '" class="section-merge-link" onclick="return false"><span aria-hidden="true" class="fa-compress fa-edit-icon sectioneditfont"></span></a></span><span class="sectionedit sectionedit2"><a href="/lessonbuilder-tool/templates/#" title="' + msg('simplepage.columnopen') + '" class="columnopen"><span aria-hidden="true" class="fa-columns fa-edit-icon sectioneditfont"></span></a></span></div><span class="sectionedit addbottom"><a href="#" title="Add new item at bottom of this column" class="add-bottom"><span aria-hidden="true" class="fa-plus fa-edit-icon plus-edit-icon"></span></a></span><ul border="0" role="list" style="z-index: 1;" class="indent mainList"><li class="breaksection" role="listitem"><span style="display:none" class="itemid">' + newitem + '</span></li></ul></div></div></div>');
 		// now go to new section
-		section = section.next();
+		section = section.prev('.sectionHeader').parent().next().children(".section");
+
+		section.prev('.sectionHeader').on("click", function(){
+			var section = $(this).next("div.section");
+			if (section.hasClass("collapsible")) {
+				section.slideToggle();
+				$(this).toggleClass("closedSectionHeader");
+				$(this).toggleClass("openSectionHeader");
+			}
+		});
+
 		// and move current item and following into the first col of the new section
 		if (addAboveItem > 0)
 		    section.find("ul").append(addAboveLI, tail_lis);
@@ -2032,7 +2101,7 @@ $(document).ready(function() {
 		fixupColAttrs();
 		fixupHeights();
 		closeDropdownc();
-	    });
+	});
 
 	$('.add-break-column').click(function(e) {
 		e.preventDefault();
@@ -2045,7 +2114,7 @@ $(document).ready(function() {
 		// current section DIV
 		var tail_uls = addAboveLI.parent().nextAll();
 		var column = addAboveLI.parent().parent();
-		column.after('<div class="column"><div class="editsection"><span class="sectionedit"><h3 class="offscreen">' + msg('simplepage.break-column-here') + '</h3><a href="/' + newitem + '" title="' + msg('simplepage.join-items') + '" class="column-merge-link" onclick="return false"><span aria-hidden="true" class="fa-compress fa-edit-icon sectioneditfont"></span></a></span><span class="sectionedit sectionedit2"><a href="/lessonbuilder-tool/templates/#" title="' + msg('simplepage.columnopen') + '" class="columnopen"><span aria-hidden="true" class="fa-cog fa-edit-icon sectioneditfont"></span></a></span></div><span class="sectionedit addbottom"><a href="#" title="Add new item at bottom of this column" class="add-bottom"><span aria-hidden="true" class="fa-plus fa-edit-icon plus-edit-icon"></span></a></span><ul border="0" role="list" style="z-index: 1;" class="indent mainList"><li class="breaksection" role="listcolumn"><span style="display:none" class="itemid">' + newitem + '</span></li></ul></div>');
+		column.after('<div class="column"><div class="editsection"><span class="sectionedit"><h3 class="offscreen">' + msg('simplepage.break-column-here') + '</h3><a href="/' + newitem + '" title="' + msg('simplepage.join-items') + '" class="column-merge-link" onclick="return false"><span aria-hidden="true" class="fa-compress fa-edit-icon sectioneditfont"></span></a></span><span class="sectionedit sectionedit2"><a href="/lessonbuilder-tool/templates/#" title="' + msg('simplepage.columnopen') + '" class="columnopen"><span aria-hidden="true" class="fa-columns fa-edit-icon sectioneditfont"></span></a></span></div><span class="sectionedit addbottom"><a href="#" title="Add new item at bottom of this column" class="add-bottom"><span aria-hidden="true" class="fa-plus fa-edit-icon plus-edit-icon"></span></a></span><ul border="0" role="list" style="z-index: 1;" class="indent mainList"><li class="breaksection" role="listcolumn"><span style="display:none" class="itemid">' + newitem + '</span></li></ul></div>');
 		// now go to new section
 		column = column.next();
 		// and move current item and following into the first col of the new section
@@ -2075,14 +2144,21 @@ $(document).ready(function() {
 
 		// current section DIV
 		var section = thisCol.parent();
+		var sectionHeader = section.prev('.sectionHeader');
 		// append rest of ul last one in prevous section
-		section.prev().find('ul').last().append(tail_lis);
-		section.prev().find('.column').last().append(tail_uls);
-		section.prev().append(tail_cols);
+		sectionHeader.parent().prev().find('ul').last().append(tail_lis);
+		sectionHeader.parent().prev().find('.column').last().append(tail_uls);
+		sectionHeader.parent().prev().append(tail_cols);
 		// nothing should be left in current section. kill it
 		section.remove();
+		sectionHeader.remove();
 		fixupColAttrs();
 		fixupHeights();
+
+		if(!$('.collapsibleSectionHeader').length) {
+			$('#expandCollapseButtons').hide();
+		}
+
 	};
 
 	function columnMergeLink(e) {
@@ -2117,6 +2193,21 @@ $(document).ready(function() {
 	    $('#columnblue').prop('selected', col.hasClass('colblue'));
 	    $('#columngreen').prop('selected', col.hasClass('colgreen'));
 	    $('#columnyellow').prop('selected', col.hasClass('colyellow'));
+	    $('#collapsible').prop('checked', col.parent('.section').hasClass('collapsible'));
+	    $('#defaultClosed').prop('checked', col.parent('.section').hasClass('defaultClosed'));
+	    $('#sectionTitle').val(col.parent('.section').prev('.sectionHeader').html());
+		if(!$("#sectionTitle").val()) {
+			$("#collapsible").prop('checked', false);
+			$("#collapsible").prop("disabled", true);
+		} else {
+			$("#collapsible").prop("disabled", false);
+		}
+		if(!$("#collapsible").prop('checked')) {
+			$("#defaultClosed").prop('checked', false);
+			$("#defaultClosedSpan").hide();
+		} else {
+			$("#defaultClosedSpan").show();
+		}
 	    $('#column-dialog').dialog('open');
 	    return false;
 	}
@@ -2131,6 +2222,8 @@ $(document).ready(function() {
 		var width = $('#columndouble').prop('checked') ? 2 : 1;
 		var split = $('#columnsplit').prop('checked') ? 2 : 1;
 		var col =  $('.currentlyediting');
+		var section = col.parent('.section');
+		var header = section.prev('.sectionHeader');
 		var color_index = $('#columnbackground')[0].selectedIndex; 
 		var color = '';
 		switch (color_index) {
@@ -2142,6 +2235,9 @@ $(document).ready(function() {
 		case 5: color = 'green'; break;
 		case 6: color = 'yellow'; break;
 		}
+		var collapsible = $('#collapsible').prop('checked') ? 1 : 0;
+		var defaultClosed = $('#defaultClosed').prop('checked') ? 1 : 0;
+		var sectionTitle = $('#sectionTitle').val();
 		setColumnProperties(itemid, width, split, color);
 		if (width === 2)
 		    col.addClass('double');		    
@@ -2156,6 +2252,34 @@ $(document).ready(function() {
 		    col.addClass('col' + color);
 		fixupColAttrs();
 		fixupHeights();
+		setSectionCollapsible(itemid, collapsible, sectionTitle, defaultClosed);
+		header.html(sectionTitle);
+		if (sectionTitle === '') {
+			header.addClass('skip');
+		} else {
+			header.removeClass('skip');
+		}
+		if (collapsible) {
+			section.addClass('collapsible');
+			header.addClass('collapsibleSectionHeader');
+			header.addClass('openSectionHeader');
+			header.removeClass('closedSectionHeader');
+		} else {
+			section.removeClass('collapsible');
+			header.removeClass('collapsibleSectionHeader');
+			header.removeClass('openSectionHeader');
+			header.removeClass('closedSectionHeader');
+		}
+		if (defaultClosed) {
+			section.addClass('defaultClosed');
+		} else {
+			section.removeClass('defaultClosed');
+		}
+		if($('.collapsibleSectionHeader').length) {
+			$('#expandCollapseButtons').show();
+		} else {
+			$('#expandCollapseButtons').hide();
+		}
 		$('#column-dialog').dialog('close');
 		return false;
 	    });
@@ -2914,6 +3038,20 @@ function setColumnProperties(itemId, width, split, color) {
 	    }});
 }
 
+function setSectionCollapsible(itemId, collapsible, sectionTitle, defaultClosed) {
+	var url = location.protocol + '//' + location.host + '/lessonbuilder-tool/ajax';
+	var csrf = $("#edit-item-dialog input[name='csrf8']").attr('value');
+	$.ajax({
+		type: "POST",
+		async: false,
+		url: url,
+		data: {op: 'setsectioncollapsible', itemid: itemId, collapsible: collapsible, sectiontitle: sectionTitle, defaultclosed: defaultClosed, csrf: csrf},
+		success: function(data){
+			ok = data;
+		}
+	});
+}
+
 var mimeMime = "";
 
 function getMimeType(url) {
@@ -3018,6 +3156,9 @@ function fixupHeights() {
 	return;
     }
     $(".section").each(function(index) {
+		var visible = $(this).is(":visible");
+		// Unhide all to calculate correct heights
+		$(this).show();
 	    var max = 0;
 	    // reset to auto to cause recomputation. This is needed because
 	    // this gets called after contents of columns have changed.
@@ -3030,6 +3171,9 @@ function fixupHeights() {
 		    if (max > $(this).height())
 			$(this).height(max);
 		});
+		if (!visible) {
+			$(this).hide();
+		}
 	});
 };
 
diff --git a/lessonbuilder/tool/src/webapp/templates/ShowPage.html b/lessonbuilder/tool/src/webapp/templates/ShowPage.html
index adfecd1..4d02821 100644
--- a/lessonbuilder/tool/src/webapp/templates/ShowPage.html
+++ b/lessonbuilder/tool/src/webapp/templates/ShowPage.html
@@ -339,10 +339,17 @@
 		</ul>
 
 		<div class="itemclass" rsf:id="itemContainer:" role="main" style="z-index: 1;">
-			<div style="display:none" rsf:id="current-item-id"></div>
+            <div id="expandCollapseButtons" style="display:none;">
+                <button id="expandAllSections"><span class="fa fa-expand" aria-hidden="true" style="padding-right:5px;"></span><span rsf:id="msg=simplepage.expand.all"></span></button>
+                <button id="collapseAllSections" style="display:none;"><span class="fa fa-compress" aria-hidden="true" style="padding-right:5px;"></span><span rsf:id="msg=simplepage.collapse.all"></span></button>
+            </div>
+
+            <div style="display:none" rsf:id="current-item-id"></div>
 			
 			<h2 rsf:id="msg=simplepage.maincontent" class="offscreen" id="maintablelabel"></h2>
 <!-- WARNING: javascript for add-break-section adds section, ul, li, and sectionedit markup, so if you change here, keep it in sync -->
+			<div rsf:id="sectionWrapper:"><!-- start section wrapper -->
+			<h3 rsf:id="sectionHeader" id="sectionHeader" class="sectionHeader"></h3>
 			<div rsf:id="section:" class="section">
 			<div rsf:id="column:" class="column">
 			  <div class="editsection">
@@ -780,7 +787,8 @@
 		    $('.usebutton').button({text:true});
 		    </script>
 	    </div>	
-	    </div>			
+	    </div>
+                <!-- end section wrapper --></div>
 	    <script type="text/javascript">
 	      // to avoid flickering, process indent here
 	      doIndents();
@@ -1927,7 +1935,18 @@
 		      <option value="green" id="columngreen"><span rsf:id="msg=simplepage.columngreen">green</span></option>
 		      <option value="yellow" id="columnyellow"><span rsf:id="msg=simplepage.columnyellow">yellow</span></option>
 		    </select>
-                    <label for="columnbackground" rsf:id="msg=simplepage.columnbackground"></label>
+                    <label for="columnbackground" rsf:id="msg=simplepage.columnbackground"></label><br />
+
+                    <br />
+                    <label for="sectionTitle" rsf:id="msg=simplepage.sectionTitle"></label>
+                    <input type="text" id="sectionTitle" /><br />
+
+                    <input type="checkbox" id="collapsible" />
+                    <label for="collapsible" rsf:id="msg=simplepage.collapsible"></label><br />
+
+                    <span id="defaultClosedSpan"><input type="checkbox" id="defaultClosed" />
+                    <label for="defaultClosed" rsf:id="msg=simplepage.default.closed"></label></span>
+
                   </span>
 		</div>
 		<p class="act">