diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
new file mode 100644
index 0000000..92743fe
--- /dev/null
+++ b/.github/workflows/linting.yml
@@ -0,0 +1,32 @@
+name: 'Linting'
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  cargo-check:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: 'macos-latest'
+            args: '--target aarch64-apple-darwin'
+          - platform: 'windows-latest'
+            args: ''
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust stable
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin' || '' }}
+
+      - name: Run Cargo check
+        run: |
+          cd src-tauri
+          cargo check
\ No newline at end of file
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index f19b493..c5b242d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -17,8 +17,6 @@ jobs:
         include:
           - platform: 'macos-latest' # for Arm based macs (M1 and above).
             args: '--target aarch64-apple-darwin'
-          - platform: 'macos-latest' # for Intel based macs.
-            args: '--target x86_64-apple-darwin'
           - platform: 'windows-latest'
             args: ''
 
diff --git a/src/app/page.tsx b/src/app/page.tsx
index bfa9df0..a91cc0b 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { invoke } from "@tauri-apps/api/core";
-import { Select, SelectItem } from "@nextui-org/react";
+import { button, Select, SelectItem } from "@nextui-org/react";
 import { listen } from "@tauri-apps/api/event";
 import { TextInput } from "./sections/input";
 import { Result } from "./sections/result";
@@ -11,7 +11,9 @@ import { BottomBar } from "./sections/bottomBar";
 import { SettingContext } from "./providers/settings";
 import { FaRegArrowAltCircleRight } from "react-icons/fa";
 import { IoStopCircleOutline } from "react-icons/io5";
+import { HiSwitchHorizontal } from "react-icons/hi";
 import { AppSettings } from "./types/settings";
+import { Tabs, Tab } from "@nextui-org/react";
 
 async function tauri_get_result(
   text: string,
@@ -105,46 +107,58 @@ const LanguageSelections = ({
   selectedLang?: LanguageConfig;
   changeLangConfig: (lang: LanguageConfig) => void;
 }) => {
-  // const sourceLangues = [
-  //   { value: "en", label: "English" },
-  //   { value: "es", label: "Spanish" },
-  //   { value: "fr", label: "French" },
-  // ];
   const targetLangues = [
     { value: "vi", label: "Tiếng Việt" },
     { value: "en", label: "English" },
   ];
 
+  const handleLanguageSwitch = () => {
+    if (selectedLang) {
+      const newConfig = {
+        sourceLang: selectedLang.targetLang,
+        targetLang: selectedLang.sourceLang,
+      };
+      changeLangConfig(newConfig);
+    }
+  };
+
   return (
     <div className="mb-3 flex flex-row gap-2 align-middle items-center">
       <p className="w-3/6 text-gray-500 text-sm">
         Output language:
       </p>
-      <Select
-        className="w-3/6"
-        value={selectedLang?.targetLang.label}
-        placeholder={selectedLang?.targetLang.label}
-      >
-        {targetLangues.map((lang) => (
-          <SelectItem
-            key={lang.value}
-            value={selectedLang?.targetLang.label}
-            onClick={() => {
-              const newConfig = selectedLang;
-              if (newConfig) {
-                newConfig.targetLang = {
-                  code: lang.value,
-                  label: lang.label,
-                };
-                changeLangConfig(newConfig);
-              }
-            }}
-            id={lang.label}
-          >
-            {lang.label}
-          </SelectItem>
-        ))}
-      </Select>
+      <div className="flex w-3/6 items-center relative">
+        <HiSwitchHorizontal
+          onClick={handleLanguageSwitch}
+          className="mr-2 cursor-pointer"
+          size={20}
+        />
+        <Select
+          className="flex-grow"
+          value={selectedLang?.targetLang.label}
+          placeholder={selectedLang?.targetLang.label}
+        >
+          {targetLangues.map((lang) => (
+            <SelectItem
+              key={lang.value}
+              value={selectedLang?.targetLang.label}
+              onClick={() => {
+                const newConfig = selectedLang;
+                if (newConfig) {
+                  newConfig.targetLang = {
+                    code: lang.value,
+                    label: lang.label,
+                  };
+                  changeLangConfig(newConfig);
+                }
+              }}
+              id={lang.label}
+            >
+              {lang.label}
+            </SelectItem>
+          ))}
+        </Select>
+      </div>
     </div>
   );
 };
@@ -158,6 +172,21 @@ export default function Home() {
     homeContext.changeInputText(text);
   }, []);
 
+  const data = [
+    {
+      title: "Translate",
+      content: homeContext.result?.translate ?? "",
+    },
+    {
+      title: "Correct",
+      content: homeContext.result?.correct ?? "",
+    },
+    {
+      title: "Refine",
+      content: homeContext.result?.refine ?? "",
+    },
+  ];
+
   useEffect(() => {
     startSerialEventListener();
   }, []);
@@ -218,22 +247,35 @@ export default function Home() {
     };
   }, [homeContext, appSettings]);
 
