diff --git a/src/pages/Popup/LocationInput.tsx b/src/pages/Popup/LocationInput.tsx
index 7890c2a..e7a2d9a 100644
--- a/src/pages/Popup/LocationInput.tsx
+++ b/src/pages/Popup/LocationInput.tsx
@@ -39,8 +39,8 @@ const LocationInput = ({
         chrome.storage.sync.set({ [type]: ipTypeValue })
       }
     } else if (configuration === 'custom') {
-      chrome.storage.sync.get([type], (result) => {
-        result[type] && setValue(result[type])
+      chrome.storage.sync.get([type], (storage) => {
+        storage[type] && setValue(storage[type])
       })
     } else if (configuration !== 'default') {
       setValue(configurations[configuration][type])
diff --git a/src/pages/Popup/LocationPage.tsx b/src/pages/Popup/LocationPage.tsx
index 62a159e..c4b9353 100644
--- a/src/pages/Popup/LocationPage.tsx
+++ b/src/pages/Popup/LocationPage.tsx
@@ -14,10 +14,10 @@ const LocationPage = ({ tab }: LocationPageProps) => {
   const [configuration, setConfiguration] = useState('default')
 
   useEffect(() => {
-    chrome.storage.sync.get(['configuration', 'ipData'], (result) => {
-      result.configuration && setConfiguration(result.configuration)
-      if (result.ipData) {
-        setIP(result.ipData)
+    chrome.storage.sync.get(['configuration', 'ipData'], (storage) => {
+      storage.configuration && setConfiguration(storage.configuration)
+      if (storage.ipData) {
+        setIP(storage.ipData)
       } else {
         Promise.resolve(getIP()).then((ipData) => setIP(ipData))
       }
diff --git a/src/pages/Popup/SettingsCheckBox.tsx b/src/pages/Popup/SettingsCheckBox.tsx
index 67efcbf..b7edba2 100644
--- a/src/pages/Popup/SettingsCheckBox.tsx
+++ b/src/pages/Popup/SettingsCheckBox.tsx
@@ -2,12 +2,14 @@ import { Label, Checkbox } from 'theme-ui'
 
 interface LocationPageProps {
   title: string
+  onChange?: () => void
+  checked?: boolean
 }
 
-const SettingsCheckBox = ({ title }: LocationPageProps) => {
+const SettingsCheckBox = ({ title, onChange, checked }: LocationPageProps) => {
   return (
     <Label sx={{ mb: '8px' }}>
-      <Checkbox defaultChecked={true} />
+      <Checkbox onChange={onChange} checked={checked} />
       {title}
     </Label>
   )
diff --git a/src/pages/Popup/SettingsPage.tsx b/src/pages/Popup/SettingsPage.tsx
index 86081d6..18f5c95 100644
--- a/src/pages/Popup/SettingsPage.tsx
+++ b/src/pages/Popup/SettingsPage.tsx
@@ -1,5 +1,6 @@
 import { useState, useEffect } from 'react'
-import { Box, Label, Checkbox, Select } from 'theme-ui'
+import { Box, Label, Select } from 'theme-ui'
+import setWebRtcPolicy from '../../utils/setWebRtcPolicy'
 import SettingsCheckBox from './SettingsCheckBox'
 
 interface LocationPageProps {
@@ -7,9 +8,13 @@ interface LocationPageProps {
 }
 
 const SettingsPage = ({ tab }: LocationPageProps) => {
-  const [ip, setIP] = useState(null)
+  const [isWebRtcDisabled, setIsWebRtcDisabled] = useState(false)
 
-  useEffect(() => {}, [])
+  useEffect(() => {
+    chrome.storage.sync.get(['isWebRtcDisabled'], (storage) => {
+      storage.isWebRtcDisabled && setIsWebRtcDisabled(storage.isWebRtcDisabled)
+    })
+  }, [])
 
   return (
     <Box
@@ -18,17 +23,31 @@ const SettingsPage = ({ tab }: LocationPageProps) => {
       }}
     >
       <Box sx={{ fontSize: '20px', mb: '12px' }}>Settings</Box>
-      <SettingsCheckBox title={'Block WebRTC'} />
+      <SettingsCheckBox
+        title={'Block WebRTC'}
+        onChange={() => {
+          setWebRtcPolicy()
+          setIsWebRtcDisabled(!isWebRtcDisabled)
+        }}
+        checked={isWebRtcDisabled}
+      />
       <SettingsCheckBox title={'Block Address Autofill'} />
       <SettingsCheckBox title={'Dark Mode'} />
       <Label htmlFor="configuration">Language</Label>
       <Select name="Language" id="Language">
+        <option>Arabic</option>
+        <option>Bengali</option>
         <option>English</option>
         <option>French</option>
-        <option>Chinese</option>
+        <option>Hindi</option>
+        <option>Mandarin Chinese</option>
+        <option>Persian</option>
+        <option>Portuguese</option>
         <option>Russian</option>
-        <option>Farsi</option>
-
+        <option>Spanish</option>
+        <option>Turkish</option>
+        <option>Ukrainian</option>
+        <option>Urdu</option>
         {/* {Object.keys(configurations).map((key) => (
             <option value={key} key={key}>
               {configurations[key].name}
diff --git a/src/pages/Popup/UserAgentPage.tsx b/src/pages/Popup/UserAgentPage.tsx
index b172eb9..67d335d 100644
--- a/src/pages/Popup/UserAgentPage.tsx
+++ b/src/pages/Popup/UserAgentPage.tsx
@@ -16,11 +16,11 @@ const UserAgentPage = ({ tab }: UserAgentPageProps) => {
   useEffect(() => {
     chrome.storage.sync.get(
       ['type', 'operatingSystem', 'browser', 'userAgent'],
-      (result) => {
-        result.type && setType(result.type)
-        result.operatingSystem && setOperatingSystem(result.operatingSystem)
-        result.browser && setBrowser(result.browser)
-        result.userAgent && setUserAgent(result.userAgent)
+      (storage) => {
+        storage.type && setType(storage.type)
+        storage.operatingSystem && setOperatingSystem(storage.operatingSystem)
+        storage.browser && setBrowser(storage.browser)
+        storage.userAgent && setUserAgent(storage.userAgent)
       }
     )
   }, [])
diff --git a/src/utils/attachDebugger.ts b/src/utils/attachDebugger.ts
index 2babc64..0399cd5 100644
--- a/src/utils/attachDebugger.ts
+++ b/src/utils/attachDebugger.ts
@@ -12,13 +12,13 @@ const attachDebugger = (tabId: number) => {
       'localeMatchIP',
       'userAgent',
     ],
-    (result) => {
+    (storage) => {
       if (
-        result.timezone ||
-        result.lat ||
-        result.lon ||
-        result.locale ||
-        result.userAgent
+        storage.timezone ||
+        storage.lat ||
+        storage.lon ||
+        storage.locale ||
+        storage.userAgent
       ) {
         chrome.debugger.attach({ tabId: tabId }, '1.3', () => {
           if (!chrome.runtime.lastError) {
@@ -31,12 +31,12 @@ const attachDebugger = (tabId: number) => {
             //   }
             // )
 
-            if (result.timezone) {
+            if (storage.timezone) {
               chrome.debugger.sendCommand(
                 { tabId: tabId },
                 'Emulation.setTimezoneOverride',
                 {
-                  timezoneId: result.timezone,
+                  timezoneId: storage.timezone,
                 },
                 () => {
                   if (
@@ -51,38 +51,38 @@ const attachDebugger = (tabId: number) => {
               )
             }
 
-            if (result.locale) {
+            if (storage.locale) {
               chrome.debugger.sendCommand(
                 { tabId: tabId },
                 'Emulation.setLocaleOverride',
                 {
-                  locale: result.locale,
+                  locale: storage.locale,
                 }
               )
             }
 
-            if (result.lat || result.lon) {
+            if (storage.lat || storage.lon) {
               chrome.debugger.sendCommand(
                 { tabId: tabId },
                 'Emulation.setGeolocationOverride',
                 {
-                  latitude: result.lat
-                    ? parseFloat(result.lat)
-                    : result.ipData.lat,
-                  longitude: result.lon
-                    ? parseFloat(result.lon)
-                    : result.ipData.lon,
+                  latitude: storage.lat
+                    ? parseFloat(storage.lat)
+                    : storage.ipData.lat,
+                  longitude: storage.lon
+                    ? parseFloat(storage.lon)
+                    : storage.ipData.lon,
                   accuracy: 1,
                 }
               )
             }
 
-            if (result.userAgent) {
+            if (storage.userAgent) {
               chrome.debugger.sendCommand(
                 { tabId: tabId },
                 'Emulation.setUserAgentOverride',
                 {
-                  userAgent: result.userAgent,
+                  userAgent: storage.userAgent,
                 }
                 // { acceptLanguage: "en-CA" },
                 // { platform: "WebTV OS" }
diff --git a/src/utils/setWebRtcPolicy.ts b/src/utils/setWebRtcPolicy.ts
new file mode 100644
index 0000000..721bf87
--- /dev/null
+++ b/src/utils/setWebRtcPolicy.ts
@@ -0,0 +1,34 @@
+const setWebRtcPolicy = () => {
+  chrome.storage.sync.get(['isWebRtcDisabled'], (storage) => {
+    const value = storage.isWebRtcDisabled
+      ? 'default'
+      : 'disable_non_proxied_udp'
+
+    chrome.privacy.network.webRTCIPHandlingPolicy.clear({}, () => {
+      chrome.privacy.network.webRTCIPHandlingPolicy.set(
+        {
+          value,
+        },
+        () => {
+          chrome.storage.sync.set({
+            isWebRtcDisabled: !storage.isWebRtcDisabled,
+          })
+          //   chrome.privacy.network.webRTCIPHandlingPolicy.get({}, (s) => {
+          //     // let path = 'data/icons/'
+          //     // let title = 'WebRTC access is allowed'
+          //     if (s.value !== value) {
+          //     //   path += 'red/'
+          //     //   title =
+          //         console.log('WebRTC access cannot be changed. It is controlled by another extension')
+          //     } else if (prefs.enabled === false) {
+          //       path += 'disabled/'
+          //       title = 'WebRTC access is blocked'
+          //     }
+          //   })
+        }
+      )
+    })
+  })
+}
+
+export default setWebRtcPolicy