Index: lams_central/web/css/defaultHTML_learner.css
===================================================================
diff -u -rcec85426b93b5ba3eff2c91ca2bf179ed478cffb -r65a41bd80f751917e945f17beb5f0d34926066ac
--- lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision cec85426b93b5ba3eff2c91ca2bf179ed478cffb)
+++ lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision 65a41bd80f751917e945f17beb5f0d34926066ac)
@@ -96,7 +96,6 @@
   background: url('/lams/images/css/light-fabric.jpg');
 }
 .sbox {
-  background-color: transparent;
   border-bottom: 2px solid rgba(221, 221, 221, 0.55);
   border-radius: 0px;
 }
Index: lams_central/web/less/defaultHTML_learner.less
===================================================================
diff -u -rcec85426b93b5ba3eff2c91ca2bf179ed478cffb -r65a41bd80f751917e945f17beb5f0d34926066ac
--- lams_central/web/less/defaultHTML_learner.less	(.../defaultHTML_learner.less)	(revision cec85426b93b5ba3eff2c91ca2bf179ed478cffb)
+++ lams_central/web/less/defaultHTML_learner.less	(.../defaultHTML_learner.less)	(revision 65a41bd80f751917e945f17beb5f0d34926066ac)
@@ -137,7 +137,6 @@
 }
 
 .sbox {
-	background-color: transparent;
 	border-bottom: 2px solid rgba(221, 221, 221, 0.55);
 	border-radius: 0px;
 }
Index: lams_tool_notebook/web/WEB-INF/tags/Alert.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/Alert.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/Alert.tag	(revision 65a41bd80f751917e945f17beb5f0d34926066ac)
@@ -0,0 +1,46 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%@ attribute name="close" required="false" rtexprvalue="true"%>
+<%@ attribute name="id" required="false" rtexprvalue="true"%>
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+
+<c:set var="idName" value="alert-${type}" />
+<c:if test="${not empty id}">
+	<c:set var="idName" value="${id}" />
+</c:if>
+
+<c:set var="alertType" value="info" />
+<c:set var="iconType" value="info-circle" />
+<c:choose>
+	<c:when test="${type == 'danger'}">
+		<c:set var="alertType" value="danger" />
+		<c:set var="iconType" value="times-circle" />
+	</c:when>
+	<c:when test="${type == 'success'}">
+		<c:set var="alertType" value="success" />
+		<c:set var="iconType" value="check-circle" />
+	</c:when>
+	<c:when test="${type == 'warning'}">
+		<c:set var="alertType" value="warning" />
+		<c:set var="iconType" value="exclamation-circle" />
+	</c:when>
+</c:choose>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-${alertType}" style="margin-bottom: 10px; padding: 8px">
+			<div class="media">
+				<div class="media-left">
+					<i class="fa fa-lg fa-${iconType} text-muted"></i>
+				</div>
+				<div class="media-body">
+					<c:if test="${close}">
+							<a href="#" class="close pull-right" data-dismiss="alert" aria-label="close">&times;</a>
+					</c:if>
+					<jsp:doBody />
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
Index: lams_tool_notebook/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rfef442a88ab05c91db8a551081c4abc060d4da5e -r65a41bd80f751917e945f17beb5f0d34926066ac
--- lams_tool_notebook/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision fef442a88ab05c91db8a551081c4abc060d4da5e)
+++ lams_tool_notebook/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 65a41bd80f751917e945f17beb5f0d34926066ac)
@@ -1,6 +1,6 @@
 
 <%
