Index: lams_admin/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_admin/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_admin/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_central/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_central/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_central/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_gradebook/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_gradebook/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_learning/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_learning/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_monitoring/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_monitoring/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_assessment/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_assessment/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_chat/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_chat/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_daco/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_daco/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
===================================================================
diff -u -rdbb83a20e36def6c8cb9763e542714cef162e0a2 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java	(.../LearningController.java)	(revision dbb83a20e36def6c8cb9763e542714cef162e0a2)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java	(.../LearningController.java)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -97,16 +97,18 @@
 	SessionMap<String, Object> sessionMap = new SessionMap<>();
 	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
 	request.setAttribute(DokumaranConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
 
 	Long toolSessionId = WebUtil.readLongParam(request, DokumaranConstants.PARAM_TOOL_SESSION_ID);
 	Dokumaran dokumaran = dokumaranService.getDokumaranBySessionId(toolSessionId);
 	DokumaranSession session = dokumaranService.getDokumaranSessionBySessionId(toolSessionId);
 	sessionMap.put(DokumaranConstants.ATTR_TOOL_CONTENT_ID, dokumaran.getContentId());
+	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId);
+	sessionMap.put(AttributeNames.ATTR_MODE, mode);
 
 	// get back the dokumaran and item list and display them on page
 	DokumaranUser user = null;
 	boolean isFirstTimeAccess = false;
-	ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true);
 	// get back login user DTO
 	HttpSession ss = SessionManager.getSession();
 	UserDTO currentUserDto = null;
@@ -150,11 +152,9 @@
 	boolean hasEditRight =
 		!dokumaran.isUseSelectLeaderToolOuput() || dokumaran.isUseSelectLeaderToolOuput() && isUserLeader;
 	sessionMap.put(DokumaranConstants.ATTR_HAS_EDIT_RIGHT, hasEditRight);
-	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId);
 	sessionMap.put(DokumaranConstants.ATTR_REFLECTION_ON, dokumaran.isReflectOnActivity());
 	sessionMap.put(AttributeNames.ATTR_IS_LAST_ACTIVITY, dokumaranService.isLastActivity(toolSessionId));
 	sessionMap.put(DokumaranConstants.ATTR_DOKUMARAN, dokumaran);
-	sessionMap.put(AttributeNames.ATTR_MODE, mode);
 
 	// get the API key from the config table and add it to the session
 	String etherpadServerUrl = Configuration.get(ConfigurationKeys.ETHERPAD_SERVER_URL);
Index: lams_tool_doku/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_doku/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_doku/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_forum/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_forum/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_gmap/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_gmap/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_images/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_images/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_lamc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_lamc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java
===================================================================
diff -u -ra69390a3d4a6fdfe442a3a6e8b6e3c306b49b612 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java	(.../LearningController.java)	(revision a69390a3d4a6fdfe442a3a6e8b6e3c306b49b612)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java	(.../LearningController.java)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -181,6 +181,7 @@
 	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionID);
 
 	GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaService, qaContent);
+	request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 	generalLearnerFlowDTO.setUserUid(user.getQueUsrId().toString());
 	generalLearnerFlowDTO.setSessionMapID(sessionMapId);
 	generalLearnerFlowDTO.setToolSessionID(toolSessionID);
@@ -245,8 +246,6 @@
 	generalLearnerFlowDTO.setRemainingQuestionCount(generalLearnerFlowDTO.getTotalQuestionCount().toString());
 	generalLearnerFlowDTO.setInitialScreen(Boolean.TRUE.toString());
 
-	request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
-
 	/*
 	 * check if the mode is teacher
 	 */
Index: lams_tool_laqa/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_laqa/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_laqa/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_laqa/web/learning/defineLater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_laqa/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -1,22 +1,8 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
-<lams:html>
-<lams:head>
-	<lams:css />
-	<title><fmt:message key="activity.title" /></title>
-	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
-</lams:head>
-<body class="stripes">
-	<c:set scope="request" var="title">
-		<fmt:message key="activity.title" />
-	</c:set>
+<c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.sessionMapID]}" />
 
