Index: lams_tool_forum/web/jsps/learning/runoffline.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r64ef89247b8a1055e73517892fec7ace24a5b9a7
--- lams_tool_forum/web/jsps/learning/runoffline.jsp	(.../runoffline.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_forum/web/jsps/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 64ef89247b8a1055e73517892fec7ace24a5b9a7)
@@ -11,7 +11,9 @@
 	<table>
 		<tr>
 			<td>
-				<fmt:message key="run.offline.message" />
+				<h2>
+					<fmt:message key="run.offline.message" />
+				</h2>
 			</td>
 		</tr>
 	</table>
@@ -26,13 +28,13 @@
 
 		<div class="buttons-right">
 			<c:choose>
-				<c:when test="${sessionMap.reflectOn}">
-					<html:button property="continue" onclick="javascript:location.href='${continue}';"   disabled="${sessionMap.finishedLock}"  styleClass="button">
+				<c:when test="${sessionMap.reflectOn && (not sessionMap.finishedLock)}">
+					<html:button property="continue" onclick="javascript:location.href='${continue}';"  styleClass="button">
 						<fmt:message key="label.continue" />
 					</html:button>
 				</c:when>
 				<c:otherwise>
-					<html:button property="finish" onclick="javascript:location.href='${finish}';" disabled="${sessionMap.finishedLock}" styleClass="button">
+					<html:button property="finish" onclick="javascript:location.href='${finish}';" styleClass="button">
 						<fmt:message key="label.finish" />
 					</html:button>
 				</c:otherwise>
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r64ef89247b8a1055e73517892fec7ace24a5b9a7
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 64ef89247b8a1055e73517892fec7ace24a5b9a7)
@@ -49,7 +49,7 @@
 							<fmt:message key="label.newtopic" />
 						</html:button>
 					</c:if>
-					<html:button property="refresh" onclick="javascript:location.href='${refresh}';" disabled="${sessionMap.finishedLock}" styleClass="button">
+					<html:button property="refresh" onclick="javascript:location.href='${refresh}';" styleClass="button">
 						<fmt:message key="label.refresh" />
 					</html:button>
 				</div>
@@ -58,13 +58,13 @@
 
 					<c:if test='${sessionMap.mode != "teacher"}'>
 						<c:choose>
-							<c:when test="${sessionMap.reflectOn}">
-								<html:button property="continue" onclick="javascript:location.href='${continue}';" disabled="${sessionMap.finishedLock}" styleClass="button">
+							<c:when test="${sessionMap.reflectOn && (not sessionMap.finishedLock)}">
+								<html:button property="continue" onclick="javascript:location.href='${continue}';" styleClass="button">
 									<fmt:message key="label.continue" />
 								</html:button>
 							</c:when>
 							<c:otherwise>
-								<html:button property="finish" onclick="javascript:location.href='${finish}';" disabled="${sessionMap.finishedLock}" styleClass="button">
+								<html:button property="finish" onclick="javascript:location.href='${finish}';" styleClass="button">
 									<fmt:message key="label.finish" />
 								</html:button>
 							</c:otherwise>
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r64ef89247b8a1055e73517892fec7ace24a5b9a7
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 64ef89247b8a1055e73517892fec7ace24a5b9a7)
@@ -130,20 +130,20 @@
 				</c:if>
 			</table>
 			<div class="left-buttons">
-				<html:button property="checkNewButton" onclick="return checkNew()" disabled="${finishedLock}" styleClass="button">
+				<html:button property="checkNewButton" onclick="return checkNew()" styleClass="button">
 					<fmt:message key="label.check.for.new" />
 				</html:button>
 			</div>
 			<c:if test="${mode != 'teacher'}">
 				<div class="right-buttons">
 					<c:choose>
-						<c:when test="${sessionMap.reflectOn}">
-							<html:button property="FinishButton"  onclick="return continueReflect()" disabled="${finishedLock}"  styleClass="button">
+						<c:when test="${sessionMap.reflectOn && (not sessionMap.finishedLock)}">
+							<html:button property="FinishButton"  onclick="return continueReflect()"  styleClass="button">
 								<fmt:message key="label.continue" />
 							</html:button>
 						</c:when>
 						<c:otherwise>
