Index: lams_admin/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_admin/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_admin/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_admin/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_admin/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_admin/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_central/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_central/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
+++ lams_central/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_central/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_central/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
+++ lams_central/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_gradebook/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_gradebook/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_gradebook/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_gradebook/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_gradebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_gradebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_learning/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_learning/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_learning/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_learning/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_learning/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_learning/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_monitoring/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_monitoring/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_monitoring/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_monitoring/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_monitoring/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_monitoring/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_assessment/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_assessment/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_assessment/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_assessment/web/pages/learning/definelater.jsp
===================================================================
diff -u -rb688f36c54d742b7aaf6311323e5da98d7435f09 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_assessment/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision b688f36c54d742b7aaf6311323e5da98d7435f09)
+++ lams_tool_assessment/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -2,6 +2,4 @@
 <%@include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<lams:PageLearner title="${sessionMap.title}" toolSessionID="${sessionMap.toolSessionID}">
-	<lams:DefineLater/>
-</lams:PageLearner>
+<lams:DefineLater toolSessionID="${sessionMap.toolSessionID}"/>
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningController.java
===================================================================
diff -u -rfe0eeacb777596f33a8f05f06c36f95c4b473d8e -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningController.java	(.../LearningController.java)	(revision fe0eeacb777596f33a8f05f06c36f95c4b473d8e)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningController.java	(.../LearningController.java)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -88,6 +88,7 @@
 
 	// check defineLater
 	if (chat.isDefineLater()) {
+	    request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionID);
 	    return "pages/learning/defineLater";
 	}
 
Index: lams_tool_chat/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_chat/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_chat/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_chat/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_chat/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_chat/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_chat/web/pages/learning/defineLater.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_chat/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_chat/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,41 +1,5 @@
 <!DOCTYPE html>
+<%@include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<%@ include file="/common/taglibs.jsp"%>
-
-<lams:html>
-		
-		<c:set var="lams"> <lams:LAMSURL /> </c:set>
-		<c:set var="tool"> <lams:WebAppURL /> </c:set>
-	
-	<lams:head>
-		<title>
-			<fmt:message key="activity.title" />
-		</title>
-		<link href="${tool}includes/css/chat.css" rel="stylesheet" type="text/css">
-		<link href="<lams:LAMSURL/>css/defaultHTML_learner.css" rel="stylesheet" type="text/css">
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-		<script type="text/javascript">
-		var MODE = "${MODE}", TOOL_SESSION_ID = '<c:out value="${param.toolSessionID}" />', APP_URL = '<lams:WebAppURL />', LEARNING_ACTION = "<c:url value='learning/learning.do'/>", LAMS_URL = '<lams:LAMSURL/>';
-		</script>
-		<lams:JSImport src="includes/javascript/portrait.js" />
-		<lams:JSImport src="includes/javascript/learning.js" relative="true" />
-		
-	</lams:head>
-	<body class="stripes">
-			
-						
-		<c:set var="title" scope="request">
-				<fmt:message key="activity.title" />
-		</c:set>		
-		
-		<lams:Page type="learner" title="${title}">
-			<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
-		</lams:Page>
-
-
-
-			
-	</body>
-</lams:html>
\ No newline at end of file
+<lams:DefineLater toolSessionID="${toolSessionID}" defineLaterLabel="message.defineLaterSet" />
Index: lams_tool_daco/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_daco/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_daco/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_daco/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_daco/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_daco/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_daco/web/pages/learning/definelater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_daco/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_daco/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,24 +1,5 @@
 <!DOCTYPE html>
-        
-
 <%@include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<lams:html>