-	<lams:Page type="learner" title="${title}">
-
-		<lams:DefineLater defineLaterMessageKey="error.defineLater" />
-
-	<div id="footer"></div>
-	</lams:Page>
-	
-</body>
-</lams:html>
\ No newline at end of file
+<fmt:message key='activity.title' var="title"/>
+<lams:PageLearner title="${title}" toolSessionID="${sessionMap.toolSessionID}">!${sessionMap.toolSessionID}
+	<lams:DefineLater defineLaterMessageKey="error.defineLater" />
+</lams:PageLearner>
Index: lams_tool_larsrc/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_larsrc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_larsrc/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java
===================================================================
diff -u -r50b55d4d73fdfb8db59637203baf8960c94e05d0 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java	(.../LearningController.java)	(revision 50b55d4d73fdfb8db59637203baf8960c94e05d0)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java	(.../LearningController.java)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -72,16 +72,15 @@
 
 	Leaderselection content = session.getLeaderselection();
 	request.setAttribute(LeaderselectionConstants.ATTR_CONTENT, content);
+	// set mode, toolSessionID and LeaderselectionDTO
+	request.setAttribute("mode", mode.toString());
+	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId);
 
 	// check defineLater
 	if (content.isDefineLater()) {
 	    return "pages/learning/defineLater";
 	}
 
-	// set mode, toolSessionID and LeaderselectionDTO
-	request.setAttribute("mode", mode.toString());
-	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId);
-
 	// Set the content in use flag.
 	if (!content.isContentInUse()) {
 	    content.setContentInUse(true);
Index: lams_tool_leader/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_leader/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_leader/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_leader/web/pages/learning/defineLater.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_leader/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_leader/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -1,41 +1,7 @@
 <!DOCTYPE html>
-
 <%@ 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/>
-		<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet" />
-		<style type="text/css">
-	    	.dialog{display: none;}
-	    	.ui-dialog-titlebar-close{display: none;}
-	    	.ui-widget-overlay{opacity:0.9;}
-	    </style>
-	
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-		<lams:JSImport src="includes/javascript/common.js" />
-		<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
+<fmt:message key='activity.title' var="title"/>
+<lams:PageLearner title="${title}" toolSessionID="${toolSessionID}">
+	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
+</lams:PageLearner>
Index: lams_tool_mindmap/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_mindmap/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_mindmap/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java
===================================================================
diff -u -ref5bed2f62785ca5cdb668d9f1e8fbf4f0256dff -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java	(.../LearningController.java)	(revision ef5bed2f62785ca5cdb668d9f1e8fbf4f0256dff)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java	(.../LearningController.java)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -135,6 +135,8 @@
 	}
 
 	if (isFlagSet(nbContent, NoticeboardConstants.FLAG_DEFINE_LATER)) {
+	    request.setAttribute(NoticeboardConstants.TOOL_SESSION_ID, toolSessionID);
+	    request.setAttribute(NoticeboardConstants.TITLE, nbContent.getTitle());
 	    return "defineLater";
 	}
 
Index: lams_tool_nb/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_nb/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_nb/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_nb/web/defineLater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_nb/web/defineLater.jsp	(.../defineLater.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/defineLater.jsp	(.../defineLater.jsp)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -1,24 +1,7 @@
 <!DOCTYPE html>
 <%@ include file="/includes/taglibs.jsp"%>
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
 
-<lams:html>
-<lams:head>
-	<lams:css />
-	<title><fmt:message key="activity.title"/></title>
-	<script src="${lams}includes/javascript/jquery.js"></script>
-	<script src="${lams}includes/javascript/bootstrap.min.js" type="text/javascript"></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>
-	
-</lams:html>
+<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
Index: lams_tool_notebook/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_notebook/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_notebook/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_pixlr/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_pixlr/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_preview/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_preview/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java
===================================================================
diff -u -rf744562c66dd81d53ef8ddf2403368e27c8c646d -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java	(.../LearningController.java)	(revision f744562c66dd81d53ef8ddf2403368e27c8c646d)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java	(.../LearningController.java)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -138,6 +138,7 @@
 	sessionMap.put(AttributeNames.PARAM_MODE, mode);
 	sessionMap.put(SbmtConstants.ATTR_TITLE, content.getTitle());
 	sessionMap.put(SbmtConstants.ATTR_INSTRUCTION, content.getInstruction());
+	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionID);
 
 	// if content in use, return special page.
 	if (content.isDefineLater()) {
@@ -182,7 +183,6 @@
 	// check whehter finish lock is on/off
 	boolean lock = content.isLockOnFinished() && learner.isFinished();
 
-	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionID);
 	sessionMap.put(SbmtConstants.ATTR_FINISH_LOCK, lock);
 	sessionMap.put(SbmtConstants.ATTR_LOCK_ON_FINISH, content.isLockOnFinished());
 	sessionMap.put(SbmtConstants.ATTR_USE_SEL_LEADER, content.isUseSelectLeaderToolOuput());
