diff --git a/apps/frontend/src/app/collaboration/[id]/page.tsx b/apps/frontend/src/app/collaboration/[id]/page.tsx
index f538285987..1d5cb76987 100644
--- a/apps/frontend/src/app/collaboration/[id]/page.tsx
+++ b/apps/frontend/src/app/collaboration/[id]/page.tsx
@@ -249,7 +249,7 @@ export default function CollaborationPage(props: CollaborationProps) {
         customTestCases: "",
       });
       updateExecutionResults(data);
-      infoMessage("Test cases executed. Review the results below.");
+      successMessage("Test cases executed. Review the results below.");
       sendExecutionResultsToMatchedUser(data);
     } finally {
       setIsLoadingTestCase(false);
@@ -500,6 +500,9 @@ export default function CollaborationPage(props: CollaborationProps) {
                     <div className="spinner-container">
                       {isLoadingSubmission && <Spin tip="Saving code..." />}
                     </div>
+                    <Tooltip title="Submit will run public and hidden test cases before submitting">
+                      <InfoCircleFilled className="submit-code" />
+                    </Tooltip>
                     <Button
                       icon={<SendOutlined />}
                       iconPosition="end"
diff --git a/apps/frontend/src/components/CollaborativeEditor/CollaborativeEditor.tsx b/apps/frontend/src/components/CollaborativeEditor/CollaborativeEditor.tsx
index be91e2238a..439ae2cea6 100644
--- a/apps/frontend/src/components/CollaborativeEditor/CollaborativeEditor.tsx
+++ b/apps/frontend/src/components/CollaborativeEditor/CollaborativeEditor.tsx
@@ -304,7 +304,7 @@ const CollaborativeEditor = forwardRef(
               state.editorState &&
               state.editorState.id !== latestLanguageChangeId
             ) {
-              latestSubmissionId = state.editorState.id;
+              latestLanguageChangeId = state.editorState.id;
               setSelectedLanguage(state.editorState.language);
               // if (props.user === state.user.name) {
               //   console.log("ownself update ownself");
diff --git a/apps/frontend/src/components/question/TestcaseDetail/TestcaseDetail.tsx b/apps/frontend/src/components/question/TestcaseDetail/TestcaseDetail.tsx
index c4d4e3f05b..a1c78cea2b 100644
--- a/apps/frontend/src/components/question/TestcaseDetail/TestcaseDetail.tsx
+++ b/apps/frontend/src/components/question/TestcaseDetail/TestcaseDetail.tsx
@@ -3,7 +3,7 @@ import {
   InfoCircleFilled,
   PlayCircleOutlined,
 } from "@ant-design/icons";
-import { Button, Input, Spin, Tabs, TabsProps, Typography } from "antd";
+import { Button, Input, Spin, Tabs, TabsProps, Tooltip, Typography } from "antd";
 import "./styles.scss";
 import { isTestResult, Test } from "@/app/services/execute";
 
@@ -100,6 +100,9 @@ export const TestcaseDetail = (props: TestcaseDetailProps) => {
             <div className="spinner-container">
               {props.isLoadingTestCase && <Spin tip="Running test cases..." />}
             </div>
+            <Tooltip title="Run test cases will run public test cases">
+              <InfoCircleFilled className="run-test-cases-info" />
+            </Tooltip>
             <Button
               icon={<PlayCircleOutlined />}
               iconPosition="end"