-<lams:head>
-	<%@ include file="/common/header.jsp"%>
-	<meta http-equiv="refresh" content="60">
-</lams:head>
-
-<body class="stripes">
-	<c:set var="title"><fmt:message key="activity.title" /></c:set>
-	<lams:Page type="learner" title="${title}">
-		<lams:DefineLater />
-	</lams:Page>
-</body>
-</lams:html>
-
-
-
-
-
-
+<lams:DefineLater toolSessionID="${sessionMap.toolSessionID}"/>
Index: lams_tool_doku/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_doku/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_doku/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_doku/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_doku/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_doku/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_doku/web/pages/learning/definelater.jsp
===================================================================
diff -u -rb688f36c54d742b7aaf6311323e5da98d7435f09 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_doku/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision b688f36c54d742b7aaf6311323e5da98d7435f09)
+++ lams_tool_doku/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -2,6 +2,4 @@
 <%@include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<lams:PageLearner title="${sessionMap.title}" toolSessionID="${sessionMap.toolSessionID}">
-	<lams:DefineLater/>
-</lams:PageLearner>
\ No newline at end of file
+<lams:DefineLater toolSessionID="${sessionMap.toolSessionID}"/>
\ No newline at end of file
Index: lams_tool_doku/web/pages/learning/notconfigured.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_doku/web/pages/learning/notconfigured.jsp	(.../notconfigured.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/pages/learning/notconfigured.jsp	(.../notconfigured.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,21 +1,6 @@
 <!DOCTYPE html>
 <%@include file="/common/taglibs.jsp"%>
-<lams:html>
-<lams:head>
-	<%@ include file="/common/header.jsp"%>
-	<meta http-equiv="refresh" content="60">
-</lams:head>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<body class="stripes">
-	<c:set scope="request" var="title">
-		<fmt:message key="activity.title" />
-	</c:set>
+<lams:DefineLater toolSessionID="${sessionMap.toolSessionID}" defineLaterLabel="error.tool.is.not.configured" />
 
-	<lams:Page type="learner" title="${title}">
-
-		<fmt:message key="error.tool.is.not.configured" />
-
-	<div id="footer"></div>
-	</lams:Page>
-</body>
-</lams:html>
Index: lams_tool_forum/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_forum/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_forum/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_forum/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_forum/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_forum/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_forum/web/jsps/learning/definelater.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_forum/web/jsps/learning/definelater.jsp	(.../definelater.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_forum/web/jsps/learning/definelater.jsp	(.../definelater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,54 +1,5 @@
 <!DOCTYPE html>
-<%@ include file="/common/taglibs.jsp"%>
-<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
-<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
-<c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE)%></c:set>
-<c:set var="EXE_FILE_TYPES"><%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%></c:set>
-<c:set var="lams"><lams:LAMSURL /></c:set>
-<c:set var="tool"><lams:WebAppURL /></c:set>
-<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
+<%@include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<lams:html>
-	<lams:head>
-		<title><fmt:message key="activity.title" /></title>
-
-		<!-- ********************  CSS ********************** -->
-
-		<lams:css />
-		<style media="screen,projection" type="text/css">
-			.info {
-				margin: 10px;
-			}
-		</style>
-		
-		<!-- ********************  javascript ********************** -->
-		<lams:JSImport src="includes/javascript/common.js" />
-		<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.treetable.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>		
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.jscroll.js"></script>
-		<lams:JSImport src="includes/javascript/upload.js" />
-		
-		<script type="text/javascript">
-			var removeItemAttachmentUrl = "<lams:WebAppURL />learning/deleteAttachment.do";
-			var warning = '<fmt:message key="warn.minimum.number.characters" />';
-			var LABEL_MAX_FILE_SIZE = '<fmt:message key="errors.maxfilesize"><param>{0}</param></fmt:message>';
-			var LABEL_NOT_ALLOWED_FORMAT = '<fmt:message key="error.attachment.executable"/>';	
-			var EXE_FILE_TYPES = '${EXE_FILE_TYPES}';
-			var UPLOAD_FILE_MAX_SIZE = '${UPLOAD_FILE_MAX_SIZE}';
-		</script>
-		<script type="text/javascript" src="${tool}includes/javascript/learner.js"></script>	
-		
-	</lams:head>
-	
-	<body class="stripes">
-		<c:set var="title"><fmt:message key="activity.title" /></c:set>
-		
-		<lams:Page type="learner" title="${title}">
-			<lams:DefineLater />
-		</lams:Page>
-	</body>
-</lams:html>
\ No newline at end of file
+<lams:DefineLater toolSessionID="${sessionMap.toolSessionID}"/>
Index: lams_tool_gmap/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_gmap/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_gmap/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_images/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_images/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_images/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_images/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_images/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_images/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_images/web/pages/learning/definelater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_images/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,21 +1,4 @@
 <!DOCTYPE html>
 <%@include file="/common/taglibs.jsp"%>
 
-<lams:html>
-<lams:head>
-	<%@ include file="/common/header.jsp"%>
-</lams:head>
-
-<body class="stripes">
-	<c:set scope="request" var="title">
-		<fmt:message key="activity.title" />
-	</c:set>
-	<lams:Page type="learner" title="${title}">
-	
-		<lams:DefineLater />
-		
-		<div id="footer"></div>
-	
-	</lams:Page>
-</body>
-</lams:html>
+<lams:DefineLater toolSessionID="${toolSessionID}"/>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_imscc/web/pages/learning/definelater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_imscc/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_imscc/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,19 +1,4 @@
 <!DOCTYPE html>
 <%@include file="/common/taglibs.jsp"%>
 
-<lams:html>
-<lams:head>
-	<%@ include file="/common/header.jsp"%>
-	<meta http-equiv="refresh" content="60">
-</lams:head>
-
-<body class="stripes">
-
-	<c:set scope="request" var="title">
-		<fmt:message key="activity.title" />
-	</c:set>
-	<lams:Page type="learner" title="${title}">
-		<lams:DefineLater />
-	</lams:Page>
-</body>
-</lams:html>
+<lams:DefineLater toolSessionID="${toolSessionID}" defineLaterLabel="error.tool.is.not.configured" />
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_lamc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_lamc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_lamc/web/learning/defineLater.jsp
===================================================================
diff -u -rb688f36c54d742b7aaf6311323e5da98d7435f09 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_lamc/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision b688f36c54d742b7aaf6311323e5da98d7435f09)
+++ lams_tool_lamc/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,4 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
 
-<lams:PageLearner title="${content.title}" toolSessionID="${toolSessionID}" >
-	<lams:DefineLater defineLaterMessageKey="error.defineLater"/>
-</lams:PageLearner>
\ No newline at end of file
+<lams:DefineLater toolSessionID="${toolSessionID}" defineLaterLabel="error.defineLater"/>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_laqa/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_laqa/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_laqa/web/learning/defineLater.jsp
===================================================================
diff -u -rb688f36c54d742b7aaf6311323e5da98d7435f09 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_laqa/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision b688f36c54d742b7aaf6311323e5da98d7435f09)
+++ lams_tool_laqa/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -2,6 +2,5 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.sessionMapID]}" />
 