Index: lams_tool_sbmt/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -re2346bcbf640668c01dad29b3ccb2e34d10b4d85 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_sbmt/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision e2346bcbf640668c01dad29b3ccb2e34d10b4d85)
+++ lams_tool_sbmt/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,12 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="alert alert-info shadow">
-	<fmt:message key="${defineLaterMessageKey}" />
-</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
 
-<div class="activity-bottom-buttons">
-	<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3">
-		<fmt:message key="${buttonTryAgainKey}" />
-	</a>
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
+	</div>
 </div>
\ No newline at end of file
Index: lams_tool_sbmt/web/learner/definelater.jsp
===================================================================
diff -u -rc508d4130028a481087f0a08d6987713ab55239d -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_sbmt/web/learner/definelater.jsp	(.../definelater.jsp)	(revision c508d4130028a481087f0a08d6987713ab55239d)
+++ lams_tool_sbmt/web/learner/definelater.jsp	(.../definelater.jsp)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -1,15 +1,8 @@
 <!DOCTYPE html>
 <%@ 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}" >
-
-	<div class="container-lg ">
-
-		<div class="d-flex justify-content-center">
-			<div class="p-2"><lams:DefineLater /></div>
-		</div>
-
-	</div>
-
+	<lams:DefineLater />
 </lams:PageLearner>
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_scratchie/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_scratchie/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_scratchie/web/pages/learning/definelater.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_scratchie/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -1,22 +1,8 @@
 <!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>
-
-<c:set var="title">
-	<fmt:message key="activity.title" />
-</c:set>
-
-<body class="stripes">
-	<lams:Page type="learner" title="${title}">
-		<lams:DefineLater />
-		</div>
-		<div id="footer"></div>
-	</lams:Page>
-</body>
-</lams:html>
+<fmt:message key='activity.title' var="title"/>
+<lams:PageLearner title="${title}" toolSessionID="${sessionMap.toolSessionID}">
+	<lams:DefineLater />
+</lams:PageLearner>
Index: lams_tool_scribe/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_scribe/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_scribe/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_spreadsheet/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_survey/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_survey/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_task/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_task/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_vote/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_vote/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_whiteboard/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_whiteboard/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_whiteboard/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_wiki/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_wiki/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_tool_zoom/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_tool_zoom/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file
Index: lams_www/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -ra21e768a73d42a3f0389aea1c5cd6a9d49387664
--- lams_www/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_www/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision a21e768a73d42a3f0389aea1c5cd6a9d49387664)
@@ -35,11 +35,10 @@
 <%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ 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"%>
+<%@ attribute name="defineLaterMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="buttonTryAgainKey" required="false" rtexprvalue="true"%>
 
 <%-- Default value for I18N keys --%>
 <c:if test="${empty defineLaterMessageKey}">
@@ -49,18 +48,14 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<div class="row no-gutter">
-	<div
-		class="col-12 col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
-		<div class="alert alert-info">
-			<fmt:message key="${defineLaterMessageKey}" />
-		</div>
+<div class="container-lg">
+	<lams:Alert5 type="info" id="define-later-info" close="false">
+		<fmt:message key="${defineLaterMessageKey}" />
+	</lams:Alert5>
+
+	<div class="activity-bottom-buttons">
+		<a id="finishButton" href="javascript:location.reload(true);" class="btn btn-primary mt-3"> 
+			<fmt:message key="${buttonTryAgainKey}" />
+		</a>
 	</div>
-</div>
-<div class="row no-gutter">
-	<div class="col-12 col-xs-12">
-		<a href="javascript:location.reload(true);"
-			class="btn btn-primary pull-right voffset5"><fmt:message
-				key="${buttonTryAgainKey}" /></a>
-	</div>
 </div>
\ No newline at end of file