-	 /****************************************************************
+	/****************************************************************
 	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 	 * =============================================================
 	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
@@ -49,10 +49,18 @@
 	<c:set var="buttonTryAgainKey" value="button.try.again" />
 </c:if>
 
-<p>
-	<fmt:message key="${defineLaterMessageKey}" />
-</p>
-<div align="right" class="space-bottom-top">
-	<a href="javascript:location.reload(true);" class="button"><fmt:message
-			key="${buttonTryAgainKey}" /> </a>
+<div class="row no-gutter">
+	<div
+		class="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>
 </div>
+<div class="row no-gutter">
+	<div class="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_notebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	(revision 65a41bd80f751917e945f17beb5f0d34926066ac)
@@ -0,0 +1,36 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+
+<%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="style" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
+
+
+
+<div class="row no-gutter">
+	<div class="col-xs-12">
+		<div class="container" id="content">
+			<div class="panel panel-default panel-${type}-page">
+				<div class="panel-heading">
+					<c:if test="${not empty title}">
+						<div class="panel-title panel-${type}-title">
+							<c:out value="${title}" escapeXml="true" />
+							<c:if test="${not empty titleHelpURL}">
+								<a style="float: right" href="${titleHelpURL}" target="_new"><span class="help" style="margin: 0px"></span></a>
+							</c:if>
+						</div>
+					</c:if>
+					<c:if test="${not empty headingContent}">
+						<c:out value="${headingContent}" escapeXml="true" />
+					</c:if>
+				</div>
+				<div class="panel-body panel-${type}-body">
+					<jsp:doBody />
+				</div>
+			</div>
+		</div>
+		<! -- End content container -->
+	</div>
+</div>
Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r86a2855c49422f236ac31c35df38fa3c66220dcc -r65a41bd80f751917e945f17beb5f0d34926066ac
--- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 86a2855c49422f236ac31c35df38fa3c66220dcc)
+++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 65a41bd80f751917e945f17beb5f0d34926066ac)
@@ -440,6 +440,14 @@
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
+	    <name>Alert</name>
+		<path>/WEB-INF/tags/Alert.tag</path>
+   	</tag-file>  
+   	<tag-file>
+	    <name>Page</name>
+		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>  
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
Index: lams_tool_notebook/web/common/header.jsp
===================================================================
diff -u -r74b71c544bb3970571e885fd2e56fb22c9880f19 -r65a41bd80f751917e945f17beb5f0d34926066ac
--- lams_tool_notebook/web/common/header.jsp	(.../header.jsp)	(revision 74b71c544bb3970571e885fd2e56fb22c9880f19)
+++ lams_tool_notebook/web/common/header.jsp	(.../header.jsp)	(revision 65a41bd80f751917e945f17beb5f0d34926066ac)
@@ -1,12 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
-
 <c:set var="lams">
 	<lams:LAMSURL />
 </c:set>
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
-
 <lams:head>
 	<title>
 		<fmt:message key="activity.title" />
Index: lams_tool_notebook/web/common/learnerheader.jsp
===================================================================
diff -u -r74b71c544bb3970571e885fd2e56fb22c9880f19 -r65a41bd80f751917e945f17beb5f0d34926066ac
--- lams_tool_notebook/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 74b71c544bb3970571e885fd2e56fb22c9880f19)
+++ lams_tool_notebook/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 65a41bd80f751917e945f17beb5f0d34926066ac)
@@ -1,17 +1,16 @@
 <%@ include file="/common/taglibs.jsp"%>
-
 <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/common.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>
Index: lams_tool_notebook/web/layouts/defaultLayout.jsp
===================================================================
diff -u -r6a8b3b4d658228ef8358b4c59f7a68f27e60f94d -r65a41bd80f751917e945f17beb5f0d34926066ac
--- lams_tool_notebook/web/layouts/defaultLayout.jsp	(.../defaultLayout.jsp)	(revision 6a8b3b4d658228ef8358b4c59f7a68f27e60f94d)
+++ lams_tool_notebook/web/layouts/defaultLayout.jsp	(.../defaultLayout.jsp)	(revision 65a41bd80f751917e945f17beb5f0d34926066ac)
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-            "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html>
 
 <%@ include file="/common/taglibs.jsp"%>
 
Index: lams_tool_notebook/web/layouts/learningLayout.jsp
===================================================================
diff -u -r6a8b3b4d658228ef8358b4c59f7a68f27e60f94d -r65a41bd80f751917e945f17beb5f0d34926066ac
--- lams_tool_notebook/web/layouts/learningLayout.jsp	(.../learningLayout.jsp)	(revision 6a8b3b4d658228ef8358b4c59f7a68f27e60f94d)
+++ lams_tool_notebook/web/layouts/learningLayout.jsp	(.../learningLayout.jsp)	(revision 65a41bd80f751917e945f17beb5f0d34926066ac)
@@ -1,8 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-            "http://www.w3.org/TR/html4/loose.dtd">
-
+<!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
-
 <lams:html>
 	<tiles:insert attribute="header" />
 	<body class="stripes">
Index: lams_tool_notebook/web/layouts/tabLayout.jsp
===================================================================
diff -u -r6a8b3b4d658228ef8358b4c59f7a68f27e60f94d -r65a41bd80f751917e945f17beb5f0d34926066ac
--- lams_tool_notebook/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision 6a8b3b4d658228ef8358b4c59f7a68f27e60f94d)
+++ lams_tool_notebook/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision 65a41bd80f751917e945f17beb5f0d34926066ac)
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-            "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html>
 
 <%@ include file="/common/taglibs.jsp"%>
 
Index: lams_tool_notebook/web/pages/learning/defineLater.jsp
===================================================================
diff -u -r896248d87ee3eb2da93ba7a9f11ca2de11eb4040 -r65a41bd80f751917e945f17beb5f0d34926066ac
--- lams_tool_notebook/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 896248d87ee3eb2da93ba7a9f11ca2de11eb4040)
+++ lams_tool_notebook/web/pages/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 65a41bd80f751917e945f17beb5f0d34926066ac)
@@ -1,11 +1,12 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div id="content">
-	<h1>
-		<fmt:message key="activity.title" />
-	</h1>
+<c:set var="title" scope="request">
+	<fmt:message key="activity.title" />
+</c:set>
+
+<lams:Page type="learner" title="${title}">
 	<lams:DefineLater defineLaterMessageKey="message.defineLaterSet" />
-</div>
+</lams:Page>
 
 
 
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
diff -u -redba8c9898046064fc839e9840fea429272aff59 -r65a41bd80f751917e945f17beb5f0d34926066ac
--- lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision edba8c9898046064fc839e9840fea429272aff59)
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 65a41bd80f751917e945f17beb5f0d34926066ac)
@@ -8,111 +8,117 @@
 	}
 
 	function validateForm() {
-	
+
 		// Validates that there's input from the user. 
-		
+
 		// disables the Finish button to avoid double submittion 
 		disableFinishButton();
 
- 		if (mode == "learner") {
+		if (mode == "learner") {
 			// if this is learner mode, then we add this validation see (LDEV-1319)
-		
+
 			if (document.learningForm.entryText.value == "") {
-				
+
 				// if the input is blank, then we further inquire to make sure it is correct
-				if (confirm("<fmt:message>message.learner.blank.input</fmt:message>"))  {
+				if (confirm("<fmt:message>message.learner.blank.input</fmt:message>")) {
 					// if correct, submit form
 					return true;
 				} else {
 					// otherwise, focus on the text area
 					document.learningForm.entryText.focus();
 					document.getElementById("finishButton").disabled = false;
-					return false;      
+					return false;
 				}
 			} else {
 				// there was something on the form, so submit the form
 				return true;
 			}
 		}
 	}
-	
-	function submitForm(methodName){
+
+	function submitForm(methodName) {
 		var f = document.getElementById('messageForm');
 		f.submit();
 	}
 </script>
 
-<div id="content">
-	<h1>
-		<c:out value="${notebookDTO.title}" escapeXml="true"/>
-	</h1>
+<html:form action="/learning" method="post" onsubmit="return validateForm();" styleId="messageForm">
+	<html:hidden property="dispatch" value="finishActivity" />
+	<html:hidden property="toolSessionID" />
+	<html:hidden property="contentEditable" value="${contentEditable}" />
+	<c:set var="lrnForm" value="<%=request
+						.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
-	<p>
-		<c:out value="${notebookDTO.instructions}" escapeXml="false"/>
-	</p>
 
-	<c:if test="${not empty notebookDTO.submissionDeadline}">
-		 <div class="info">
-		 	<fmt:message key="authoring.info.teacher.set.restriction" >
-		 		<fmt:param><lams:Date value="${notebookDTO.submissionDeadline}" /></fmt:param>
-		 	</fmt:message>
-		 </div>
-	</c:if>
-
-	<c:if test="${notebookDTO.lockOnFinish and mode == 'learner'}">
-		<div class="info">
-			<c:choose>
-				<c:when test="${finishedActivity}">
-					<fmt:message key="message.activityLocked" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="message.warnLockOnFinish" />
-				</c:otherwise>
-			</c:choose>
+	<lams:Page type="learner" title="${notebookDTO.title}">
+		<div class="panel">
+			<c:out value="${notebookDTO.instructions}" escapeXml="false" />
 		</div>
-	</c:if>
 
-	&nbsp;
+		<!-- Notifications and warnings -->
+		<c:if test="${not empty notebookDTO.submissionDeadline}">
+			<lams:Alert id="submissionDeadline" type="info" close="true">
+				<fmt:message key="authoring.info.teacher.set.restriction">
+					<fmt:param>
+						<lams:Date value="${notebookDTO.submissionDeadline}" />
+					</fmt:param>
+				</fmt:message>
+			</lams:Alert>
+		</c:if>
 
-	<html:form action="/learning" method="post" onsubmit="return validateForm();" styleId="messageForm">
-		<html:hidden property="dispatch" value="finishActivity" />
-		<html:hidden property="toolSessionID" />
-		<html:hidden property="contentEditable" value="${contentEditable}" />
-		
-		<c:set var="lrnForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-
-		<c:choose>
-			<c:when test="${contentEditable}">
+		<c:if test="${notebookDTO.lockOnFinish and mode == 'learner'}">
+			<lams:Alert id="activityLocked" type="info" close="true">
 				<c:choose>
-					<c:when test="${notebookDTO.allowRichEditor}">
-						<lams:CKEditor id="entryText" value="${lrnForm.entryText}" contentFolderID="${learnerContentFolder}"
-							toolbarSet="DefaultLearner">
-						</lams:CKEditor>
+					<c:when test="${finishedActivity}">
+						<fmt:message key="message.activityLocked" />
 					</c:when>
-
 					<c:otherwise>
-						<html:textarea cols="60" rows="8" property="entryText"styleClass="text-area"/>
+						<fmt:message key="message.warnLockOnFinish" />
 					</c:otherwise>
 				</c:choose>
-			</c:when>
-
-			<c:otherwise>
-				<lams:out value="${lrnForm.entryText}" />
-			</c:otherwise>
-		</c:choose>
-		
-		<c:if test="${not empty teachersComment}">
-			<br><br>
-			<h3>
-				<fmt:message key="label.comment" />
-			</h3>
-			<lams:out value="${teachersComment}" escapeHtml="true"/>
+			</lams:Alert>
 		</c:if>
-		
-		<c:if test="${mode != 'teacher'}">
-			<div class="space-bottom-top align-right">
-				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity">
+		<!-- End Notifications and warnings -->
+
+		<!-- Form -->
+		<div class="form-group">
+			<c:choose>
+				<c:when test="${contentEditable}">
+					<c:choose>
+						<c:when test="${notebookDTO.allowRichEditor}">
+							<lams:CKEditor id="entryText" value="${lrnForm.entryText}" contentFolderID="${learnerContentFolder}"
+								toolbarSet="DefaultLearner">
+							</lams:CKEditor>
+						</c:when>
+
+						<c:otherwise>
+							<html:textarea rows="8" property="entryText" styleClass="form-control" styleId="focusedInput" />
+						</c:otherwise>
+					</c:choose>
+				</c:when>
+
+				<c:otherwise>
+					<div class="sbox sbox-body voffset10 bg-warning">
+						<lams:out value="${lrnForm.entryText}" />
+					</div>
+				</c:otherwise>
+			</c:choose>
+
+			<c:if test="${not empty teachersComment}">
+				<div class="panel panel-default voffset5 roffset10">
+					<div class="panel-heading">
+						<fmt:message key="label.reply.comment" />
+					</div>
+					<div class="panel-body">
+						<lams:out value="${teachersComment}" escapeHtml="true" />
+					</div>
+				</div>
+			</c:if>
+
+			<c:if test="${mode != 'teacher'}">
+				<div class="right-buttons voffset5">
+					<html:link href="#nogo" styleClass="btn btn-primary pull-right na" styleId="finishButton"
+						onclick="submitForm('finish')">
 						<c:choose>
 							<c:when test="${activityPosition.last}">
 								<fmt:message key="button.submit" />
@@ -121,9 +127,20 @@
 								<fmt:message key="button.finish" />
 							</c:otherwise>
 						</c:choose>
-					</span>
-				</html:link>
-			</div>
-		</c:if>
-	</html:form>
-</div>
+					</html:link>
+				</div>
+			</c:if>
+		</div>
+	</lams:Page>
+</html:form>
+<!-- end form -->
+
+
+
+
+
+<script type="text/javascript">
+	window.onload = function() {
+		document.getElementById("focusedInput").focus();
+	}
+</script>
\ No newline at end of file
Index: lams_tool_notebook/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u -r7cb4c24f3bd88110fbb593255cfc4ec05d2a821c -r65a41bd80f751917e945f17beb5f0d34926066ac
--- lams_tool_notebook/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 7cb4c24f3bd88110fbb593255cfc4ec05d2a821c)
+++ lams_tool_notebook/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 65a41bd80f751917e945f17beb5f0d34926066ac)
@@ -4,43 +4,40 @@
 	function disableFinishButton() {
 		document.getElementById("finishButton").disabled = true;
 	}
-    function submitForm(methodName){
-    	var f = document.getElementById('messageForm');
-    	f.submit();
-    }
+	function submitForm(methodName) {
+		var f = document.getElementById('messageForm');
+		f.submit();
+	}
 </script>
 
-<div id="content">
-	<h1>
-		<c:out value="${notebookDTO.title}" escapeXml="true"/>
-	</h1>
+<lams:Page type="learner" title="${notebookDTO.title}">
 
-	<div class="warning">
-		<fmt:message key="authoring.info.teacher.set.restriction" >
-			<fmt:param><lams:Date value="${notebookDTO.submissionDeadline}" /></fmt:param>
-		</fmt:message>	
-	</div>
-	
+	<!-- Announcements and advanced settings -->
+	<lams:Alert id="submissionDeadline" type="danger" close="false">
+		<fmt:message key="authoring.info.teacher.set.restriction">
+			<fmt:param>
+				<lams:Date value="${notebookDTO.submissionDeadline}" />
+			</fmt:param>
+		</fmt:message>
+	</lams:Alert>
+	<!-- End announcements and advanced settings -->
+
 	<c:if test="${mode == 'learner' || mode == 'author'}">
 		<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 			<html:hidden property="dispatch" value="finishActivity" />
 			<html:hidden property="toolSessionID" />
 
-			<div align="right" class="space-bottom-top">
-				<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
-					<span class="nextActivity">
-						<c:choose>
-							<c:when test="${activityPosition.last}">
-								<fmt:message key="button.submit" />
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="button.finish" />
-							</c:otherwise>
-						</c:choose>
-					</span>
-				</html:link>
-			</div>
+			<html:link href="#nogo" styleClass="btn btn-primary pull-right voffset10 na" styleId="finishButton"
+				onclick="submitForm('finish')">
+				<c:choose>
+					<c:when test="${activityPosition.last}">
+						<fmt:message key="button.submit" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="button.finish" />
+					</c:otherwise>
+				</c:choose>
+			</html:link>
 		</html:form>
 	</c:if>
-</div>
-
+</lams:Page>