-							<html:button property="FinishButton"  onclick="return finishSession()" disabled="${finishedLock}"  styleClass="button">
+							<html:button property="FinishButton"  onclick="return finishSession()" styleClass="button">
 								<fmt:message key="label.finished" />
 							</html:button>
 						</c:otherwise>
Index: lams_tool_larsrc/web/pages/learning/runoffline.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r64ef89247b8a1055e73517892fec7ace24a5b9a7
--- lams_tool_larsrc/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_larsrc/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 64ef89247b8a1055e73517892fec7ace24a5b9a7)
@@ -36,23 +36,24 @@
 						</td>
 					</tr>
 				</table>						
-				<p>
-				<c:choose>
-					<c:when test="${sessionMap.reflectOn}">
-						<html:button property="FinishButton"  onclick="return continueReflect()" disabled="${sessionMap.finishedLock}"  styleClass="button">
-							<fmt:message key="label.continue" />
-						</html:button>
-					</c:when>
-					<c:otherwise>
-						<html:button property="FinishButton"  onclick="return finishSession()" disabled="${sessionMap.finishedLock}"  styleClass="button">
-							<fmt:message key="label.finished" />
-						</html:button>
-					</c:otherwise>
-				</c:choose>		
+				<div class="right-buttons">
+					<c:choose>
+						<c:when test="${sessionMap.reflectOn && (not sessionMap.finishedLock)}">
+							<html:button property="FinishButton"  onclick="return continueReflect()"  styleClass="button">
+								<fmt:message key="label.continue" />
+							</html:button>
+						</c:when>
+						<c:otherwise>
+							<html:button property="FinishButton"  onclick="return finishSession()"  styleClass="button">
+								<fmt:message key="label.finished" />
+							</html:button>
+						</c:otherwise>
+					</c:choose>		
+				</div>
 			</div>
 	<div id="footer">
 		</div>
 		<!--closes footer-->
 
-f</body>
+</body>
 </html:html>
Index: lams_tool_sbmt/conf/language/ApplicationResources.properties
===================================================================
diff -u -re4e0ff4302993e16478eb88ddfc461204cda8b1a -r64ef89247b8a1055e73517892fec7ace24a5b9a7
--- lams_tool_sbmt/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e4e0ff4302993e16478eb88ddfc461204cda8b1a)
+++ lams_tool_sbmt/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 64ef89247b8a1055e73517892fec7ace24a5b9a7)
@@ -123,3 +123,4 @@
 
 
 #======= End labels: Exported 114 labels for en AU =====
+messsage.learner.finish.confirm=Are you going to finish submission?
\ No newline at end of file
Index: lams_tool_sbmt/web/learner/runoffline.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r64ef89247b8a1055e73517892fec7ace24a5b9a7
--- lams_tool_sbmt/web/learner/runoffline.jsp	(.../runoffline.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_sbmt/web/learner/runoffline.jsp	(.../runoffline.jsp)	(revision 64ef89247b8a1055e73517892fec7ace24a5b9a7)
@@ -31,22 +31,22 @@
 			<table>
 				<tr>
 					<td>
-						<p>
+						<h2>
 							<fmt:message key="run.offline.message" />
-						</p>
+						</h2>
 					</td>
 				</tr>
 			</table>
 			
 			<div class="right-buttons">
 				<c:choose>
-					<c:when test="${sessionMap.reflectOn}">
-						<html:button property="continueButton" onclick="javascript:notebook();" disabled="${sessionMap.finishLock}"  styleClass="button">
+					<c:when test="${sessionMap.reflectOn and (not sessionMap.finishLock)}">
+						<html:button property="continueButton" onclick="javascript:notebook();" styleClass="button">
 							<fmt:message key="label.continue" />
 						</html:button>
 					</c:when>
 					<c:otherwise>
-						<html:button property="finishButton" onclick="javascript:finish();" disabled="${sessionMap.finishLock}" styleClass="button">
+						<html:button property="finishButton" onclick="javascript:finish();" styleClass="button">
 							<fmt:message key="button.finish" />
 						</html:button>
 					</c:otherwise>
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r64ef89247b8a1055e73517892fec7ace24a5b9a7
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 64ef89247b8a1055e73517892fec7ace24a5b9a7)
@@ -21,9 +21,13 @@
 					location.href= tUrl;
 				else
 					return false;
