Index: lams_central/web/css/defaultHTML_learner.css
===================================================================
diff -u -rdc7b67e7677c8cd2289130c67094a62b39177d05 -re52d467fe486dbe4f918436e7abe5e88f3b5eabd
--- lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision dc7b67e7677c8cd2289130c67094a62b39177d05)
+++ lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision e52d467fe486dbe4f918436e7abe5e88f3b5eabd)
@@ -532,6 +532,7 @@
 	text-decoration: none;
 	font-size: 11px;
 	font-family: verdana, arial, helvetica, sans-serif;
+	cursor: pointer;
 }
 
 .editForm {
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp
===================================================================
diff -u -rdb44c0602e8fa1b68b2ebce18a58a3d8215cc61b -re52d467fe486dbe4f918436e7abe5e88f3b5eabd
--- lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision db44c0602e8fa1b68b2ebce18a58a3d8215cc61b)
+++ lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision e52d467fe486dbe4f918436e7abe5e88f3b5eabd)
@@ -18,7 +18,7 @@
 	<c:if test="${sessionMap.allowUpload}">
 		<tr>
 			<td>
-				<span class="field-name"><fmt:message key="message.label.attachment" /></span>
+				<span class="field-name"><fmt:message key="message.label.attachment" /></span><br>
 				<html:file tabindex="3" property="attachmentFile" /><BR>
 				<html:errors property="message.attachment" />
 			</td>
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
diff -u -rdb44c0602e8fa1b68b2ebce18a58a3d8215cc61b -re52d467fe486dbe4f918436e7abe5e88f3b5eabd
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision db44c0602e8fa1b68b2ebce18a58a3d8215cc61b)
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision e52d467fe486dbe4f918436e7abe5e88f3b5eabd)
@@ -20,12 +20,13 @@
 			<div class="field-name title-space-top">
 				<fmt:message key="message.label.attachment" />
 			</div>
-			<div style="font-style: italic; margin-bottom: 10px">
+			<html:file tabindex="3" property="attachmentFile" />
+			
+			<div style="font-style: italic; margin-top: 10px">
 				<fmt:message key="label.upload.info">
 					<fmt:param>${sessionMap.uploadMaxFileSize}</fmt:param>
 				</fmt:message>
 			</div>
-			<html:file tabindex="3" property="attachmentFile" />
 			<html:errors property="message.attachment" />
 		
 		</c:if>