-<lams:PageLearner title="${generalLearnerFlowDTO.activityTitle}" toolSessionID="${sessionMap.toolSessionID}">
-	<lams:DefineLater defineLaterMessageKey="error.defineLater" />
-</lams:PageLearner>
+<lams:DefineLater toolSessionID="${sessionMap.toolSessionID}" defineLaterLabel="error.defineLater" />
+
Index: lams_tool_larsrc/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_larsrc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_larsrc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_larsrc/web/pages/learning/definelater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_larsrc/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,21 +1,4 @@
 <!DOCTYPE html>
 <%@include file="/common/taglibs.jsp"%>
-<lams:html>
-<lams:head>
-	<%@ include file="/common/header.jsp"%>
-	<meta http-equiv="refresh" content="60">
-</lams:head>
 
-<body class="stripes">
-	<c:set scope="request" var="title">
-		<fmt:message key="activity.title" />
-	</c:set>
-
-	<lams:Page type="learner" title="${title}">
-
-		<lams:DefineLater/>
-
-	<div id="footer"></div>
-	</lams:Page>
-</body>
-</lams:html>
\ No newline at end of file
+<lams:DefineLater toolSessionID="${toolSessionID}"/>
Index: lams_tool_leader/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_leader/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_leader/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_leader/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_leader/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_leader/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_leader/web/pages/learning/defineLater.jsp
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_leader/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_leader/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,7 +1,5 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
 
