diff --git a/src/components/common/input/QInput.jsx b/src/components/common/input/QInput.jsx
index aea2d66e..39b8be08 100644
--- a/src/components/common/input/QInput.jsx
+++ b/src/components/common/input/QInput.jsx
@@ -41,32 +41,28 @@ export default function QInput({ type, readOnly = false, options = [], value, on
   )
 
   return (
-    <div className="input-content light">
-      <div className="input-wrap">
-        <div className="form-input">
-          {type === 'text' ? (
-            <div className="mb5">
-              <input type={type} className="input-light" readOnly={readOnly ? true : false} value={value} onChange={handleTextChange} />
-            </div>
-          ) : type === 'radio' || type === 'checkbox' ? (
-            <div className="flx mb5">
-              {options?.map((option) => (
-                <div key={option.name} className={`d-${type}-radio light mr5`}>
-                  <input
-                    type={type}
-                    name={type === 'radio' ? 'radioGroup' : 'checkboxGroup'}
-                    value={option.value}
-                    id={option.id}
-                    checked={type === 'radio' ? value === option.value : value.includes(option.value)}
-                    onChange={(e) => handleChange(e, option.value)}
-                  />
-                  <label htmlFor={option.id}>{option.name}</label>
-                </div>
-              ))}
-            </div>
-          ) : null}
+    <>
+      {type === 'text' ? (
+        <div className="mb5">
+          <input type={type} className="input-light" readOnly={readOnly ? true : false} value={value} onChange={handleTextChange} />
         </div>
-      </div>
-    </div>
+      ) : type === 'radio' || type === 'checkbox' ? (
+        <div className="flx mb5">
+          {options?.map((option) => (
+            <div key={option.name} className={`d-${type}-radio light mr5`}>
+              <input
+                type={type}
+                name={type === 'radio' ? 'radioGroup' : 'checkboxGroup'}
+                value={option.value}
+                id={option.id}
+                checked={type === 'radio' ? value === option.value : value.includes(option.value)}
+                onChange={(e) => handleChange(e, option.value)}
+              />
+              <label htmlFor={option.id}>{option.name}</label>
+            </div>
+          ))}
+        </div>
+      ) : null}
+    </>
   )
 }
diff --git a/src/components/common/select/QSelect.jsx b/src/components/common/select/QSelect.jsx
index ba89ef04..acf0ac6b 100644
--- a/src/components/common/select/QSelect.jsx
+++ b/src/components/common/select/QSelect.jsx
@@ -18,25 +18,17 @@ export default function QSelect({ placeholder, options, disabled = false, dark =
   )
 
   return (
-    <div className="input-content light">
-      <div className="input-wrap">
-        <div className="form-input">
-          <div className="mb5">
-            <select className={`select-light ${dark ? 'dark' : ''}`} value={value} onChange={handleChange} disabled={disabled ? true : false}>
-              {placeholder?.length > 0 ? (
-                <option value="" disabled hidden>
-                  {placeholder}
-                </option>
-              ) : null}
-              {options.map((option) => (
-                <option key={option.name} value={option.value}>
-                  {option.name}
-                </option>
-              ))}
-            </select>
-          </div>
-        </div>
-      </div>
-    </div>
+    <select className={`select-light ${dark ? 'dark' : ''}`} value={value} onChange={handleChange} disabled={disabled ? true : false}>
+      {placeholder && (
+        <option value="" disabled hidden>
+          {placeholder}
+        </option>
+      )}
+      {options.map((option) => (
+        <option key={option.name} value={option.value}>
+          {option.name}
+        </option>
+      ))}
+    </select>
   )
 }