+			}else if(uploadFileNum==0){
+				if(confirm("<fmt:message key='messsage.learner.finish.confirm'/>"))
+					location.href= tUrl;
+				else
+					return false;
 			}else
 				location.href= tUrl;
-		
 		}
 		function finish(){
 			var finishUrl= "<html:rewrite page='/learner.do?method=finish&sessionMapID=${sessionMapID}'/>";
@@ -186,21 +190,25 @@
 						</tr>
 						<tr>
 							<td colspan="2" align="center">
-								<html:submit disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" styleClass="button">
-									<fmt:message key="label.learner.upload" />
-								</html:submit>
-								<c:choose>
-									<c:when test="${sessionMap.reflectOn}">
-										<html:button property="notebookButton" onclick="javascript:notebook();" disabled="${sessionMap.finishLock}"  styleClass="button">
-											<fmt:message key="label.continue" />
-										</html:button>
-									</c:when>
-									<c:otherwise>
-										<html:button property="finishButton" onclick="javascript:finish();" disabled="${sessionMap.finishLock}" styleClass="button">
-											<fmt:message key="button.finish" />
-										</html:button>
-									</c:otherwise>
-								</c:choose>								
+								<span class="left-buttons">
+									<c:choose>
+										<c:when test="${sessionMap.reflectOn and (not sessionMap.finishLock)}">
+											<html:button property="notebookButton" onclick="javascript:notebook();" styleClass="button">
+												<fmt:message key="label.continue" />
+											</html:button>
+										</c:when>
+										<c:otherwise>
+											<html:button property="finishButton" onclick="javascript:finish();" styleClass="button">
+												<fmt:message key="button.finish" />
+											</html:button>
+										</c:otherwise>
+									</c:choose>
+								</span>						
+								<span class="right-buttons">
+									<html:submit disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" styleClass="button">
+										<fmt:message key="label.learner.upload" />
+									</html:submit>
+								</span>
 							</td>
 						</tr>
 					</table>
Index: lams_tool_survey/web/pages/learning/runoffline.jsp
===================================================================
diff -u -r825e32a1131e134c0e2d560418cc349973b3702f -r64ef89247b8a1055e73517892fec7ace24a5b9a7
--- lams_tool_survey/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 825e32a1131e134c0e2d560418cc349973b3702f)
+++ lams_tool_survey/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 64ef89247b8a1055e73517892fec7ace24a5b9a7)
@@ -22,36 +22,35 @@
 </head>
 
 <body class="stripes">
-			<div id="content">
 			<h1>
 				${sessionMap.title}
 			</h1>
-			
+			<div id="content">
 				<table>
 					<tr>
 						<td>
-						<h2>
-							<fmt:message key="run.offline.message" />
-						</h2>
+							<h2>
+								<fmt:message key="run.offline.message" />
+							</h2>
 						</td>
 					</tr>
 				</table>						
-				<p>
-				<c:choose>
-					<c:when test="${sessionMap.reflectOn}">
-						<html:button property="FinishButton"  onclick="return continueReflect()" disabled="${sessionMap.finishedLock}"  styleClass="button">
-							<fmt:message key="label.continue" />
-						</html:button>
-					</c:when>
-					<c:otherwise>
-						<html:button property="FinishButton"  onclick="return finishSession()" disabled="${sessionMap.finishedLock}"  styleClass="button">
-							<fmt:message key="label.finished" />
-						</html:button>
-					</c:otherwise>
-				</c:choose>		
+				<div class="buttons-right">
+					<c:choose>
+						<c:when test="${sessionMap.reflectOn && (not sessionMap.finishedLock)}">
+							<html:button property="FinishButton"  onclick="return continueReflect()" styleClass="button">
+								<fmt:message key="label.continue" />
+							</html:button>
+						</c:when>
+						<c:otherwise>
+							<html:button property="FinishButton"  onclick="return finishSession()"  styleClass="button">
+								<fmt:message key="label.finished" />
+							</html:button>
+						</c:otherwise>
+					</c:choose>		
+				</div>
 			</div>
-	<div id="footer">
-		</div>
+	<div class="space-bottom"></div>
 		<!--closes footer-->
 
 </body>