Index: lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.22 -r1.22.2.1
--- lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	23 Jul 2013 17:52:41 -0000	1.22
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	13 Feb 2015 14:51:49 -0000	1.22.2.1
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/basic.jsp,v
diff -u -r1.37.2.2 -r1.37.2.3
--- lams_tool_forum/web/jsps/authoring/basic.jsp	12 Sep 2014 21:20:29 -0000	1.37.2.2
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	13 Feb 2015 14:51:49 -0000	1.37.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/create.jsp,v
diff -u -r1.39.2.2 -r1.39.2.3
--- lams_tool_forum/web/jsps/authoring/message/create.jsp	12 Sep 2014 21:07:20 -0000	1.39.2.2
+++ lams_tool_forum/web/jsps/authoring/message/create.jsp	13 Feb 2015 14:51:49 -0000	1.39.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/edit.jsp,v
diff -u -r1.25.2.2 -r1.25.2.3
--- lams_tool_forum/web/jsps/authoring/message/edit.jsp	12 Sep 2014 21:07:20 -0000	1.25.2.2
+++ lams_tool_forum/web/jsps/authoring/message/edit.jsp	13 Feb 2015 14:51:49 -0000	1.25.2.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/topiclist.jsp,v
diff -u -r1.15 -r1.15.2.1
--- lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	15 Aug 2013 20:20:19 -0000	1.15
+++ lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	13 Feb 2015 14:51:49 -0000	1.15.2.1
@@ -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>