diff --git a/src/pages/Popup/UserAgentPage.tsx b/src/pages/Popup/UserAgentPage.tsx
index cc195bf..4c86a92 100644
--- a/src/pages/Popup/UserAgentPage.tsx
+++ b/src/pages/Popup/UserAgentPage.tsx
@@ -1,12 +1,14 @@
 import React, { useState, useEffect } from 'react'
-import { Box, Label, Radio, Flex, Input } from 'theme-ui'
+import { Box, Label, Radio, Flex, Input, Select } from 'theme-ui'
 import userAgents from '../../utils/userAgents'
 import detachDebugger from '../../utils/detachDebugger'
+import UserAgentSelect from './UserAgentSelect'
 
 const LocationPage = () => {
   const [type, setType] = useState('desktop')
+  const [operatingSystem, setOperatingSystem] = useState('linux')
+  const [browser, setBrowser] = useState('')
   const [userAgent, setUserAgent] = useState('')
-  // const [configuration, setConfiguration] = useState('default')
 
   useEffect(() => {
     chrome.storage.sync.get(['type', 'userAgent'], (result) => {
@@ -21,6 +23,14 @@ const LocationPage = () => {
     setType(e.target.value)
   }
 
+  const changeOperatingSystem = (e: any) => {
+    // detachDebugger()
+    // chrome.storage.sync.set({ userAgent: e.target.value })
+    // chrome.storage.sync.set({ type: 'custom' })
+    // setUserAgent(e.target.value)
+    // setType('custom')
+  }
+
   const changeUserAgent = (e: any) => {
     detachDebugger()
     chrome.storage.sync.set({ userAgent: e.target.value })
@@ -66,23 +76,48 @@ const LocationPage = () => {
           Custom
         </Label>
       </Flex>
-      {/* <UserAgentSelect
-        title="Operating System"
-        configuration={configuration}
-        setConfiguration={setConfiguration}
-      />
-      <UserAgentSelect
-        title="Browser"
-        configuration={configuration}
-        setConfiguration={setConfiguration}
-      /> */}
-      {/* <LocationInput
-        type="userAgent"
-        title="User Agent"
-        ip={ip}
-        configuration={configuration}
-        setConfiguration={setConfiguration}
-      /> */}
+      {(type === 'desktop' || type === 'mobile') && (
+        <>
+          <Label htmlFor="operatingSystem">Operating System</Label>
+          <Select
+            name="operatingSystem"
+            id="operatingSystem"
+            value={operatingSystem}
+            onChange={changeOperatingSystem}
+            mb={'8px'}
+          >
+            {Object.keys(userAgents[type]).map((key) => (
+              <option value={key} key={key}>
+                {key}
+              </option>
+            ))}
+          </Select>
+          <Label htmlFor="browser">Browser</Label>
+          <Select
+            name="browser"
+            id="browser"
+            // value={operatingSystem}
+            // onChange={changeOperatingSystem}
+            mb={'8px'}
+          >
+            {Object.keys(userAgents[type][operatingSystem]).map((key) => (
+              <option value={key} key={key}>
+                {key}
+              </option>
+            ))}
+          </Select>
+          {/* <UserAgentSelect
+            title="Operating System"
+            configuration={operatingSystem}
+            setConfiguration={setOperatingSystem}
+          />
+          <UserAgentSelect
+            title="Browser"
+            configuration={browser}
+            setConfiguration={setBrowser}
+          /> */}
+        </>
+      )}
       <Label htmlFor="userAgent">User Agent</Label>
       <Input name="userAgent" value={userAgent} onChange={changeUserAgent} />
     </Box>
diff --git a/src/pages/Popup/UserAgentSelect.tsx b/src/pages/Popup/UserAgentSelect.tsx
index e40bbf2..2e1beae 100644
--- a/src/pages/Popup/UserAgentSelect.tsx
+++ b/src/pages/Popup/UserAgentSelect.tsx
@@ -9,7 +9,7 @@ interface ConfigurationSelectProps {
   setConfiguration: Dispatch<SetStateAction<string>>
 }
 
-const ConfigurationSelect = ({
+const UserAgentSelect = ({
   title,
   configuration,
   setConfiguration,
@@ -47,4 +47,4 @@ const ConfigurationSelect = ({
   )
 }
 
-export default ConfigurationSelect
+export default UserAgentSelect
diff --git a/src/utils/userAgents.ts b/src/utils/userAgents.ts
index 7b61387..5df8841 100644
--- a/src/utils/userAgents.ts
+++ b/src/utils/userAgents.ts
@@ -1,18 +1,59 @@
-const userAgents = [
-  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36',
-  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36',
-  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.54 Safari/537.36',
-  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.88 Safari/537.36',
-  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.75 Safari/537.36',
-  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.88 Safari/537.36',
-  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.54 Safari/537.36',
-  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.41 Safari/537.36',
-  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.75 Safari/537.36',
-  'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36',
-  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36 Edg/100.0.1185.50',
-  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36 Edg/100.0.1185.44',
-  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.41 Safari/537.36 Edg/101.0.1210.32',
-  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.41 Safari/537.36',
-]
+const userAgents: any = {
+  desktop: {
+    windows: {
+      chrome:
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
+      edge: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36 Edg/103.0.1264.62',
+      firefox:
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0',
+      brave:
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Brave Chrome/83.0.4103.116 Safari/537.36',
+    },
+    mac: {
+      safari:
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 12_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Safari/605.1.15',
+      chrome:
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 12_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
+      edge: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 12_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36 Edg/103.0.1264.62',
+      firefox:
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 12.4; rv:102.0) Gecko/20100101 Firefox/102.0',
+      brave:
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_5) AppleWebKit/537.36 (KHTML, like Gecko) Brave Chrome/83.0.4103.116 Safari/537.36',
+    },
+    linux: {
+      chrome:
+        'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
+      edge: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.75 Safari/537.36 Edg/100.0.1185.44',
+      firefox:
+        'Mozilla/5.0 (X11; Linux i686; rv:102.0) Gecko/20100101 Firefox/102.0',
+      brave:
+        'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Brave Chrome/80.0.3987.99 Safari/537.36',
+    },
+  },
+  mobile: {
+    android: {
+      samsung:
+        'Mozilla/5.0 (Linux; Android 12; SAMSUNG SM-G991B) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/16.0 Chrome/92.0.4515.166 Mobile Safari/537.36',
+      chrome:
+        'Mozilla/5.0 (Linux; Android 10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.71 Mobile Safari/537.36',
+      edge: 'Mozilla/5.0 (Linux; Android 10; HD1913) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.71 Mobile Safari/537.36 EdgA/100.0.1185.50',
+      firefox:
+        'Mozilla/5.0 (Android 12; Mobile; rv:68.0) Gecko/68.0 Firefox/102.0',
+      brave:
+        'Mozilla/5.0 (Linux; Android 8.0.0; SM-G960F Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.75 Mobile Safari/537.36',
+    },
+    ios: {
+      safari:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.4 Mobile/15E148 Safari/604.1',
+      chrome:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/103.0.5060.63 Mobile/15E148 Safari/604.1',
+      edge: 'Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.0 EdgiOS/100.1185.50 Mobile/15E148 Safari/605.1.15',
+      firefox:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/102.0 Mobile/15E148 Safari/605.1.15',
+      brave:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 10_0 like Mac OS X) AppleWebKit/602.1.38 (KHTML, like Gecko) Brave/1.2.9 Mobile/14A5297c Safari/602.1.38',
+    },
+  },
+}
 
 export default userAgents
diff --git a/src/utils/userAgents2.ts b/src/utils/userAgents2.ts
new file mode 100644
index 0000000..7b61387
--- /dev/null
+++ b/src/utils/userAgents2.ts
@@ -0,0 +1,18 @@
+const userAgents = [
+  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36',
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36',
+  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.54 Safari/537.36',
+  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.88 Safari/537.36',
+  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.75 Safari/537.36',
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.88 Safari/537.36',
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.54 Safari/537.36',
+  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.41 Safari/537.36',
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.75 Safari/537.36',
+  'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36',
+  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36 Edg/100.0.1185.50',
+  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36 Edg/100.0.1185.44',
+  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.41 Safari/537.36 Edg/101.0.1210.32',
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.41 Safari/537.36',
+]
+
+export default userAgents