Index: lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r271d1969c71c45a7e00e068f0b31d610fee8e9c0
--- lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 271d1969c71c45a7e00e068f0b31d610fee8e9c0)
@@ -123,11 +123,11 @@
     }  				
 </script>	
 <p id="saveCancelButtons" >
-		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
-			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
 		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
+		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
+			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
+		</html:link>
 </p>
-<!-- end tab content -->
\ No newline at end of file
+<!-- end tab content -->
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -rfb9d13eb115f5281b03ab1624ec10a22ba3b81b7 -r271d1969c71c45a7e00e068f0b31d610fee8e9c0
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision fb9d13eb115f5281b03ab1624ec10a22ba3b81b7)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 271d1969c71c45a7e00e068f0b31d610fee8e9c0)
@@ -141,7 +141,7 @@
 
 <p class="small-space-bottom">
 	<a
-		href="javascript:showMessage('<html:rewrite page="/authoring/newTopic.do?sessionMapID=${formBean.sessionMapID}"/>');"
+		href="javascript:showMessage('<html:rewrite page="/authoring/newTopic.do?sessionMapID=${formBean.sessionMapID}"/>');" id="addTopic" 
 		class="button-add-item"> <fmt:message
 			key="label.authoring.create.new.topic" /> 
 	</a>
Index: lams_tool_forum/web/jsps/authoring/message/create.jsp
===================================================================
diff -u -r64a34d9311023352b725e08157773e712da497b6 -r271d1969c71c45a7e00e068f0b31d610fee8e9c0
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 64a34d9311023352b725e08157773e712da497b6)
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	(.../create.jsp)	(revision 271d1969c71c45a7e00e068f0b31d610fee8e9c0)
@@ -63,12 +63,12 @@
 			</div>
 
 			<lams:ImgButtonWrapper>
-				<a href="#" onclick="getElementById('topicFormId').submit();"
-					class="button-add-item"> <fmt:message key="button.add" /> </a>
-
 				<a href="#" onclick="javascript:window.parent.hideMessage()"
 					class="button space-left"> <fmt:message key="button.cancel" />
 				</a>
+				&nbsp;
+				<a href="#" onclick="getElementById('topicFormId').submit();"
+					class="button-add-item"> <fmt:message key="button.add" /> </a>
 			</lams:ImgButtonWrapper>
 
 		</html:form>
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp
===================================================================
diff -u -r64a34d9311023352b725e08157773e712da497b6 -r271d1969c71c45a7e00e068f0b31d610fee8e9c0
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision 64a34d9311023352b725e08157773e712da497b6)
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	(.../edit.jsp)	(revision 271d1969c71c45a7e00e068f0b31d610fee8e9c0)
@@ -66,12 +66,13 @@
 			</div>
 
 			<lams:ImgButtonWrapper>
-				<a href="#" onclick="getElementById('topicFormId').submit();"
-					class="button-add-item"> <fmt:message key="button.add" /> </a>
-					
 				<a href="#" onclick="javascript:window.parent.hideMessage()"
 					class="button space-left"> <fmt:message key="button.cancel" />
 				</a>
+				&nbsp;
+				<a href="#" onclick="getElementById('topicFormId').submit();"
+					class="button-add-item"> <fmt:message key="button.add" /> </a>
+					
 			</lams:ImgButtonWrapper>
 		</html:form>
 	</body>
Index: lams_tool_forum/web/jsps/authoring/message/topiclist.jsp
===================================================================
diff -u -rc2ba0dc3e2d99441897de8d185e83c419a416f2d -r271d1969c71c45a7e00e068f0b31d610fee8e9c0
--- lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
+++ lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision 271d1969c71c45a7e00e068f0b31d610fee8e9c0)
@@ -9,7 +9,7 @@
 		</tr>
 		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 		<c:forEach items="${sessionMap.topicList}" var="topic" varStatus="status">
-			<tr>
+			<tr id="row${status.index}>
 				<td>
 					<c:set var="viewtopic">
 						<html:rewrite page="/authoring/viewTopic.do?sessionMapID=${sessionMapID}&topicIndex=${status.index}&create=${topic.message.updated.time}" />
@@ -49,13 +49,13 @@
 				
 				<td width="20px">
 					<img src="${tool}images/edit.gif"
-						title="<fmt:message key="label.edit" />"
+						title="<fmt:message key="label.edit" />" id="edit${status.index}" 
 						onclick="editTopic(${status.index},'${sessionMapID}')" />
                 </td>
                 
 				<td width="20px">
 					<img src="${tool}images/delete.gif"
-						title="<fmt:message key="label.delete" />"
+						title="<fmt:message key="label.delete" />" id="delete${status.index}" 
 						onclick="deleteTopic(${status.index},'${sessionMapID}')" />
 				</td>				
 			</tr>
@@ -75,4 +75,4 @@
 		var obj = win.document.getElementById('messageListArea');
 		obj.innerHTML= document.getElementById("topiclist").innerHTML;
 	}
-</script>
\ No newline at end of file
+</script>