Index: lams_tool_forum/web/jsps/learning/mobile/runoffline.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -re52d467fe486dbe4f918436e7abe5e88f3b5eabd
--- lams_tool_forum/web/jsps/learning/mobile/runoffline.jsp	(.../runoffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_forum/web/jsps/learning/mobile/runoffline.jsp	(.../runoffline.jsp)	(revision e52d467fe486dbe4f918436e7abe5e88f3b5eabd)
@@ -40,7 +40,7 @@
 		
 		<script type="text/javascript">
 			function submitFinish() {
-				document.getElementById("finish").disabled = true;
+				document.getElementById("finishButton").disabled = true;
 				location.href = '${finish}';
 			}		
 		</script>
@@ -53,7 +53,7 @@
 				</button>
 			</c:when>
 			<c:otherwise>
-				<a href="#nogo"  name="finish" id="finish"
+				<a href="#nogo"  name="finishButton" id="finishButton"
 					onclick="submitFinish();" data-role="button" data-icon="arrow-r" data-theme="b">
 					<span class="nextActivity">
 						<c:choose>
Index: lams_tool_forum/web/jsps/learning/mobile/viewforum.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -re52d467fe486dbe4f918436e7abe5e88f3b5eabd
--- lams_tool_forum/web/jsps/learning/mobile/viewforum.jsp	(.../viewforum.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_forum/web/jsps/learning/mobile/viewforum.jsp	(.../viewforum.jsp)	(revision e52d467fe486dbe4f918436e7abe5e88f3b5eabd)
@@ -7,7 +7,7 @@
 
 <script type="text/javascript">
 	function finishForum() {
-		document.getElementById("finishForum").disabled = true;
+		document.getElementById("finishButton").disabled = true;
 		location.href = '${finish}';
 	};			
 </script>
@@ -144,7 +144,7 @@
 						</c:when>
 		
 						<c:otherwise>
-							<button name="finish" id="finishForum" data-icon="arrow-r" onclick="finishForum();">
+							<button name="finishButton" id="finishButton" data-icon="arrow-r" onclick="finishForum();">
 								<c:choose>
 				 					<c:when test="${sessionMap.activityPosition.last}">
 				 						<fmt:message key="label.submit" />
Index: lams_tool_forum/web/jsps/learning/runoffline.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -re52d467fe486dbe4f918436e7abe5e88f3b5eabd
--- lams_tool_forum/web/jsps/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_forum/web/jsps/learning/runoffline.jsp	(.../runoffline.jsp)	(revision e52d467fe486dbe4f918436e7abe5e88f3b5eabd)
@@ -33,7 +33,7 @@
 		
 		<script type="text/javascript">
 			function submitFinish() {
-				document.getElementById("finish").disabled = true;
+				document.getElementById("finishButton").disabled = true;
 				location.href = '${finish}';
 			}		
 		</script>
@@ -48,7 +48,7 @@
 				</html:button>
 			</c:when>
 			<c:otherwise>
-				<html:link href="#nogo"  property="finish" styleId="finish"
+				<html:link href="#nogo"  property="finish" styleId="finishButton"
 					onclick="submitFinish();" styleClass="button">
 					<span class="nextActivity">
 						<c:choose>
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -re52d467fe486dbe4f918436e7abe5e88f3b5eabd
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision e52d467fe486dbe4f918436e7abe5e88f3b5eabd)
@@ -90,12 +90,8 @@
 		
 	</c:if>
 
-
-
 	<%@ include file="/common/messages.jsp"%>
-
-	<%@ include file="/jsps/learning/message/topiclist.jsp"%>
-
+	
 	<c:set var="newtopic">
 		<html:rewrite
 			page="/learning/newTopic.do?sessionMapID=${sessionMapID}" />
@@ -105,24 +101,14 @@
 		<html:rewrite
 			page="/learning/viewForum.do?mode=${sessionMap.mode}&toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}&hideReflection=${sessionMap.hideReflection}" />
 	</c:set>
-
-	<c:set var="continue">
-		<html:rewrite
-			page="/learning/newReflection.do?sessionMapID=${sessionMapID}" />
-	</c:set>
-
-	<c:set var="finish">
-		<html:rewrite page="/learning/finish.do?sessionMapID=${sessionMapID}" />
-	</c:set>
-
-	<div>
+	
+	<div class="space-bottom-top">
 		<c:set var="buttonClass" value="button" />
 		<c:if test="${sessionMap.finishedLock}">
 			<c:set var="buttonClass" value="disabled" />
 		</c:if>
 
-		<c:if
-			test='${sessionMap.allowNewTopics}'>
+		<c:if test='${sessionMap.allowNewTopics}'>
 			<html:button property="newtopic"
 				onclick="javascript:location.href='${newtopic}';"
 				disabled="${sessionMap.finishedLock}" styleClass="${buttonClass}">
@@ -131,11 +117,22 @@
 		</c:if>
 
 		<html:button property="refresh"
-			onclick="javascript:location.href='${refresh}';" styleClass="button">
+			onclick="javascript:location.href='${refresh}';" styleClass="button space-left">
 			<fmt:message key="label.refresh" />
 		</html:button>
 	</div>
 
+	<%@ include file="/jsps/learning/message/topiclist.jsp"%>
+
+	<c:set var="continue">
+		<html:rewrite
+			page="/learning/newReflection.do?sessionMapID=${sessionMapID}" />
+	</c:set>
+
+	<c:set var="finish">
+		<html:rewrite page="/learning/finish.do?sessionMapID=${sessionMapID}" />
+	</c:set>
+
 	<c:if
 		test="${sessionMap.userFinished and sessionMap.reflectOn and !sessionMap.hideReflection}">
 		<div class="small-space-top">
@@ -168,7 +165,7 @@
 
 	<script type="text/javascript">
 		function submitFinish() {
-			document.getElementById("finish").disabled = true;
+			document.getElementById("finishButton").disabled = true;
 			location.href = '${finish}';
 		}		
 	</script>
@@ -186,7 +183,7 @@
 				</c:when>
 
 				<c:otherwise>
-					<html:link href="#nogo" property="finish" styleId="finish"
+					<html:link href="#nogo" property="finish" styleId="finishButton"
 						onclick="submitFinish();" styleClass="button">
 						<span class="nextActivity">
 							<c:choose>
Index: lams_tool_images/web/pages/learning/parts/addimage.jsp
===================================================================
diff -u -r616336eff87580ecb6f13770899bc9af7eff4fa8 -re52d467fe486dbe4f918436e7abe5e88f3b5eabd
--- lams_tool_images/web/pages/learning/parts/addimage.jsp	(.../addimage.jsp)	(revision 616336eff87580ecb6f13770899bc9af7eff4fa8)
+++ lams_tool_images/web/pages/learning/parts/addimage.jsp	(.../addimage.jsp)	(revision e52d467fe486dbe4f918436e7abe5e88f3b5eabd)
@@ -56,7 +56,7 @@
 				<a href="#" onclick="document.imageGalleryItemForm.submit();" class="button-add-item">
 					<fmt:message key="label.authoring.basic.add.image" /> 
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" class="button space-left">
+				<a href="#" onclick="self.parent.tb_remove();" class="button space-left" name="goback">
 					<fmt:message key="label.cancel" /> 
 				</a>
 			</lams:ImgButtonWrapper>
Index: lams_tool_kaltura/web/pages/learning/uploaditem.jsp
===================================================================
diff -u -r03e4d14e0e7734ac74a05ae047c8ca0429685ad5 -re52d467fe486dbe4f918436e7abe5e88f3b5eabd
--- lams_tool_kaltura/web/pages/learning/uploaditem.jsp	(.../uploaditem.jsp)	(revision 03e4d14e0e7734ac74a05ae047c8ca0429685ad5)
+++ lams_tool_kaltura/web/pages/learning/uploaditem.jsp	(.../uploaditem.jsp)	(revision e52d467fe486dbe4f918436e7abe5e88f3b5eabd)
@@ -173,7 +173,7 @@
 			
 			<div  style="margin-top: 40px">
 				<lams:ImgButtonWrapper>
-					<a href="#nogo" onclick="return closeThickbox();" onmousedown="self.focus();" class="button space-left float-right">
+					<a href="#nogo" onclick="return closeThickbox();" onmousedown="self.focus();" class="button space-left float-right" name="goback">
 						<fmt:message key="label.close" /> 
 					</a>
 				</lams:ImgButtonWrapper>
Index: lams_tool_vote/web/learning/Notebook.jsp
===================================================================
diff -u -r8bf10f60ba533d85a9e1f88e3845cad66dfbeaeb -re52d467fe486dbe4f918436e7abe5e88f3b5eabd
--- lams_tool_vote/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 8bf10f60ba533d85a9e1f88e3845cad66dfbeaeb)
+++ lams_tool_vote/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision e52d467fe486dbe4f918436e7abe5e88f3b5eabd)
@@ -73,7 +73,7 @@
 			<div class="space-bottom-top align-right">
 				<html:link href="#" property="submitReflection"
 					onclick="javascript:submitMethod('submitReflection');return false"
-					styleClass="button">
+					styleClass="button" styleId="finishButton">
 					<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
 				</html:link>
 			</div>