+  const handleModeChange = useCallback((key: string | number) => {
+    const index = typeof key === 'string' ? parseInt(key, 10) : key;
+    const newMode = data[index].title as Mode;
+    homeContext.setCurrentMode(newMode);
+    if (homeContext.inputText && homeContext.inputText.trim() !== '') {
+      // Use the new mode directly in the triggerTranslation call
+      triggerTranslation({ ...homeContext, currentMode: newMode }, appSettings);
+    }
+  }, [homeContext, appSettings]);
+
   return (
     <div className="flex flex-col">
       <div className="flex h-80 w-full flex-col p-2 sm:flex-row">
         <div className="m-2 flex h-full w-full flex-col sm:w-1/2">
-          <LanguageSelections
-            selectedLang={homeContext.languageConfig}
-            changeLangConfig={homeContext.changeLangConfig}
-          />
-          <div className="mb-0 h-80 overflow-clip">
-            <TextInput
-              inputText={homeContext.inputText}
-              changeText={homeContext.changeInputText}
-            />
-          </div>
+          <Tabs
+            aria-label="Mode"
+            onSelectionChange={handleModeChange}
+          >
+            {data.map((item, index) => (
+              <Tab key={index} title={item.title}>
+                <TextInput
+                  inputText={homeContext.inputText}
+                  changeText={homeContext.changeInputText}
+                />
+              </Tab>
+            ))}
+          </Tabs>
         </div>
-        <div className="flex w-8 flex-col items-center justify-center space-y-5 pt-10">
+        <div className="flex w-8 flex-col items-center justify-center pt-10 pr-2">
           {homeContext.translating ? (
             <IoStopCircleOutline
               className="icon text-gray-500"
diff --git a/src/app/sections/language-selection.tsx b/src/app/sections/language-selection.tsx
new file mode 100644
index 0000000..6fb3e3e
--- /dev/null
+++ b/src/app/sections/language-selection.tsx
@@ -0,0 +1,71 @@
+import React from "react";
+import { Select, SelectItem } from "@nextui-org/react";
+import { HiSwitchHorizontal } from "react-icons/hi";
+
+interface LanguageConfig {
+    sourceLang: { code: string; label: string };
+    targetLang: { code: string; label: string };
+}
+
+const LanguageSelections = ({
+    selectedLang,
+    changeLangConfig,
+}: {
+    selectedLang?: LanguageConfig;
+    changeLangConfig: (lang: LanguageConfig) => void;
+}) => {
+    const targetLanguages = [
+        { value: "vi", label: "Tiếng Việt" },
+        { value: "en", label: "English" },
+    ];
+
+    const handleLanguageSwitch = () => {
+        if (selectedLang) {
+            const newConfig = {
+                sourceLang: selectedLang.targetLang,
+                targetLang: selectedLang.sourceLang,
+            };
+            changeLangConfig(newConfig);
+        }
+    };
+
+    return (
+        <div className="mb-3 flex flex-row gap-2 align-middle items-center">
+            <div className="flex w-3/6 items-center relative space-x-2">
+                <Select
+                    className="flex-grow"
+                    value={selectedLang?.targetLang.label}
+                    placeholder={selectedLang?.targetLang.label}
+                >
+                    {targetLanguages.map((lang) => (
+                        <SelectItem
+                            key={lang.value}
+                            value={lang.label}
+                            onClick={() => {
+                                const newConfig = selectedLang;
+                                if (newConfig) {
+                                    newConfig.targetLang = {
+                                        code: lang.value,
+                                        label: lang.label,
+                                    };
+                                    changeLangConfig(newConfig);
+                                }
+                            }}
+                            id={lang.label}
+                        >
+                            {lang.label}
+                        </SelectItem>
+                    ))}
+                </Select>
+                <button
+                    onClick={handleLanguageSwitch}
+                    aria-label="Switch Languages"
+                >
+                    <HiSwitchHorizontal size={20} />
+                </button>
+            </div>
+        </div>
+    );
+};
+
+export { LanguageSelections };
diff --git a/src/app/sections/result.tsx b/src/app/sections/result.tsx
index 2b6a5a9..0293750 100644
--- a/src/app/sections/result.tsx
+++ b/src/app/sections/result.tsx
@@ -12,6 +12,7 @@ import {
 import { LuClipboardCopy } from "react-icons/lu";
 import { TranslateContext } from "../providers/translate";
 import { MdClear } from "react-icons/md";
+import { LanguageSelections } from "./language-selection";
 
 const TextCard = ({
   title,
@@ -89,40 +90,25 @@ const Result = ({
   mode?: Mode;
 }) => {
   const homeContext = useContext(TranslateContext);
-  const data = [
-    {
-      title: "Translate",
-      content: result?.translate ?? "",
-    },
-    {
-      title: "Correct",
-      content: result?.correct ?? "",
-    },
-    {
-      title: "Refine",
-      content: result?.refine ?? "",
-    },
-  ];
+
+  console.log("Result:", result);
+  console.log("Mode", mode);
+
+  // Result: { translate: 'Hello', correct: '', refine: '' }
+  console.log("Text",);
+
 
   return (
     <div className="flex w-full flex-col">
-      <Tabs
-        aria-label="Mode"
-        onSelectionChange={(index) => {
-          const mode = data[index as number].title as Mode;
-          homeContext.setCurrentMode(mode);
-        }}
-      >
-        {data.map((item, index) => (
-          <Tab key={index} title={item.title}>
-            <TextCard
-              title={item.title}
-              content={item.content}
-              isTranslating={isTranslating}
-            />
-          </Tab>
-        ))}
-      </Tabs>
+      <LanguageSelections
+        selectedLang={homeContext.languageConfig}
+        changeLangConfig={homeContext.changeLangConfig}
+      />
+      <TextCard
+        title={mode ?? "Default Title"}
+        content={result?.[mode?.toLowerCase() as keyof typeof result] ?? ""}
+        isTranslating={isTranslating}
+      />
     </div>
   );
 };