-<fmt:message key='activity.title' var="title"/>
-<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}">
-	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
-</lams:PageLearner>
+<lams:DefineLater toolSessionID="${toolSessionID}" defineLaterLabel="message.defineLaterSet" />
+
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java
===================================================================
diff -u -r844ffaca6d7137f02508f94278df450891baa480 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java	(.../LearningController.java)	(revision 844ffaca6d7137f02508f94278df450891baa480)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java	(.../LearningController.java)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -110,7 +110,6 @@
 	// TODO need to catch exceptions and handle errors.
 	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE,
 		LearningController.MODE_OPTIONAL);
-
 	Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
 
 	// Retrieve the session and content.
@@ -119,6 +118,7 @@
 	    throw new MindmapException("Cannot retrieve session with toolSessionID: " + toolSessionID);
 	}
 
+	learningForm.setToolSessionID(toolSessionID);
 	request.setAttribute(AttributeNames.ATTR_IS_LAST_ACTIVITY, mindmapService.isLastActivity(toolSessionID));
 
 	HttpSession ss = SessionManager.getSession();
@@ -159,7 +159,6 @@
 		request);
 
 	if (mindmap.isGalleryWalkStarted()) {
-
 	    mindmapService.fillGalleryWalkRatings(mindmapDTO, mindmapUser.getUserId());
 	    return "pages/learning/galleryWalk";
 	}
@@ -169,9 +168,6 @@
 	    return "pages/learning/defineLater";
 	}
 
-	// set mode, toolSessionID and MindmapDTO
-	learningForm.setToolSessionID(toolSessionID);
-
 	// Set the content in use flag.
 	if (!mindmap.isContentInUse()) {
 	    mindmap.setContentInUse(true);
Index: lams_tool_mindmap/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_mindmap/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_mindmap/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_mindmap/web/pages/learning/defineLater.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_mindmap/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_mindmap/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,32 +1,5 @@
 <!DOCTYPE html>
-<%@ include file="/common/taglibs.jsp"%>
+<%@include file="/common/taglibs.jsp"%>
 
-	<lams:html>
-		<c:set var="lams"> <lams:LAMSURL /> </c:set>
-		<c:set var="tool"> 	<lams:WebAppURL />	</c:set>
-	
-	<lams:head>  
-		<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
-		<title>
-			<fmt:message key="activity.title" />
-		</title>
-		<lams:css/>
-	
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
-		<lams:JSImport src="includes/javascript/common.js" />
-	</lams:head>
+<lams:DefineLater toolSessionID="${learningForm.toolSessionID}" defineLaterLabel="message.defineLaterSet" />
 
-	<body class="stripes">
-				<c:set scope="request" var="title">
-			<fmt:message key="activity.title" />
-		</c:set>
-		<lams:Page type="learner" title="${title}">
-			<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
-		</lams:Page>
-
-
-		<div class="footer">
-		</div>					
-	</body>
-</lams:html>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_nb/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_nb/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_nb/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_nb/web/defineLater.jsp
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_nb/web/defineLater.jsp	(.../defineLater.jsp)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_nb/web/defineLater.jsp	(.../defineLater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,7 +1,4 @@
 <!DOCTYPE html>
 <%@ include file="/includes/taglibs.jsp"%>
 
-<fmt:message key='activity.title' var="title"/>
-<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}">
-	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
-</lams:PageLearner>
\ No newline at end of file
+<lams:DefineLater toolSessionID="${toolSessionID}" defineLaterLabel="message.defineLaterSet" />
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_notebook/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_notebook/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_notebook/web/pages/learning/defineLater.jsp
===================================================================
diff -u -rb688f36c54d742b7aaf6311323e5da98d7435f09 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_notebook/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision b688f36c54d742b7aaf6311323e5da98d7435f09)
+++ lams_tool_notebook/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -2,11 +2,10 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<lams:PageLearner title="${notebookDTO.title}" toolSessionID="${messageForm.toolSessionID}">
-	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
-</lams:PageLearner>
+<lams:DefineLater toolSessionID="${messageForm.toolSessionID}" defineLaterLabel="message.defineLaterSet" />
 
 
 
 
 
