Index: lams_admin/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_admin/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_admin/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_admin/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_admin/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_admin/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_central/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r55b53b0f50a1fb7b81b6759406cbe11c00417615 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_central/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 55b53b0f50a1fb7b81b6759406cbe11c00417615)
+++ lams_central/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -36,15 +36,15 @@
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
-<c:if test="${empty titleLabel}">
-	<c:set var="titleLabel" value="monitor.summary.date.restriction" />
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
 </c:if>
 
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	<fmt:message key="${titleLabel}" />
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_gradebook/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_gradebook/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_gradebook/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_gradebook/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_gradebook/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_gradebook/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_learning/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_learning/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_learning/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_learning/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_learning/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_learning/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_monitoring/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_monitoring/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_monitoring/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_monitoring/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_monitoring/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_monitoring/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_assessment/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r55b53b0f50a1fb7b81b6759406cbe11c00417615 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_assessment/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 55b53b0f50a1fb7b81b6759406cbe11c00417615)
+++ lams_tool_assessment/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -36,15 +36,15 @@
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
-<c:if test="${empty titleLabel}">
-	<c:set var="titleLabel" value="monitor.summary.date.restriction" />
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
 </c:if>
 
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	<fmt:message key="${titleLabel}" />
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_chat/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_chat/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_chat/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_chat/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_chat/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_chat/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_daco/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_daco/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_daco/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_daco/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_daco/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_daco/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_doku/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_doku/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_doku/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_doku/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_doku/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_doku/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_forum/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb3dd7f3d65e4eec044f69c253259b5ff743b6700 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_forum/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b3dd7f3d65e4eec044f69c253259b5ff743b6700)
+++ lams_tool_forum/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_forum/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r55b53b0f50a1fb7b81b6759406cbe11c00417615 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_forum/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 55b53b0f50a1fb7b81b6759406cbe11c00417615)
+++ lams_tool_forum/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -36,15 +36,15 @@
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
-<c:if test="${empty titleLabel}">
-	<c:set var="titleLabel" value="monitor.summary.date.restriction" />
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
 </c:if>
 
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	<fmt:message key="${titleLabel}" />
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_gmap/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_gmap/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_gmap/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_gmap/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_gmap/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_gmap/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_images/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_images/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_images/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_images/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_images/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_images/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_imscc/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_imscc/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_imscc/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_imscc/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_imscc/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_imscc/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_lamc/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_lamc/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_lamc/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_lamc/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_lamc/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_lamc/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_laqa/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_laqa/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_laqa/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_laqa/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_laqa/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_laqa/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_larsrc/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_larsrc/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_larsrc/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_larsrc/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_larsrc/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_larsrc/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_leader/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_leader/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_leader/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_leader/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_leader/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_leader/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_mindmap/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_mindmap/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_mindmap/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_mindmap/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_mindmap/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_mindmap/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_nb/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_nb/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_nb/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_nb/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_nb/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_nb/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_notebook/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_notebook/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_notebook/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_notebook/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_notebook/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_notebook/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_pixlr/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_pixlr/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_pixlr/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_pixlr/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_pixlr/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_pixlr/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_preview/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_preview/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_preview/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_preview/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_preview/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_preview/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_sbmt/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_sbmt/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_sbmt/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_sbmt/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_sbmt/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_sbmt/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_scratchie/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r55b53b0f50a1fb7b81b6759406cbe11c00417615 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_scratchie/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 55b53b0f50a1fb7b81b6759406cbe11c00417615)
+++ lams_tool_scratchie/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -36,15 +36,15 @@
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
-<c:if test="${empty titleLabel}">
-	<c:set var="titleLabel" value="monitor.summary.date.restriction" />
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
 </c:if>
 
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	<fmt:message key="${titleLabel}" />
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_scribe/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_scribe/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_scribe/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_scribe/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_scribe/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_scribe/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_spreadsheet/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_spreadsheet/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_spreadsheet/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_survey/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_survey/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_survey/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_survey/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_survey/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_survey/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_task/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_task/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_task/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_task/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_task/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_task/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_vote/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_vote/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_vote/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_vote/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_vote/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_vote/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_whiteboard/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_whiteboard/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_whiteboard/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_whiteboard/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_whiteboard/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_whiteboard/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_wiki/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_wiki/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_wiki/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_wiki/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_wiki/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_wiki/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_tool_zoom/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_zoom/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_zoom/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_tool_zoom/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_tool_zoom/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_tool_zoom/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>
 
Index: lams_www/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_www/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_www/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -127,20 +127,43 @@
 		  			</nav>
 	  			</c:if>
 
-	            <main class="p-3" id="component-main-content" tabindex="-1">
-	            	<c:if test="${showHeader}">
-						<div class="tab-content m-3" id="tabs-content">
-							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-						</div>
-						
-						<input type="hidden" name="currentTab" id="currentTab" />
-					</c:if>
-					
-	                <jsp:doBody/>
+	            <main id="component-main-content" class="px-1 py-3" tabindex="-1">
+	            	<c:choose>
+	            		<c:when test="${showHeader}">
+							<div class="container-main tab-content m-3" id="tabs-content">
+								<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+								<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+							</div>
+							
+							<input type="hidden" name="currentTab" id="currentTab" />
+	            		</c:when>
+	            		
+	            		<c:otherwise>
+			                <jsp:doBody/>
+	            		</c:otherwise>
+	            	</c:choose>
 	            </main>
 	        </div>
 	    </div>
+	    
+		<c:if test="${showHeader}">
+		    <div id="confirmationDialog" class="modal dialogContainer fade" tabindex="-1" role="dialog">
+		        <div class="modal-dialog  modal-dialog-centered">
+		            <div class="modal-content">
+		                <div class="modal-body">
+		                </div>
+		                <div class="modal-footer">
+		                    <button type="button" class="btn btn-secondary" id="confirmationDialogCancelButton">
+		                    	<fmt:message key='label.cancel'/>
+		                    </button>
+		                    <button type="button" class="btn btn-primary" id="confirmationDialogConfirmButton">
+		                    	<fmt:message key='label.confirm'/>
+		                    </button>
+		                </div>
+		            </div>
+		        </div>
+		    </div>
+		</c:if>
     </body>
 </lams:html>
Index: lams_www/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389 -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610
--- lams_www/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
+++ lams_www/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
@@ -23,25 +23,28 @@
 	 */
 
 	/**
-	 * AdvancedAccordian.tag
+	 *  RestrictedUsageAccordian.tag
 	 *	Author: Fiona Malikoff
 	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
-	 * Wiki: 
 	 */
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="titleLabel" required="false" rtexprvalue="true"%>
 <%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
 <%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty cssClass}">
+	<c:set var="cssClass" value="my-2" />
+</c:if>
+
 <div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
-	          	${title}
+	          	<fmt:message key="monitor.summary.date.restriction" />
     		</button>
         </h2>