diff --git a/src/components/ConversationCard/index.jsx b/src/components/ConversationCard/index.jsx
index 9016b23..c5c71f8 100644
--- a/src/components/ConversationCard/index.jsx
+++ b/src/components/ConversationCard/index.jsx
@@ -175,11 +175,10 @@ function ConversationCard(props) {
 
   return (
     <div className="gpt-inner">
-      <div className="gpt-header">
+      <div className="gpt-header" style="margin: 15px;">
         {props.closeable ? (
           <XLg
             className="gpt-util-icon"
-            style="margin:5px 15px 0px;"
             title={t('Close the Window')}
             size={16}
             onClick={() => {
@@ -189,7 +188,6 @@ function ConversationCard(props) {
         ) : props.dockable ? (
           <Pin
             className="gpt-util-icon"
-            style="margin:5px 15px 0px;"
             title={t('Pin the Window')}
             size={16}
             onClick={() => {
@@ -197,7 +195,7 @@ function ConversationCard(props) {
             }}
           />
         ) : (
-          <img src={logo} style="margin:5px 15px 0px;user-select:none;width:20px;height:20px;" />
+          <img src={logo} style="user-select:none;width:20px;height:20px;" />
         )}
         {props.draggable ? (
           <div className="dragbar" />
diff --git a/src/popup/Popup.jsx b/src/popup/Popup.jsx
index ecfa7e9..a6516df 100644
--- a/src/popup/Popup.jsx
+++ b/src/popup/Popup.jsx
@@ -103,23 +103,22 @@ function GeneralPart({ config, updateConfig }) {
             })}
           </select>
           {isUsingMultiModeModel(config) && (
-            <span style="width: 50%; display: flex; gap: 5px;">
-              <select
-                required
-                onChange={(e) => {
-                  const modelMode = e.target.value
-                  updateConfig({ modelMode: modelMode })
-                }}
-              >
-                {Object.entries(ModelMode).map(([key, desc]) => {
-                  return (
-                    <option value={key} key={key} selected={key === config.modelMode}>
-                      {t(desc)}
-                    </option>
-                  )
-                })}
-              </select>
-            </span>
+            <select
+              style="width: 50%;"
+              required
+              onChange={(e) => {
+                const modelMode = e.target.value
+                updateConfig({ modelMode: modelMode })
+              }}
+            >
+              {Object.entries(ModelMode).map(([key, desc]) => {
+                return (
+                  <option value={key} key={key} selected={key === config.modelMode}>
+                    {t(desc)}
+                  </option>
+                )
+              })}
+            </select>
           )}
           {isUsingApiKey(config) && (
             <span style="width: 50%; display: flex; gap: 5px;">
@@ -154,17 +153,16 @@ function GeneralPart({ config, updateConfig }) {
             </span>
           )}
           {isUsingCustomModel(config) && (
-            <span style="width: 50%; display: flex; gap: 5px;">
-              <input
-                type="text"
-                value={config.customModelName}
-                placeholder={t('Model Name')}
-                onChange={(e) => {
-                  const customModelName = e.target.value
-                  updateConfig({ customModelName: customModelName })
-                }}
-              />
-            </span>
+            <input
+              style="width: 50%;"
+              type="text"
+              value={config.customModelName}
+              placeholder={t('Model Name')}
+              onChange={(e) => {
+                const customModelName = e.target.value
+                updateConfig({ customModelName: customModelName })
+              }}
+            />
           )}
         </span>
         {isUsingCustomModel(config) && (
@@ -181,41 +179,39 @@ function GeneralPart({ config, updateConfig }) {
       </label>
       <label>
         <legend>{t('Preferred Language')}</legend>
-        <span style="display: flex; gap: 15px;">
-          <select
-            required
-            onChange={(e) => {
-              const preferredLanguageKey = e.target.value
-              updateConfig({ preferredLanguage: preferredLanguageKey })
+        <select
+          required
+          onChange={(e) => {
+            const preferredLanguageKey = e.target.value
+            updateConfig({ preferredLanguage: preferredLanguageKey })
 
-              let lang
-              if (preferredLanguageKey === 'auto') lang = config.userLanguage
-              else lang = preferredLanguageKey
-              i18n.changeLanguage(lang)
+            let lang
+            if (preferredLanguageKey === 'auto') lang = config.userLanguage
+            else lang = preferredLanguageKey
+            i18n.changeLanguage(lang)
 
-              Browser.tabs.query({}).then((tabs) => {
-                tabs.forEach((tab) => {
-                  Browser.tabs
-                    .sendMessage(tab.id, {
-                      type: 'CHANGE_LANG',
-                      data: {
-                        lang,
-                      },
-                    })
-                    .catch(() => ({}))
-                })
+            Browser.tabs.query({}).then((tabs) => {
+              tabs.forEach((tab) => {
+                Browser.tabs
+                  .sendMessage(tab.id, {
+                    type: 'CHANGE_LANG',
+                    data: {
+                      lang,
+                    },
+                  })
+                  .catch(() => ({}))
               })
-            }}
-          >
-            {Object.entries(languageList).map(([k, v]) => {
-              return (
-                <option value={k} key={k} selected={k === config.preferredLanguage}>
-                  {v.native}
-                </option>
-              )
-            })}
-          </select>
-        </span>
+            })
+          }}
+        >
+          {Object.entries(languageList).map(([k, v]) => {
+            return (
+              <option value={k} key={k} selected={k === config.preferredLanguage}>
+                {v.native}
+              </option>
+            )
+          })}
+        </select>
       </label>
       <label>
         <input