+
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java
===================================================================
diff -u -r3ee06bc1b00b1673399c1871a73cfa1d8ec2c0db -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java	(.../LearningController.java)	(revision 3ee06bc1b00b1673399c1871a73cfa1d8ec2c0db)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java	(.../LearningController.java)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -103,16 +103,16 @@
 
 	Pixlr pixlr = pixlrSession.getPixlr();
 
-	// check defineLater
-	if (pixlr.isDefineLater()) {
-	    return "pages/learning/defineLater";
-	}
-
 	// set mode, toolSessionID and PixlrDTO
 	request.setAttribute("mode", mode.toString());
 	request.setAttribute("toolSessionID", toolSessionID);
 	learningForm.setToolSessionID(toolSessionID);
 
+	// check defineLater
+	if (pixlr.isDefineLater()) {
+	    return "pages/learning/defineLater";
+	}
+
 	PixlrDTO pixlrDTO = new PixlrDTO(pixlr);
 	request.setAttribute("pixlrDTO", pixlrDTO);
 
Index: lams_tool_pixlr/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_pixlr/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_pixlr/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_pixlr/web/pages/learning/defineLater.jsp
===================================================================
diff -u -r46e01bf046d755f571ba59957ac869c086bad58c -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_pixlr/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 46e01bf046d755f571ba59957ac869c086bad58c)
+++ lams_tool_pixlr/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,38 +1,5 @@
 <!DOCTYPE html>
-<%@ include file="/common/taglibs.jsp"%>
+<%@include file="/common/taglibs.jsp"%>
 
-<lams:html>
-	<c:set var="lams">
-	<lams:LAMSURL />
-	</c:set>
-	<c:set var="tool">
-		<lams:WebAppURL />
-	</c:set>
-	
-	<lams:head>  
-		<title>
-			<fmt:message key="activity.title" />
-		</title>
-		<lams:css/>
-	
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
-		<script type="text/javascript" src="${tool}includes/javascript/common.js"></script>
-		<script type="text/javascript" src="${tool}includes/javascript/learning.js"></script>
-	</lams:head>
-	<body class="stripes" onload="init()">
-		<c:set scope="request" var="title">
-			<fmt:message key="activity.title" />
-		</c:set>
-		<lams:Page type="learner" title="${title}">
-			<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
-		</lams:Page>
-		<div class="footer">
-		</div>					
-	</body>
-</lams:html>
+<lams:DefineLater toolSessionID="${toolSessionID}" defineLaterLabel="message.defineLaterSet" />
 
-
-
-
-
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java
===================================================================
diff -u -r8ef9a217baba82b7b3decef6eeb21958bdba4d6a -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java	(.../LearningController.java)	(revision 8ef9a217baba82b7b3decef6eeb21958bdba4d6a)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java	(.../LearningController.java)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -97,7 +97,6 @@
 
 	// save toolContentID into HTTPSession
 	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
-
 	Long sessionId = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID));
 
 	request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
Index: lams_tool_preview/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_preview/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_preview/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_preview/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_preview/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_preview/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_preview/web/pages/learning/definelater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_preview/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,28 +1,14 @@
 <!DOCTYPE html>
 <%@include file="/common/taglibs.jsp"%>
 
