Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
===================================================================
diff -u -r1ca8633aea1d461a727b7e31c4493a21bfdff073 -r79bcbe91bdd67992b6e213981b456c76aa40da18
--- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 1ca8633aea1d461a727b7e31c4493a21bfdff073)
+++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp	(.../topiceditform.jsp)	(revision 79bcbe91bdd67992b6e213981b456c76aa40da18)
@@ -49,6 +49,6 @@
 
 	<button type="submit" class="btn btn-secondary" id="submitButton">
 		<i class="fa-solid fa-check me-1"></i>
-		<fmt:message key="button.submit" />
+		<fmt:message key="label.post" />
 	</button>
 </div>
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp
===================================================================
diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -r79bcbe91bdd67992b6e213981b456c76aa40da18
--- lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10)
+++ lams_tool_forum/web/jsps/learning/message/topicform.jsp	(.../topicform.jsp)	(revision 79bcbe91bdd67992b6e213981b456c76aa40da18)
@@ -36,7 +36,7 @@
 </c:set>
 <button type="submit" class="btn btn-primary mt-2 ms-2 float-end" id="submitButton">
 	<i class="fa-solid fa-check me-1"></i>
-	<fmt:message key="button.submit" />
+	<fmt:message key="label.post" />
 </button>
 
 <button type="button" name="goback" onclick="javascript:location.href='${backToForum}';" class="btn btn-secondary btn-icon-cancel mt-2 float-end" id="cancelButton">
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp
===================================================================
diff -u -re68dab8eddae2efb3468bd1a810862bf3d3ceb0f -r79bcbe91bdd67992b6e213981b456c76aa40da18
--- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision e68dab8eddae2efb3468bd1a810862bf3d3ceb0f)
+++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp	(.../topicreplyform.jsp)	(revision 79bcbe91bdd67992b6e213981b456c76aa40da18)
@@ -55,6 +55,6 @@
 	
 	<button type="submit" class="btn btn-secondary" id="submitButton">
 		<i class="fa-solid fa-check me-1"></i>
-		<fmt:message key="button.submit" />
+		<fmt:message key="label.post" />
 	</button>
 </div>
Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp
===================================================================
diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -r79bcbe91bdd67992b6e213981b456c76aa40da18
--- lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10)
+++ lams_tool_forum/web/jsps/learning/viewtopic.jsp	(.../viewtopic.jsp)	(revision 79bcbe91bdd67992b6e213981b456c76aa40da18)
@@ -143,7 +143,9 @@
 			});
 		</script>
 			
-		${buttonPanel}
+		<div class="activity-bottom-buttons">
+			${buttonPanel}
+		</div>
 
 	</div>
 </lams:PageLearner>