Index: lams_central/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r268809b34d41cef37fc1cbacc9aa0d2eeb245377 -rbe513b5b177ecf4aa4c83b1725fe3c4dd5113081
--- lams_central/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 268809b34d41cef37fc1cbacc9aa0d2eeb245377)
+++ lams_central/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision be513b5b177ecf4aa4c83b1725fe3c4dd5113081)
@@ -38,11 +38,11 @@
 <div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
     <div class="panel panel-default" >
         <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<h4 class="panel-title">
+        	<span class="panel-title">
 	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
           	${title}
         	</a>
-      		</h4>
+      		</span>
         </div>
 
         <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
Index: lams_central/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r268809b34d41cef37fc1cbacc9aa0d2eeb245377 -rbe513b5b177ecf4aa4c83b1725fe3c4dd5113081
--- lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 268809b34d41cef37fc1cbacc9aa0d2eeb245377)
+++ lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision be513b5b177ecf4aa4c83b1725fe3c4dd5113081)
@@ -122,7 +122,7 @@
     	window.close();
     }  				
 </script>	
-<div id="saveCancelButtons voffset5" >
+<div id="saveCancelButtons" >
 		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
Index: lams_central/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u
--- lams_central/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision 0)
+++ lams_central/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision be513b5b177ecf4aa4c83b1725fe3c4dd5113081)
@@ -0,0 +1,54 @@
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * AdvancedAccordian.tag
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
+	 * Wiki: 
+	 */
+%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default" >
+        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
+          	${title}
+        	</a>
+      		</span>
+        </div>
+
+
+		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
+		<jsp:doBody />
+		</div>
+	</div>
+</div>
+		
\ No newline at end of file
Index: lams_central/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09 -rbe513b5b177ecf4aa4c83b1725fe3c4dd5113081
--- lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 98b9cc05f4f5a1d5fd86a3270fd2f5972baa5a09)
+++ lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision be513b5b177ecf4aa4c83b1725fe3c4dd5113081)
@@ -460,6 +460,10 @@
        <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
    	</tag-file>  
    	<tag-file>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
Index: lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js
===================================================================
diff -u -r51585812d7a5ef78a75799f9d5f0b484e8228218 -rbe513b5b177ecf4aa4c83b1725fe3c4dd5113081
--- lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js	(.../monitorToolSummaryAdvanced.js)	(revision 51585812d7a5ef78a75799f9d5f0b484e8228218)
+++ lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js	(.../monitorToolSummaryAdvanced.js)	(revision be513b5b177ecf4aa4c83b1725fe3c4dd5113081)
@@ -1,9 +1,11 @@
 
 // Toggles whether to display advanced options in monitor summary for tools
+// TODO remove method once bootstrapping is completed
 function toggleAdvancedOptionsVisibility(div, img, imageUrl)
 {
-	var treeClosedIcon = imageUrl + "/images/tree_closed.gif";
+	var treeClosedIcon = imageUrl + "/images/tree_closed.gif"; // 
 	var treeOpenIcon = imageUrl + "/images/tree_open.gif";
+
 	if (div.style.display == "block")
 	{
 		div.style.display = "none";
@@ -25,8 +27,14 @@
 			var date = new Date(eval(submissionDeadlineSettings.submissionDeadline));
 			$("#dateInfo").html( formatDate(date) );
 			
-			//open up date restriction area
-			toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'),submissionDeadlineSettings.lams);
+			if ( $("#restrictUsageDiv").hasClass("collapse") )  {
+				// new version - using the according
+				//open up date restriction area
+				$("#restrictUsageDiv").addClass("in");
+			} else {
+				// old code - remove once bootstrapping is completed.
+				toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'),submissionDeadlineSettings.lams);
+			}
 		}
 	});	
 	
@@ -54,7 +62,6 @@
 		
 		var url = submissionDeadlineSettings.setSubmissionDeadlineUrl + parameterDelimiter + "toolContentID=" + submissionDeadlineSettings.toolContentID + "&submissionDeadline=" +
 					+ date.getTime() + "&reqID=" + reqIDVar.getTime();
-
 		$.ajax({
 			url : url,
 			success : function() {