-<lams:html>
-<lams:head>
-	<%@ include file="/common/header.jsp"%>
-		<c:choose>
-		<c:when test="${creatingUsers == 'true'}"><meta http-equiv="refresh" content="2"></c:when>
-		<c:otherwise><meta http-equiv="refresh" content="60"></c:otherwise>
-		</c:choose>
-</lams:head>
+<c:choose>
+	<c:when test="${creatingUsers == 'true'}">
+		<c:set var="refresh">2</c:set>
+		<c:set var="defineLaterLabel">creating.users.message</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="refresh">60</c:set>
+	</c:otherwise>
+</c:choose>
 
-<body class="stripes">
-	<c:set scope="request" var="title">
-		<fmt:message key="activity.title" />
-	</c:set>
-
-	<lams:Page type="learner" title="${title}">
-		<c:choose>
-		<c:when test="${creatingUsers == 'true'}"><lams:DefineLater defineLaterMessageKey="creating.users.message"></lams:DefineLater></c:when>
-		<c:otherwise><lams:DefineLater /></c:otherwise>
-		</c:choose>
-	</lams:Page>
-
-	<div id="footer"></div>
-
-</body>
-</lams:html>
+<lams:DefineLater toolSessionID="${toolSessionId}" defineLaterLabel="${defineLaterLabel}" refresh="${refresh}"/>
Index: lams_tool_sbmt/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_sbmt/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_sbmt/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_sbmt/web/learner/definelater.jsp
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_sbmt/web/learner/definelater.jsp	(.../definelater.jsp)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_sbmt/web/learner/definelater.jsp	(.../definelater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -2,7 +2,4 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<fmt:message key='activity.title' var="title"/>
-<lams:PageLearner title="${title}" toolSessionID="${sessionMap.toolSessionID}" >
-	<lams:DefineLater />
-</lams:PageLearner>
\ No newline at end of file
+<lams:DefineLater toolSessionID="${sessionMap.toolSessionID}"/>
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_scratchie/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_scratchie/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_scratchie/web/pages/learning/definelater.jsp
===================================================================
diff -u -ra21e768a73d42a3f0389aea1c5cd6a9d49387664 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_scratchie/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
+++ lams_tool_scratchie/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -2,7 +2,4 @@
 <%@include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<fmt:message key='activity.title' var="title"/>
-<lams:PageLearner title="${title}" toolSessionID="${sessionMap.toolSessionID}">
-	<lams:DefineLater />
-</lams:PageLearner>
+<lams:DefineLater toolSessionID="${sessionMap.toolSessionID}"/>
\ No newline at end of file
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/controller/LearningController.java
===================================================================
diff -u -r65278ffe9e8165b8366667647ee0568c5b0ba615 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/controller/LearningController.java	(.../LearningController.java)	(revision 65278ffe9e8165b8366667647ee0568c5b0ba615)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/controller/LearningController.java	(.../LearningController.java)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -81,7 +81,6 @@
 	// 'toolSessionID' and 'mode' paramters are expected to be present.
 	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE,
 		LearningController.MODE_OPTIONAL);
-
 	Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
 
 	scribeService.createReportEntry(toolSessionID);
@@ -92,6 +91,9 @@
 	    throw new ScribeException("Cannot retrieve session with toolSessionID" + toolSessionID);
 	}
 	Scribe scribe = scribeSession.getScribe();
+	
+	learningform.setToolSessionID(scribeSession.getSessionId());
+	request.setAttribute("MODE", mode.toString());
 
 	// check defineLater
 	if (scribe.isDefineLater()) {
@@ -125,8 +127,6 @@
 	}
 
 	// setup dto's forms and attributes.
-	learningform.setToolSessionID(scribeSession.getSessionId());
-	request.setAttribute("MODE", mode.toString());
 	setupDTOs(request, scribeSession, scribeUser);
 
 	// check force complete
Index: lams_tool_scribe/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_scribe/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_scribe/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_scribe/web/pages/learning/defineLater.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_scribe/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_scribe/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,35 +1,5 @@
 <!DOCTYPE html>
-	
+<%@include file="/common/taglibs.jsp"%>
 
-<%@ include file="/common/taglibs.jsp"%>
+<lams:DefineLater toolSessionID="${learningForm.toolSessionID}" defineLaterLabel="message.defineLaterSet" />
 
-<lams:html>
-	<c:set var="lams">
-		<lams:LAMSURL />
-	</c:set>
-	<c:set var="tool">
-		<lams:WebAppURL />
-	</c:set>
-	
-	<lams:head>
-		<title>
-			<fmt:message key="activity.title" />
-		</title>
-		<lams:css/>
-		
-		<lams:JSImport src="includes/javascript/common.js" />
-		<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
-	
-	</lams:head>
-	<body class="stripes">
-	<c:set var="title" scope="request">
-		<fmt:message key="activity.title" />
-	</c:set>
-	
-	<lams:Page type="learner" title="${title}">
-		<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
-	</lams:Page>
-	</body>
-</lams:html>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_spreadsheet/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_spreadsheet/web/pages/learning/definelater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_spreadsheet/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,18 +1,5 @@
 <!DOCTYPE html>
-
 <%@include file="/common/taglibs.jsp"%>
 
-<lams:html>
-<lams:head>
-	<%@ include file="/common/header.jsp"%>
-	<meta http-equiv="refresh" content="60">
-</lams:head>
+<lams:DefineLater toolSessionID="${toolSessionID}"/>
 
-<c:set var="title"><fmt:message key="activity.title"/></c:set>
-
-<body class="stripes">
-	<lams:Page type="learner" title="${title}">
-		<lams:DefineLater />
-	</lams:Page>
-</body>
-</lams:html>
Index: lams_tool_survey/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_survey/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_survey/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_survey/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_survey/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_survey/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_survey/web/pages/learning/definelater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_survey/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,20 +1,6 @@
 <!DOCTYPE html>
-        
-
 <%@include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<lams:html>
-<lams:head>
-	<%@ include file="/common/header.jsp"%>
-	<meta http-equiv="refresh" content="60">
-</lams:head>
+<lams:DefineLater toolSessionID="${sessionMap.toolSessionID}"/>
 
-<c:set var="title">
-	<fmt:message key="activity.title" />
-</c:set>
-<body class="stripes">
-	<lams:Page type="learner" title="${title}">
-		<lams:DefineLater />
-	</lams:Page>
-</body>
-</lams:html>
Index: lams_tool_task/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_task/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_task/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_task/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_task/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_task/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_task/web/pages/learning/definelater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_task/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,23 +1,5 @@
 <!DOCTYPE html>
-
-
 <%@include file="/common/taglibs.jsp"%>
 
-<lams:html>
-<lams:head>
-	<%@ include file="/common/header.jsp"%>
-	<meta http-equiv="refresh" content="60">
-</lams:head>
+<lams:DefineLater toolSessionID="${toolSessionID}"/>
 
-<c:set var="title">
-	<fmt:message key="activity.title" />
-</c:set>
-
-<body class="stripes">
-	<lams:Page type="learner" title="${title}">
-		<lams:DefineLater />
-
-		<div id="footer"></div>
-	</lams:Page>
-</body>
-</lams:html>
Index: lams_tool_vote/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_vote/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_vote/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_vote/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_vote/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_vote/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_vote/web/learning/defineLater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_vote/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,35 +1,6 @@
 <!DOCTYPE html>
-<%@ include file="/common/taglibs.jsp"%>
+<%@include file="/common/taglibs.jsp"%>
 
-<c:set scope="request" var="lams">
-	<lams:LAMSURL />
-</c:set>
-<c:set scope="request" var="tool">
-	<lams:WebAppURL />
-</c:set>
+<lams:DefineLater toolSessionID="${voteLearningForm.toolSessionID}" defineLaterLabel="error.defineLater" />
 
-<lams:html>
-<lams:head>
-	<lams:css />
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-	<title><fmt:message key="activity.title" /></title>
-</lams:head>
 
-<body class="stripes">
-	<c:set var="title" scope="request">
-		<fmt:message key="activity.title" />
-	</c:set>
-	<lams:Page type="learner" title="${title}">
-		<lams:DefineLater defineLaterMessageKey="error.defineLater" />
-		<div id="footer"></div>
-	</lams:Page>
-</body>
-</lams:html>
-
-
-
-
-
-
-
-
Index: lams_tool_whiteboard/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_whiteboard/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_whiteboard/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_wiki/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_wiki/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_wiki/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_tool_wiki/web/pages/learning/defineLater.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_wiki/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_wiki/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,37 +1,5 @@
 <!DOCTYPE html>
-            
+<%@include file="/common/taglibs.jsp"%>
 
-<%@ include file="/common/taglibs.jsp"%>
+<lams:DefineLater toolSessionID="${learningForm.toolSessionID}" defineLaterLabel="message.defineLaterSet" />
 
-<lams:html>
-		<c:set var="lams">
-		<lams:LAMSURL />
-	</c:set>
-	<c:set var="tool">
-		<lams:WebAppURL />
-	</c:set>
-	
-	<lams:head>  
-		<title>
-			<fmt:message key="activity.title" />
-		</title>
-		<lams:css/>
-	
-		<lams:JSImport src="includes/javascript/common.js" />
-		<lams:JSImport src="includes/javascript/wikiCommon.js" relative="true" />
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
-	</lams:head>
-
-	<body class="stripes">
-		<c:set var="title" scope="request">
-			<fmt:message key="activity.title" />
-		</c:set>
-		
-		<lams:Page type="learner" title="${title}">
-						<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
-		</lams:Page>
-		<div class="footer">
-		</div>					
-	</body>
-</lams:html>
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_zoom/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_zoom/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
Index: lams_www/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_www/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_www/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -37,25 +37,28 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
-
-<%-- Default value for I18N keys --%>
-<c:if test="${empty defineLaterMessageKey}">
-	<c:set var="defineLaterMessageKey" value="define.later.message" />
+<%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
+<c:if test="${empty refresh}">
+	<c:set var="refresh" value="60" />
 </c:if>
-<c:if test="${empty buttonTryAgainKey}">
-	<c:set var="buttonTryAgainKey" value="button.try.again" />
+<%@ attribute name="defineLaterLabel" required="false" rtexprvalue="true"%>
+<c:if test="${empty defineLaterLabel}">
+	<c:set var="defineLaterLabel" value="define.later.message" />
 </c:if>
 
-<div class="container-lg">
-	<lams:Alert5 type="info" id="define-later-info" close="false">
-		<fmt:message key="${defineLaterMessageKey}" />
-	</lams:Alert5>
+<fmt:message var="title" key='activity.title'/>
 
-	<div class="activity-bottom-buttons">
-		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
-			<fmt:message key="${buttonTryAgainKey}" />
-		</a>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}" refresh="${refresh}">
+	<div class="container-lg">
+		<lams:Alert5 type="info" id="define-later-info" close="false">
+			<fmt:message key="${defineLaterLabel}" />
+		</lams:Alert5>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" id="finishButton" onclick="javascript:location.reload(true);" class="btn btn-primary btn-icon-refresh mt-3"> 
+				<fmt:message key="button.try.again" />
+			</button>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+</lams:PageLearner>
Index: lams_www/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rdd51078148f6ee1a3b5308e63db60cce139244a2 -r561bb65551f1a629adc974c1fb2d48e42e764115
--- lams_www/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision dd51078148f6ee1a3b5308e63db60cce139244a2)
+++ lams_www/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 561bb65551f1a629adc974c1fb2d48e42e764115)
@@ -1,6 +1,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
@@ -31,6 +32,9 @@
                 </c:otherwise>
             </c:choose>
         </title>
+        <c:if test="${not empty refresh}">
+        	<meta http-equiv="refresh" content="${refresh}">
+        </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
         <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">