diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a..526b4c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d5d35ec..f12cc7c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/drawable/dashed_line.xml" value="0.24267100977198697" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/drawable/ic_baseline_vpn_key_24.xml" value="0.24267100977198697" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/drawable/ic_check.xml" value="0.24267100977198697" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/drawable/ic_github.xml" value="0.24267100977198697" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/drawable/ic_globe.xml" value="0.24267100977198697" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/drawable/ic_lock.xml" value="0.24267100977198697" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/drawable/ic_minus.xml" value="0.24267100977198697" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/drawable/ic_network.xml" value="0.24267100977198697" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/drawable/ic_road.xml" value="0.24267100977198697" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/drawable/ic_settings.xml" value="0.24267100977198697" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/drawable/ic_shield.xml" value="0.24267100977198697" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/drawable/ic_ship.xml" value="0.24267100977198697" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/drawable/ic_telegram.xml" value="0.24267100977198697" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/drawable/ic_user.xml" value="0.24267100977198697" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/drawable/ic_vpn.xml" value="0.24267100977198697" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/drawable/rounded_background_for_btm.xml" value="0.24267100977198697" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/layout/activity_main.xml" value="0.23257328990228013" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/layout/design_my_ip_dialog.xml" value="0.2348684210526316" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/layout/design_result_btm.xml" value="0.22291666666666668" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/layout/design_telegram_input_dialog.xml" value="0.2348684210526316" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/layout/settings_activity.xml" value="0.2237785016286645" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/menu/toolbar_menu.xml" value="0.2348684210526316" />
+        <entry key="..\:/AndroidProjects/Kotlin/ProxyChecker/app/src/main/res/xml/root_preferences.xml" value="0.2348684210526316" />
+      </map>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 36bd345..cb95ff7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,15 +4,15 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 32
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "github.arash.kotlin.proxychecker"
         minSdkVersion 21
-        targetSdkVersion 30
-        versionCode 3
-        versionName "1.2 - Github"
+        targetSdkVersion 32
+        versionCode 4
+        versionName "1.3 - Github"
 
         archivesBaseName = "ProxyChecker - v$versionCode"
 
@@ -40,11 +40,12 @@ android {
 dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.6.0'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
     implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:4.+'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.preference:preference-ktx:1.1.1'
+    testImplementation 'junit:junit:'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4176e40..256bb8e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,17 +3,18 @@
     package="github.arash.kotlin.proxychecker">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:networkSecurityConfig="@xml/network_security_config"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.ProxyChecker">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/github/arash/kotlin/proxychecker/G.kt b/app/src/main/java/github/arash/kotlin/proxychecker/G.kt
deleted file mode 100644
index d12cab8..0000000
--- a/app/src/main/java/github/arash/kotlin/proxychecker/G.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package github.arash.kotlin.proxychecker
-
-class G {
-    companion object {
-        const val SaveCredential_SharedPreferencesKey: String = "SaveCredentialP"
-        const val ProxyAddress_SharedPreferencesKey = "ProxyAddressP"
-        const val PortNumber_SharedPreferencesKey = "PortNumberP"
-        const val Username_SharedPreferencesKey = "UsernameP"
-        const val Password_SharedPreferencesKey = "PasswordP"
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/github/arash/kotlin/proxychecker/MainActivity.kt b/app/src/main/java/github/arash/kotlin/proxychecker/MainActivity.kt
index c3b6f5e..c2e3943 100644
--- a/app/src/main/java/github/arash/kotlin/proxychecker/MainActivity.kt
+++ b/app/src/main/java/github/arash/kotlin/proxychecker/MainActivity.kt
@@ -1,22 +1,20 @@
 package github.arash.kotlin.proxychecker
 
 import android.app.AlertDialog
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.content.Intent
+import android.content.*
 import android.net.ConnectivityManager
 import android.net.Uri
 import android.os.Bundle
 import android.os.StrictMode
 import android.util.Log
 import android.view.*
-import android.view.View.GONE
-import android.view.View.VISIBLE
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceManager
 import com.androidnetworking.AndroidNetworking
 import com.androidnetworking.error.ANError
 import com.androidnetworking.interfaces.JSONObjectRequestListener
@@ -39,98 +37,112 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
         super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+        if (savedInstanceState == null) {
+            supportFragmentManager
+                .beginTransaction()
+                .replace(R.id.settings, SettingsFragment())
+                .commit()
+        }
+
         binding = ActivityMainBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        setSupportActionBar(binding.toolbar)
-
-        AndroidNetworking.initialize(this)
-        PreferenceHelper.initialize(this)
-
-        StrictMode.setThreadPolicy(StrictMode.ThreadPolicy.Builder().permitAll().build())
-
-        //Enter data from SharedPreferences
-        binding.ProxyAddress.setText(PreferenceHelper.getInstance().getString(G.ProxyAddress_SharedPreferencesKey, ""))
-        binding.ProxyPort.setText(PreferenceHelper.getInstance().getString(G.PortNumber_SharedPreferencesKey, ""))
-        binding.ProxyUsername.setText(PreferenceHelper.getInstance().getString(G.Username_SharedPreferencesKey, ""))
-        binding.ProxyPassword.setText(PreferenceHelper.getInstance().getString(G.Password_SharedPreferencesKey, ""))
-
-        val connectivityManager: ConnectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        if (connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_VPN)!!.isConnectedOrConnecting)
-            binding.vpnAlertTV.visibility = VISIBLE
-
-        var okHttpClient: OkHttpClient
-        binding.StartTheTestButton.setOnClickListener {
-            binding.ProgressBar.visibility = VISIBLE
-            binding.StartTheTestButton.text = "Please Wait..."
-            binding.StartTheTestButton.isEnabled = false
-
-            //Proxy Type
-            okHttpClient = if (binding.ProxyTypeToggleGroup.checkedButtonId == R.id.ProxyTypeHTTPS)
-                OkHttpClient.Builder().proxy(Proxy(Proxy.Type.HTTP,
-                    InetSocketAddress(binding.ProxyAddress.text.toString(),
-                        binding.ProxyPort.text.toString().toInt()))).build()
-            else
-                OkHttpClient.Builder().proxy(Proxy(Proxy.Type.SOCKS,
-                    InetSocketAddress(binding.ProxyAddress.text.toString(),
-                        binding.ProxyPort.text.toString().toInt()))).build()
-
-            //Proxy Credential
-            Authenticator.setDefault(object : Authenticator() {
-                override fun getPasswordAuthentication(): PasswordAuthentication? {
-                    if (requestingHost.equals(binding.ProxyAddress.text.toString()))
-                        if (requestingPort == binding.ProxyPort.text.toString().toInt())
-                            return PasswordAuthentication(binding.ProxyUsername.text.toString(),
-                                binding.ProxyPassword.text.toString().toCharArray()
-                    )
-                    return null
-                }
-            })
-
-            //Make a Get Request
-            AndroidNetworking.get("http://ip-api.com/json")
-                .setOkHttpClient(okHttpClient)
-                .build()
-                .getAsJSONObject(object : JSONObjectRequestListener {
-                    override fun onResponse(response: JSONObject?) {
-                        Log.i("MainTAG", "Response: ${response.toString()}")
-                        if (response!!.get("status").equals("success")) {
-
-                            resultBottomSheet(response)
-
-                            binding.ProgressBar.visibility = GONE
-                            binding.StartTheTestButton.text = "Test The Proxy"
-                            binding.StartTheTestButton.isEnabled = true
-                        }
-                    }
+        binding.apply {
+            setContentView(root)
+            setSupportActionBar(toolbar)
+            val preferenceManager = PreferenceManager.getDefaultSharedPreferences(this@MainActivity)
 
-                    override fun onError(anError: ANError?) {
-                        binding.ProgressBar.visibility = GONE
-                        binding.StartTheTestButton.text = "Test The Proxy"
-                        binding.StartTheTestButton.isEnabled = true
-                        Snackbar.make(binding.root, "Connection failed", Snackbar.LENGTH_LONG)
-                            .setAction("Copy info") { copyToClipboard(anError?.message.toString())}
-                            .show()
-                    }
-                })
+            AndroidNetworking.initialize(this@MainActivity)
+
+            StrictMode.setThreadPolicy(StrictMode.ThreadPolicy.Builder().permitAll().build())
 
-            PreferenceHelper.getInstance().setString(G.ProxyAddress_SharedPreferencesKey, binding.ProxyAddress.text.toString())
-            PreferenceHelper.getInstance().setString(G.PortNumber_SharedPreferencesKey, binding.ProxyPort.text.toString())
+            val connectivityManager: ConnectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+            connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_VPN)?.let {
+                if(preferenceManager.getBoolean("VPN_ALERT", true) && it.isConnectedOrConnecting)
+                    binding.vpnAlertTV.visibility = View.VISIBLE
+            }
+
+            var okHttpClient: OkHttpClient
+            btnGO.setOnClickListener {
+                try {
 
-            if (PreferenceHelper.getInstance().getBoolean(G.SaveCredential_SharedPreferencesKey)) {
-                PreferenceHelper.getInstance()
-                    .setString(G.Username_SharedPreferencesKey, binding.ProxyUsername.text.toString())
-                PreferenceHelper.getInstance()
-                    .setString(G.Password_SharedPreferencesKey, binding.ProxyPassword.text.toString())
+                    ProgressBar.visibility = View.VISIBLE
+                    btnGO.text = "Please Wait..."
+                    btnGO.isEnabled = false
+
+                    val proxyAddress: String? = preferenceManager.getString("ProxyServer", null)
+                    val proxyPort: String? = preferenceManager.getString("RemotePort", null)
+
+                    //Proxy Type with okHttpClient
+                    okHttpClient = OkHttpClient.Builder().proxy(Proxy(
+                        when (preferenceManager.getString("ProxyType", "socks5")) {
+                            "socks5" -> Proxy.Type.SOCKS
+                            else -> Proxy.Type.HTTP
+                        }, InetSocketAddress(proxyAddress, proxyPort!!.toInt()))).build()
+
+                    //Proxy Credential
+                    Authenticator.setDefault(object : Authenticator() {
+                        override fun getPasswordAuthentication(): PasswordAuthentication? {
+                            if (requestingHost.equals(proxyAddress))
+                                if (requestingPort ==  proxyPort.toInt())
+                                    return PasswordAuthentication(preferenceManager.getString("CredentialUsername", null),
+                                        preferenceManager.getString("CredentialPassword", null)?.toCharArray())
+                            return null
+                        }
+                    })
+
+                    val startTime = System.currentTimeMillis()
+                    //Make a Get Request
+                    AndroidNetworking.get("http://ip-api.com/json")
+                        .setOkHttpClient(okHttpClient)
+                        .doNotCacheResponse()
+                        .build()
+                        .getAsJSONObject(object : JSONObjectRequestListener {
+                            override fun onResponse(response: JSONObject?) {
+                                Log.i("MainTAG", "Response: ${response.toString()}")
+                                if (response!!.get("status").equals("success")) {
+                                    val endTime = System.currentTimeMillis()
+                                    resultBottomSheet(response, endTime - startTime)
+                                    ProgressBar.visibility = View.GONE
+                                    btnGO.text = "Start Checking"
+                                    btnGO.isEnabled = true
+                                }
+                            }
+
+                            override fun onError(anError: ANError?) {
+                                ProgressBar.visibility = View.GONE
+                                btnGO.text = "Start Checking"
+                                btnGO.isEnabled = true
+                                Snackbar.make(root, "Connection failed | ${anError?.errorCode}", Snackbar.LENGTH_LONG).setAnchorView(btnGO)
+                                    .setAction("Copy info") { copyToClipboard(anError?.message.toString())}
+                                    .show()
+                            }
+                        })
+
+                }catch (ex:Exception){
+                    ex.printStackTrace()
+                    ProgressBar.visibility = View.GONE
+                    btnGO.text = "Start Checking"
+                    btnGO.isEnabled = true
+                    Snackbar.make(root, "ERROR!", Snackbar.LENGTH_LONG).setAnchorView(btnGO)
+                        .setAction("Copy info") { copyToClipboard(ex.toString())}
+                        .show()
+                }
             }
         }
 
-        binding.SaveCredentialCheckBox.isChecked =
-            PreferenceHelper.getInstance().getBoolean(G.SaveCredential_SharedPreferencesKey)
-        binding.SaveCredentialCheckBox.setOnCheckedChangeListener { _, isChecked ->
-            PreferenceHelper.getInstance()
-                .setBoolean(G.SaveCredential_SharedPreferencesKey, isChecked)
+    }
+
+    class SettingsFragment : PreferenceFragmentCompat() {
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            setPreferencesFromResource(R.xml.root_preferences, rootKey)
         }
 
+        override fun onPreferenceTreeClick(preference: Preference?): Boolean {
+            when(preference?.key){
+                "MoreMY_IP" -> MyIpDialog().show(requireContext())
+            }
+            return super.onPreferenceTreeClick(preference)
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -143,70 +155,77 @@ class MainActivity : AppCompatActivity() {
         when (item.itemId) {
             R.id.Action_Github ->
                 startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.github_address))))
-
-            R.id.Action_ImportTelegramProxy -> importTelegramProxy()
+            R.id.Action_ImportTelegramProxy ->
+                importTelegramProxy()
         }
         return super.onOptionsItemSelected(item)
     }
 
-    private fun resultBottomSheet(response: JSONObject?){
-
-        val resultBottomSheet = BottomSheetDialog(this@MainActivity)
-        resultBottomSheet.setContentView(R.layout.design_result_btm)
-
-        val resultFinalIP: TextView? =
-            resultBottomSheet.findViewById(R.id.resultFinalIP)
-        val resultCountry: TextView? =
-            resultBottomSheet.findViewById(R.id.resultCountry)
-        val resultCity: TextView? =
-            resultBottomSheet.findViewById(R.id.resultCity)
-        val resultISP: TextView? =
-            resultBottomSheet.findViewById(R.id.resultISP)
-
-        resultFinalIP?.text = response?.get("query").toString()
-        resultCountry?.text = response?.get("country").toString()
-        resultCity?.text = response?.get("city").toString()
-        resultISP?.text = response?.get("isp").toString()
-
-        resultFinalIP!!.setOnClickListener {
-            copyToClipboard(response?.get("query").toString())
-            Toast.makeText(this@MainActivity,"Copied",Toast.LENGTH_SHORT).show()
-        }
+    private fun resultBottomSheet(response: JSONObject?, elapsedTime: Long){
+        BottomSheetDialog(this@MainActivity).apply {
+            setContentView(R.layout.design_result_btm)
+
+            val resultElapsedTime: TextView? = findViewById(R.id.resultElapsedTime)
+            val resultFinalIP: TextView? = findViewById(R.id.resultFinalIP)
+            val resultCountry: TextView? = findViewById(R.id.resultCountry)
+            val resultCity: TextView? = findViewById(R.id.resultCity)
+            val resultISP: TextView? = findViewById(R.id.resultISP)
+
+            resultElapsedTime?.text = "Data received in ${elapsedTime}ms."
+            resultFinalIP?.text = response?.get("query").toString()
+            resultCountry?.text = response?.get("country").toString()
+            resultCity?.text = response?.get("city").toString()
+            resultISP?.text = response?.get("isp").toString()
+
+            resultFinalIP!!.setOnClickListener {
+                copyToClipboard(response?.get("query").toString())
+                Toast.makeText(this@MainActivity,"Copied", Toast.LENGTH_SHORT).show()
+            }
 
-        resultBottomSheet.behavior.state = BottomSheetBehavior.STATE_EXPANDED
-        resultBottomSheet.show()
+            behavior.state = BottomSheetBehavior.STATE_EXPANDED
+        }.show()
     }
 
     private fun importTelegramProxy() {
+        val preferenceManager = PreferenceManager.getDefaultSharedPreferences(this)
+        val editor: SharedPreferences.Editor = preferenceManager.edit()
+
         val inputDialog: AlertDialog = AlertDialog.Builder(this@MainActivity).create()
         val inflater: LayoutInflater = getSystemService(LAYOUT_INFLATER_SERVICE) as LayoutInflater
         val view: View = inflater.inflate(R.layout.design_telegram_input_dialog, null)
         val telegramProxyInputBinding: DesignTelegramInputDialogBinding =
             DesignTelegramInputDialogBinding.bind(view)
 
-        telegramProxyInputBinding.TelegramProxy.requestFocus()
-        inputDialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE)
-
-        telegramProxyInputBinding.btnOK.setOnClickListener {
-            if (telegramProxyInputBinding.TelegramProxy.text?.length!! < 5)
-                telegramProxyInputBinding.TelegramProxyLayout.error = "Enter the proxy"
-            else {
-                try {
-                    val myURI: Uri =
-                        Uri.parse(telegramProxyInputBinding.TelegramProxy.text.toString())
-                    binding.ProxyAddress.setText(myURI.getQueryParameter("server").toString())
-                    binding.ProxyPort.setText(myURI.getQueryParameter("port").toString())
-
-                    if (myURI.equals("username")) {
-                        binding.ProxyUsername.setText(myURI.getQueryParameter("user").toString())
-                        binding.ProxyPassword.setText(myURI.getQueryParameter("pass").toString())
+        telegramProxyInputBinding.apply {
+            TelegramProxy.requestFocus()
+            inputDialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE)
+
+            btnOK.setOnClickListener {
+                if (TelegramProxy.text?.length!! < 5)
+                    TelegramProxyLayout.error = "Enter the proxy"
+                else {
+                    try {
+                        val myURI: Uri = Uri.parse(telegramProxyInputBinding.TelegramProxy.text.toString())
+
+                        editor.apply{
+                            putString("ProxyServer", myURI.getQueryParameter("server").toString())
+                            putString("RemotePort", myURI.getQueryParameter("port").toString())
+                            if (myURI.equals("username")) {
+                                putString("CredentialUsername", myURI.getQueryParameter("user").toString())
+                                putString("CredentialPassword", myURI.getQueryParameter("pass").toString())
+                            }
+                        }.apply()
+
+                        inputDialog.dismiss()
+                        recreate() // MainActivity
+                    } catch (ex: Exception) {
+                        ex.printStackTrace()
                     }
-                    inputDialog.dismiss()
-                } catch (ex: Exception) {
                 }
             }
+            btnCancel.setOnClickListener { inputDialog.dismiss() }
         }
-        telegramProxyInputBinding.btnCancel.setOnClickListener { inputDialog.dismiss() }
+
         inputDialog.setView(telegramProxyInputBinding.root)
         inputDialog.show()
     }
@@ -216,5 +235,4 @@ class MainActivity : AppCompatActivity() {
         val clip = ClipData.newPlainText("Copied Text", content)
         clipboard.setPrimaryClip(clip)
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/github/arash/kotlin/proxychecker/MyIpDialog.kt b/app/src/main/java/github/arash/kotlin/proxychecker/MyIpDialog.kt
new file mode 100644
index 0000000..b697042
--- /dev/null
+++ b/app/src/main/java/github/arash/kotlin/proxychecker/MyIpDialog.kt
@@ -0,0 +1,57 @@
+package github.arash.kotlin.proxychecker
+
+import android.annotation.SuppressLint
+import android.app.AlertDialog
+import android.app.ProgressDialog
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import com.androidnetworking.AndroidNetworking
+import com.androidnetworking.error.ANError
+import com.androidnetworking.interfaces.JSONObjectRequestListener
+import github.arash.kotlin.proxychecker.databinding.DesignMyIpDialogBinding
+import org.json.JSONObject
+
+class MyIpDialog {
+    fun show(context: Context){
+        val progressDialog = ProgressDialog(context, R.style.AppCompatAlertDialogStyle)
+        progressDialog.setCancelable(false)
+        progressDialog.setMessage("Please wait...")
+        progressDialog.show()
+
+        val ipDialog: AlertDialog = AlertDialog.Builder(context).create()
+        val inflater:LayoutInflater = context.getSystemService(AppCompatActivity.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        val view: View = inflater.inflate(R.layout.design_my_ip_dialog, null)
+        val vBinding: DesignMyIpDialogBinding = DesignMyIpDialogBinding.bind(view)
+        ipDialog.setView(vBinding.root)
+
+        AndroidNetworking.get("http://ip-api.com/json")
+            .doNotCacheResponse()
+            .build()
+            .getAsJSONObject(object : JSONObjectRequestListener{
+                @SuppressLint("SetTextI18n")
+                override fun onResponse(response: JSONObject?) {
+                    if (response!!.get("status").equals("success")) {
+
+                        vBinding.apply {
+                            mIPAddress.text = response.getString("query")
+                            mIPLocation.text =  "${response.getString("country")} | ${response.getString("city")}"
+                            mIPTimezone.text = response.getString("timezone")
+                            mIPISP.text = response.getString("isp")
+                        }
+
+                        progressDialog.dismiss()
+                        ipDialog.show()
+                    }
+                }
+
+                override fun onError(anError: ANError?) {
+                    vBinding.mIPProgressView.visibility = View.GONE
+                }
+
+            })
+        vBinding.btnOK.setOnClickListener { ipDialog.dismiss() }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/github/arash/kotlin/proxychecker/PreferenceHelper.java b/app/src/main/java/github/arash/kotlin/proxychecker/PreferenceHelper.java
deleted file mode 100644
index a50fa87..0000000
--- a/app/src/main/java/github/arash/kotlin/proxychecker/PreferenceHelper.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package github.arash.kotlin.proxychecker;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-
-public class PreferenceHelper {
-    private static SharedPreferences pref;
-    private static PreferenceHelper prefHelper;
-
-    public PreferenceHelper(Context context) {
-        pref = PreferenceManager.getDefaultSharedPreferences(context);
-    }
-
-    public Boolean containsKey(String key) {
-        return pref.contains(key);
-    }
-
-    public void clearPrefs() {
-        SharedPreferences.Editor editor = pref.edit();
-        editor.clear();
-        editor.apply();
-    }
-
-    public static void initialize(Context appContext) {
-        if (appContext == null) {
-            throw new NullPointerException("Provided application context is null");
-        }
-        if (prefHelper == null) {
-            synchronized (PreferenceHelper.class) {
-                if (prefHelper == null) {
-                    prefHelper = new PreferenceHelper(appContext);
-                }
-            }
-        }
-    }
-
-    public static PreferenceHelper getInstance() {
-        if (prefHelper == null) {
-            throw new IllegalStateException(
-                    "SharedPrefsManager is not initialized, call initialize(applicationContext) " +
-                            "static method first");
-        }
-        return prefHelper;
-    }
-
-    public void setString(String key, String value) {
-        SharedPreferences.Editor editor = pref.edit();
-        editor.putString(key, value);
-        editor.apply();
-    }
-
-    public static void removeKey(String key) {
-        pref.edit().remove(key).apply();
-    }
-
-    public String getString(String key, String defValue) {
-        return pref.getString(key, defValue);
-    }
-
-    public Boolean getBoolean(String key) {
-        return pref.getBoolean(key, false);
-    }
-
-    public void setBoolean(String key, Boolean isBoolean) {
-        SharedPreferences.Editor editor = pref.edit();
-        editor.putBoolean(key, isBoolean);
-        editor.apply();
-
-    }
-
-
-    public void setInt(String key, int value) {
-        SharedPreferences.Editor editor = pref.edit();
-        editor.putInt(key, value);
-        editor.apply();
-    }
-
-    public void loggedOut() {
-        clearPrefs();
-    }
-
-    public int getInt(String key) {
-        return pref.getInt(key, 0);
-    }
-
-    public void toPrev8(Activity activity, String key, Boolean isBoolean) {
-        SharedPreferences sharedPref = activity.getPreferences(Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = sharedPref.edit();
-        editor.putBoolean(key, isBoolean);
-        editor.apply();
-    }
-
-    public boolean fromPrev8(Activity activity, String key) {
-        SharedPreferences sharedPref = activity.getPreferences(Context.MODE_PRIVATE);
-        return sharedPref.getBoolean(key, false);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
index efb34ea..a1734fe 100644
--- a/app/src/main/res/drawable/ic_check.xml
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -1,5 +1,12 @@
-<vector android:height="24dp" android:viewportHeight="384"
-    android:viewportWidth="384" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="m192,384c105.863,0 192,-86.129 192,-192 0,-18.273 -2.551,-36.281 -7.602,-53.527 -2.488,-8.48 -11.344,-13.352 -19.848,-10.863 -8.488,2.48 -13.344,11.367 -10.863,19.848 4.184,14.328 6.313,29.32 6.313,44.543 0,88.223 -71.777,160 -160,160s-160,-71.777 -160,-160 71.777,-160 160,-160c32.063,0 62.91,9.375 89.207,27.105 7.32,4.941 17.273,3 22.207,-4.32 4.938,-7.328 3.012,-17.273 -4.316,-22.211 -31.602,-21.309 -68.633,-32.574 -107.098,-32.574 -105.863,0 -192,86.129 -192,192s86.137,192 192,192zM192,384"/>
-    <path android:fillColor="#FF000000" android:pathData="m356.688,36.688 l-164.688,164.68 -52.688,-52.68c-6.25,-6.246 -16.375,-6.246 -22.625,0 -6.246,6.25 -6.246,16.375 0,22.625l64,64c3.129,3.129 7.215,4.688 11.313,4.688s8.184,-1.559 11.313,-4.688l176,-176c6.246,-6.25 6.246,-16.375 0,-22.625 -6.25,-6.246 -16.375,-6.246 -22.625,0zM356.688,36.688"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="384"
+    android:viewportHeight="384">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="m192,384c105.863,0 192,-86.129 192,-192 0,-18.273 -2.551,-36.281 -7.602,-53.527 -2.488,-8.48 -11.344,-13.352 -19.848,-10.863 -8.488,2.48 -13.344,11.367 -10.863,19.848 4.184,14.328 6.313,29.32 6.313,44.543 0,88.223 -71.777,160 -160,160s-160,-71.777 -160,-160 71.777,-160 160,-160c32.063,0 62.91,9.375 89.207,27.105 7.32,4.941 17.273,3 22.207,-4.32 4.938,-7.328 3.012,-17.273 -4.316,-22.211 -31.602,-21.309 -68.633,-32.574 -107.098,-32.574 -105.863,0 -192,86.129 -192,192s86.137,192 192,192zM192,384" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="m356.688,36.688 l-164.688,164.68 -52.688,-52.68c-6.25,-6.246 -16.375,-6.246 -22.625,0 -6.246,6.25 -6.246,16.375 0,22.625l64,64c3.129,3.129 7.215,4.688 11.313,4.688s8.184,-1.559 11.313,-4.688l176,-176c6.246,-6.25 6.246,-16.375 0,-22.625 -6.25,-6.246 -16.375,-6.246 -22.625,0zM356.688,36.688" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml
index c8fd210..26b6d18 100644
--- a/app/src/main/res/drawable/ic_github.xml
+++ b/app/src/main/res/drawable/ic_github.xml
@@ -1,4 +1,10 @@
-<vector android:height="24dp" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#212121" android:pathData="m12,0.5c-6.63,0 -12,5.28 -12,11.792 0,5.211 3.438,9.63 8.205,11.188 0.6,0.111 0.82,-0.254 0.82,-0.567 0,-0.28 -0.01,-1.022 -0.015,-2.005 -3.338,0.711 -4.042,-1.582 -4.042,-1.582 -0.546,-1.361 -1.335,-1.725 -1.335,-1.725 -1.087,-0.731 0.084,-0.716 0.084,-0.716 1.205,0.082 1.838,1.215 1.838,1.215 1.07,1.803 2.809,1.282 3.495,0.981 0.108,-0.763 0.417,-1.282 0.76,-1.577 -2.665,-0.295 -5.466,-1.309 -5.466,-5.827 0,-1.287 0.465,-2.339 1.235,-3.164 -0.135,-0.298 -0.54,-1.497 0.105,-3.121 0,0 1.005,-0.316 3.3,1.209 0.96,-0.262 1.98,-0.392 3,-0.398 1.02,0.006 2.04,0.136 3,0.398 2.28,-1.525 3.285,-1.209 3.285,-1.209 0.645,1.624 0.24,2.823 0.12,3.121 0.765,0.825 1.23,1.877 1.23,3.164 0,4.53 -2.805,5.527 -5.475,5.817 0.42,0.354 0.81,1.077 0.81,2.182 0,1.578 -0.015,2.846 -0.015,3.229 0,0.309 0.21,0.678 0.825,0.56 4.801,-1.548 8.236,-5.97 8.236,-11.173 0,-6.512 -5.373,-11.792 -12,-11.792z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="m12,0.5c-6.63,0 -12,5.28 -12,11.792 0,5.211 3.438,9.63 8.205,11.188 0.6,0.111 0.82,-0.254 0.82,-0.567 0,-0.28 -0.01,-1.022 -0.015,-2.005 -3.338,0.711 -4.042,-1.582 -4.042,-1.582 -0.546,-1.361 -1.335,-1.725 -1.335,-1.725 -1.087,-0.731 0.084,-0.716 0.084,-0.716 1.205,0.082 1.838,1.215 1.838,1.215 1.07,1.803 2.809,1.282 3.495,0.981 0.108,-0.763 0.417,-1.282 0.76,-1.577 -2.665,-0.295 -5.466,-1.309 -5.466,-5.827 0,-1.287 0.465,-2.339 1.235,-3.164 -0.135,-0.298 -0.54,-1.497 0.105,-3.121 0,0 1.005,-0.316 3.3,1.209 0.96,-0.262 1.98,-0.392 3,-0.398 1.02,0.006 2.04,0.136 3,0.398 2.28,-1.525 3.285,-1.209 3.285,-1.209 0.645,1.624 0.24,2.823 0.12,3.121 0.765,0.825 1.23,1.877 1.23,3.164 0,4.53 -2.805,5.527 -5.475,5.817 0.42,0.354 0.81,1.077 0.81,2.182 0,1.578 -0.015,2.846 -0.015,3.229 0,0.309 0.21,0.678 0.825,0.56 4.801,-1.548 8.236,-5.97 8.236,-11.173 0,-6.512 -5.373,-11.792 -12,-11.792z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_globe.xml b/app/src/main/res/drawable/ic_globe.xml
new file mode 100644
index 0000000..f0ea7cd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_globe.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,0A12,12 0,1 0,24 12,12.013 12.013,0 0,0 12,0ZM20.647,7L17.426,7a19.676,19.676 0,0 0,-2.821 -4.644A10.031,10.031 0,0 1,20.647 7ZM16.5,12a10.211,10.211 0,0 1,-0.476 3L7.976,15A10.211,10.211 0,0 1,7.5 12a10.211,10.211 0,0 1,0.476 -3h8.048A10.211,10.211 0,0 1,16.5 12ZM8.778,17h6.444A19.614,19.614 0,0 1,12 21.588,19.57 19.57,0 0,1 8.778,17ZM8.778,7A19.614,19.614 0,0 1,12 2.412,19.57 19.57,0 0,1 15.222,7ZM9.4,2.356A19.676,19.676 0,0 0,6.574 7L3.353,7A10.031,10.031 0,0 1,9.4 2.356ZM2.461,9L5.9,9a12.016,12.016 0,0 0,-0.4 3,12.016 12.016,0 0,0 0.4,3L2.461,15a9.992,9.992 0,0 1,0 -6ZM3.353,17L6.574,17A19.676,19.676 0,0 0,9.4 21.644,10.031 10.031,0 0,1 3.353,17ZM14.605,21.644A19.676,19.676 0,0 0,17.426 17h3.221A10.031,10.031 0,0 1,14.605 21.644ZM21.539,15L18.1,15a12.016,12.016 0,0 0,0.4 -3,12.016 12.016,0 0,0 -0.4,-3h3.437a9.992,9.992 0,0 1,0 6Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 0000000..1307d35
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,8.424V7A7,7 0,0 0,5 7V8.424A5,5 0,0 0,2 13v6a5.006,5.006 0,0 0,5 5H17a5.006,5.006 0,0 0,5 -5V13A5,5 0,0 0,19 8.424ZM7,7A5,5 0,0 1,17 7V8H7ZM20,19a3,3 0,0 1,-3 3H7a3,3 0,0 1,-3 -3V13a3,3 0,0 1,3 -3H17a3,3 0,0 1,3 3Z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,14a1,1 0,0 0,-1 1v2a1,1 0,0 0,2 0V15A1,1 0,0 0,12 14Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_minus.xml b/app/src/main/res/drawable/ic_minus.xml
new file mode 100644
index 0000000..328ed7d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_minus.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="409.6"
+    android:viewportHeight="409.6">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M392.533,187.733H17.067C7.641,187.733 0,195.374 0,204.8s7.641,17.067 17.067,17.067h375.467c9.426,0 17.067,-7.641 17.067,-17.067S401.959,187.733 392.533,187.733z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_network.xml b/app/src/main/res/drawable/ic_network.xml
new file mode 100644
index 0000000..1f802c0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_network.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M23,20L14.816,20A3,3 0,0 0,13 18.184L13,14h6a2.989,2.989 0,0 0,2 -5.22L21,4a4,4 0,0 0,-4 -4L7,0A4,4 0,0 0,3 4L3,8.78A2.989,2.989 0,0 0,5 14h6v4.184A3,3 0,0 0,9.184 20L1,20a1,1 0,0 0,0 2L9.184,22a2.982,2.982 0,0 0,5.632 0L23,22a1,1 0,0 0,0 -2ZM5,4A2,2 0,0 1,7 2L17,2a2,2 0,0 1,2 2L19,8L15.414,8A1.986,1.986 0,0 0,14 8.586L13.586,9L10.414,9L10,8.586A1.986,1.986 0,0 0,8.586 8L5,8ZM4,11a1,1 0,0 1,1 -1L8.586,10L9,10.414A1.986,1.986 0,0 0,10.414 11h3.172A1.986,1.986 0,0 0,15 10.414L15.414,10L19,10a1,1 0,0 1,0 2L5,12A1,1 0,0 1,4 11ZM12,22a1,1 0,1 1,1 -1A1,1 0,0 1,12 22Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_road.xml b/app/src/main/res/drawable/ic_road.xml
new file mode 100644
index 0000000..117923f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_road.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M21.46,4.134A4.992,4.992 0,0 0,16.536 0L7.451,0A4.992,4.992 0,0 0,2.525 4.138l-2.449,14A5,5 0,0 0,5 24L19,24a5,5 0,0 0,4.925 -5.866ZM21.3,20.929A3,3 0,0 1,19 22L5,22a3,3 0,0 1,-2.955 -3.518l2.449,-14A3,3 0,0 1,7.451 2h9.085A3,3 0,0 1,19.49 4.48l2.463,14A3,3 0,0 1,21.3 20.929ZM13,5L13,7a1,1 0,0 1,-2 0L11,5a1,1 0,0 1,2 0ZM13,11v2a1,1 0,0 1,-2 0L11,11a1,1 0,0 1,2 0ZM13,17v2a1,1 0,0 1,-2 0L11,17a1,1 0,0 1,2 0Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_shield.xml b/app/src/main/res/drawable/ic_shield.xml
new file mode 100644
index 0000000..a248a02
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shield.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="m12,15a1,1 0,0 1,-1 -1,3.953 3.953,0 0,1 1.963,-3.195 1.994,1.994 0,0 0,1 -2.124,2.024 2.024,0 0,0 -1.6,-1.6 2,2 0,0 0,-2.363 1.971,1 1,0 0,1 -2,0 4,4 0,0 1,1.429 -3.065,4 4,0 1,1 4.5,6.57 1.987,1.987 0,0 0,-0.929 1.443,1 1,0 0,1 -1,1zM12.793,23.76c2.16,-0.868 9.207,-4.281 9.207,-11.717v-5.171a4.993,4.993 0,0 0,-3.426 -4.746l-6.259,-2.075a0.985,0.985 0,0 0,-0.63 0l-6.259,2.075a4.993,4.993 0,0 0,-3.426 4.746v5.171c0,6.562 7.005,10.576 9.153,11.65a2.331,2.331 0,0 0,0.847 0.307,2.242 2.242,0 0,0 0.793,-0.24zM17.944,4.024a3,3 0,0 1,2.056 2.848v5.171c0,6.183 -6.087,9.111 -7.953,9.861 -1.888,-0.944 -8.047,-4.445 -8.047,-9.861v-5.171a3,3 0,0 1,2.056 -2.848l5.944,-1.97zM12,17a1,1 0,1 0,1 1,1 1,0 0,0 -1,-1z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_ship.xml b/app/src/main/res/drawable/ic_ship.xml
new file mode 100644
index 0000000..211ea3a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_ship.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M23,20a1,1 0,0 0,-1 1c0,0.344 -0.682,1 -1.75,1a2.023,2.023 0,0 1,-1.593 -0.689,1.932 1.932,0 0,1 0.128,-0.184 12.152,12.152 0,0 0,3.156 -6.183A3,3 0,0 0,20 11.584L20,9a4,4 0,0 0,-4 -4L16,4A4,4 0,0 0,8 4L8,5A4,4 0,0 0,4 9v2.571a3,3 0,0 0,-1.972 3.373,12.188 12.188,0 0,0 3.187,6.183 1.973,1.973 0,0 1,0.133 0.189A2.005,2.005 0,0 1,3.75 22C2.661,22 2,21.306 2,21a1,1 0,0 0,-2 0c0,1.626 1.718,3 3.75,3a4.212,4.212 0,0 0,2.763 -1A4.295,4.295 0,0 0,12 23.016,4.317 4.317,0 0,0 17.5,23a4.208,4.208 0,0 0,2.746 1C22.282,24 24,22.626 24,21A1,1 0,0 0,23 20ZM10,4a2,2 0,0 1,4 0L14,5L10,5ZM8,7h8a2,2 0,0 1,2 2v1.92L12.948,9.262a3.026,3.026 0,0 0,-1.891 0L6,10.913L6,9A2,2 0,0 1,8 7ZM9.25,22a1.938,1.938 0,0 1,-1.711 -0.849,5.113 5.113,0 0,0 -0.848,-1.372A10.253,10.253 0,0 1,4 14.607a1.018,1.018 0,0 1,0.662 -1.153L11,11.383L11,21C11,21.344 10.318,22 9.25,22ZM14.75,22C13.661,22 13,21.306 13,21L13,11.384l6.305,2.069a1.021,1.021 0,0 1,0.666 1.155,10.2 10.2,0 0,1 -2.662,5.171 4.991,4.991 0,0 0,-0.848 1.378A1.929,1.929 0,0 1,14.75 22Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_telegram.xml b/app/src/main/res/drawable/ic_telegram.xml
new file mode 100644
index 0000000..8992e5e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_telegram.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M23.119,0.882a2.966,2.966 0,0 0,-2.8 -0.8l-16,3.37a4.995,4.995 0,0 0,-2.853 8.481L3.184,13.65a1,1 0,0 1,0.293 0.708v3.168a2.965,2.965 0,0 0,0.3 1.285l-0.008,0.007 0.026,0.026A3,3 0,0 0,5.157 20.2l0.026,0.026 0.007,-0.008a2.965,2.965 0,0 0,1.285 0.3L9.643,20.518a1,1 0,0 1,0.707 0.292l1.717,1.717A4.963,4.963 0,0 0,15.587 24a5.049,5.049 0,0 0,1.605 -0.264,4.933 4.933,0 0,0 3.344,-3.986L23.911,3.715A2.975,2.975 0,0 0,23.119 0.882ZM4.6,12.238 L2.881,10.521a2.94,2.94 0,0 1,-0.722 -3.074,2.978 2.978,0 0,1 2.5,-2.026L20.5,2.086 5.475,17.113L5.475,14.358A2.978,2.978 0,0 0,4.6 12.238ZM18.571,19.408a3,3 0,0 1,-5.089 1.712L11.762,19.4a2.978,2.978 0,0 0,-2.119 -0.878L6.888,18.522L21.915,3.5Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml
new file mode 100644
index 0000000..52743bd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_user.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,12A6,6 0,1 0,6 6,6.006 6.006,0 0,0 12,12ZM12,2A4,4 0,1 1,8 6,4 4,0 0,1 12,2Z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,14a9.01,9.01 0,0 0,-9 9,1 1,0 0,0 2,0 7,7 0,0 1,14 0,1 1,0 0,0 2,0A9.01,9.01 0,0 0,12 14Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_vpn.xml b/app/src/main/res/drawable/ic_vpn.xml
new file mode 100644
index 0000000..7f81ab8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_vpn.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="m12,0a12,12 0,1 0,12 12,12.013 12.013,0 0,0 -12,-12zM12,22a10,10 0,1 1,10 -10,10.011 10.011,0 0,1 -10,10zM12,7a2.993,2.993 0,0 0,-1 5.816v3.184a1,1 0,0 0,2 0v-3.184a2.993,2.993 0,0 0,-1 -5.816zM12,11a1,1 0,1 1,1 -1,1 1,0 0,1 -1,1z" />
+</vector>
diff --git a/app/src/main/res/drawable/minus.png b/app/src/main/res/drawable/minus.png
deleted file mode 100644
index df8b24a..0000000
Binary files a/app/src/main/res/drawable/minus.png and /dev/null differ
diff --git a/app/src/main/res/font/open_sans_bold.ttf b/app/src/main/res/font/open_sans_bold.ttf
new file mode 100644
index 0000000..efdd5e8
Binary files /dev/null and b/app/src/main/res/font/open_sans_bold.ttf differ
diff --git a/app/src/main/res/font/open_sans_regular.ttf b/app/src/main/res/font/open_sans_regular.ttf
new file mode 100644
index 0000000..29bfd35
Binary files /dev/null and b/app/src/main/res/font/open_sans_regular.ttf differ
diff --git a/app/src/main/res/font/roboto_regular.ttf b/app/src/main/res/font/roboto_regular.ttf
new file mode 100644
index 0000000..7d9a6c4
Binary files /dev/null and b/app/src/main/res/font/roboto_regular.ttf differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 85ca1c2..1e48e45 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -29,10 +29,9 @@
             style="@style/Widget.AppCompat.ProgressBar.Horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="-7dp"
-            android:layout_marginBottom="-7dp"
+            android:layout_marginBottom="-5dp"
             android:indeterminate="true"
-            android:indeterminateTint="@color/white"
+            android:indeterminateTint="#259DD9"
             android:visibility="gone" />
 
         <TextView
@@ -42,7 +41,7 @@
             android:layout_gravity="top|center_horizontal"
             android:background="#D30000"
             android:gravity="center"
-            android:padding="6dp"
+            android:padding="4dp"
             android:text="TURN OFF YOUR VPN TO ENSURE THE RESULT"
             android:textAlignment="center"
             android:textColor="@color/white"
@@ -54,164 +53,28 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/AppBarLayout"
-        android:layout_margin="@dimen/main_margin"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Proxy Type" />
-
-        <com.google.android.material.button.MaterialButtonToggleGroup
-            android:id="@+id/ProxyTypeToggleGroup"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:checkedButton="@id/ProxyTypeHTTPS"
-            app:selectionRequired="true"
-            app:singleSelection="true">
-
-            <Button
-                android:id="@+id/ProxyTypeHTTPS"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.5"
-                android:text="HTTP/S"
-                android:textColor="@color/black" />
-
-            <Button
-                android:id="@+id/ProxyTypeSocks5"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.5"
-                android:text="Socks5"
-                android:textColor="@color/black" />
-
-        </com.google.android.material.button.MaterialButtonToggleGroup>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Proxy Address and port" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:orientation="horizontal">
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/ProxyAddressLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="4dp"
-                android:layout_weight="0.7"
-                android:orientation="vertical">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/ProxyAddress"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="Proxy Address"
-                    android:inputType="textNoSuggestions"
-                    android:singleLine="true"
-                    android:textColor="@color/black"
-                    android:textCursorDrawable="@null"
-                    android:textSize="17sp" />
+        android:layout_height="match_parent"
+        android:layout_above="@id/btnGO"
+        android:layout_below="@id/AppBarLayout">
 
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/ProxyPortLayout"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.4"
-                android:orientation="vertical">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/ProxyPort"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="Proxy Port"
-                    android:inputType="number"
-                    android:singleLine="true"
-                    android:textColor="@color/black"
-                    android:textCursorDrawable="@null"
-                    android:textSize="17sp" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-        </LinearLayout>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:text="Proxy Credential (Optional)" />
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/ProxyUsernameLayout"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:orientation="vertical">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/ProxyUsername"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:hint="Username"
-                android:singleLine="true"
-                android:textColor="@color/black"
-                android:textCursorDrawable="@null"
-                android:textSize="17sp" />
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/ProxyPasswordLayout"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:passwordToggleEnabled="true">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/ProxyPassword"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="Password"
-                android:inputType="textPassword"
-                android:singleLine="true"
-                android:textColor="@color/black"
-                android:textCursorDrawable="@null"
-                android:textSize="17sp" />
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <CheckBox
-            android:id="@+id/SaveCredentialCheckBox"
+        <FrameLayout
+            android:id="@+id/settings"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:text="Save Credential" />
+            android:layout_height="match_parent" />
     </LinearLayout>
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/StartTheTestButton"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+
+    <TextView
+        android:id="@+id/btnGO"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_margin="@dimen/main_margin"
+        android:background="?attr/colorPrimary"
+        android:gravity="center"
         android:padding="18dp"
-        android:text="Test The Proxy"
-        app:strokeColor="#A5A5A5" />
+        android:text="Start Checking"
+        android:textColor="@color/white"
+        android:textSize="16sp"
+        android:textStyle="bold" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/design_my_ip_dialog.xml b/app/src/main/res/layout/design_my_ip_dialog.xml
new file mode 100644
index 0000000..6c53a6a
--- /dev/null
+++ b/app/src/main/res/layout/design_my_ip_dialog.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="12dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:text="What's my IP"
+            android:textColor="@color/black"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <ProgressBar
+            android:id="@+id/mIP_ProgressView"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:visibility="gone" />
+
+    </RelativeLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginBottom="8dp"
+        android:alpha="0.2"
+        android:background="@color/black" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:text="IP"
+        android:textColor="@color/black"
+        android:textSize="16sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/mIP_Address"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:textSize="14sp"
+        tools:text="255.255.255.1" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:text="Location"
+        android:textColor="@color/black"
+        android:textSize="16sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/mIP_Location"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:textSize="14sp"
+        tools:text="United Kingdom | Manchester" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:text="Timezone"
+        android:textColor="@color/black"
+        android:textSize="16sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/mIP_Timezone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:textSize="14sp"
+        tools:text="Australia/Brisbane" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:text="DATA CENTER"
+        android:textColor="@color/black"
+        android:textSize="16sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/mIP_ISP"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:textSize="14sp"
+        tools:text="APNIC and Cloudflare DNS Resolver project" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="8dp"
+        android:alpha="0.2"
+        android:background="@color/black" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical|right"
+        android:layoutDirection="ltr"
+        android:orientation="horizontal"
+        android:paddingRight="4dp"
+        android:paddingBottom="4dp">
+
+        <Button
+            android:id="@+id/btnOK"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="OK"
+            android:textColor="@color/black" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/design_result_btm.xml b/app/src/main/res/layout/design_result_btm.xml
index b0bcc54..0104367 100644
--- a/app/src/main/res/layout/design_result_btm.xml
+++ b/app/src/main/res/layout/design_result_btm.xml
@@ -1,176 +1,213 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/rounded_background_for_btm"
+    android:layoutDirection="ltr"
     android:orientation="vertical"
     android:paddingLeft="16dp"
+    android:paddingTop="8dp"
     android:paddingRight="16dp">
 
     <ImageView
         android:id="@+id/Minus"
-        android:layout_width="40dp"
-        android:layout_height="16dp"
-        android:layout_alignParentTop="true"
+        android:layout_width="60dp"
+        android:layout_height="12dp"
         android:layout_centerHorizontal="true"
         android:layout_gravity="center"
-        android:layout_marginTop="8dp"
-        android:alpha="0.3"
-        android:padding="5dp"
+        android:layout_marginBottom="8dp"
+        android:alpha="0.5"
+        android:paddingLeft="1dp"
+        android:paddingRight="1dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/minus"
+        android:src="@drawable/ic_minus"
         app:tint="@color/black" />
 
-    <ImageView
-        android:id="@+id/resultCheck"
-        android:layout_width="75dp"
-        android:layout_height="75dp"
-        android:layout_below="@+id/Minus"
-        android:layout_centerHorizontal="true"
-        android:layout_gravity="center"
-        android:layout_marginTop="16dp"
-        android:padding="5dp"
-        android:src="@drawable/ic_check"
-        app:tint="@color/Green" />
-
-    <TextView
-        android:id="@+id/resultTitle"
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/resultCheck"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="16dp"
-        android:padding="4dp"
-        android:text="The Proxy is Alive!"
-        android:textAlignment="center"
-        android:textColor="@color/Green"
-        android:textSize="18sp"
-        android:textStyle="bold" />
-
-    <TextView
-        android:id="@+id/resultFinalIPTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/resultTitle"
-        android:layout_alignParentLeft="true"
-        android:layout_marginTop="16dp"
-        android:alpha="0.6"
-        android:text="Final IP"
-        android:textColor="@color/black"
-        android:textSize="14sp" />
-
-    <TextView
-        android:id="@+id/resultFinalIP"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/resultFinalIPTitle"
-        android:layout_alignParentRight="true"
-        android:gravity="bottom"
-        android:paddingTop="8dp"
-        android:text="255.255.255.255"
-        android:textColor="#002AFF"
-        android:textSize="14sp" />
+        android:layout_marginBottom="24dp"
+        app:cardBackgroundColor="@color/Green"
+        app:cardCornerRadius="12dp">
 
-    <ImageView
-        android:id="@+id/Divider1"
-        android:layout_width="match_parent"
-        android:layout_height="5dp"
-        android:layout_below="@+id/resultFinalIP"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
-        android:alpha="0.2"
-        android:layerType="software"
-        android:src="@drawable/dashed_line" />
-
-    <TextView
-        android:id="@+id/resultCountryTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/Divider1"
-        android:layout_alignParentLeft="true"
-        android:alpha="0.6"
-        android:text="Country"
-        android:textColor="@color/black"
-        android:textSize="14sp" />
-
-    <TextView
-        android:id="@+id/resultCountry"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/resultCountryTitle"
-        android:layout_alignBottom="@+id/resultCountryTitle"
-        android:layout_alignParentRight="true"
-        android:text="United Kingdom"
-        android:textColor="@color/black"
-        android:textSize="14sp" />
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
 
-    <ImageView
-        android:id="@+id/Divider2"
-        android:layout_width="match_parent"
-        android:layout_height="5dp"
-        android:layout_below="@+id/resultCountry"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
-        android:alpha="0.2"
-        android:layerType="software"
-        android:src="@drawable/dashed_line" />
-
-    <TextView
-        android:id="@+id/resultCityTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/Divider2"
-        android:layout_alignParentLeft="true"
-        android:alpha="0.6"
-        android:text="City"
-        android:textColor="@color/black"
-        android:textSize="14sp" />
-
-    <TextView
-        android:id="@+id/resultCity"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/resultCityTitle"
-        android:layout_alignBottom="@+id/resultCityTitle"
-        android:layout_alignParentRight="true"
-        android:text="Manchester"
-        android:textColor="@color/black"
-        android:textSize="14sp" />
+            <ImageView
+                android:id="@+id/resultIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="85dp"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"
+                android:background="#40000000"
+                android:padding="16dp"
+                android:src="@drawable/ic_check"
+                app:tint="@color/white" />
 
-    <ImageView
-        android:id="@+id/Divider3"
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_toRightOf="@id/resultIcon"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <TextView
+                    android:id="@+id/resultTitle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="The Proxy is Alive!"
+                    android:textColor="@color/white"
+                    android:textSize="22sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/resultElapsedTime"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="Data received in 2431ms."
+                    android:textColor="@color/white"
+                    android:textSize="14sp" />
+            </LinearLayout>
+        </RelativeLayout>
+
+
+    </androidx.cardview.widget.CardView>
+
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="5dp"
-        android:layout_below="@+id/resultCity"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
-        android:alpha="0.2"
-        android:layerType="software"
-        android:src="@drawable/dashed_line" />
-
-    <TextView
-        android:id="@+id/resultISPTitle"
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/Divider3"
-        android:layout_alignParentLeft="true"
-        android:layout_marginBottom="28dp"
-        android:alpha="0.6"
-        android:text="ISP Name"
-        android:textColor="@color/black"
-        android:textSize="14sp" />
-
-    <TextView
-        android:id="@+id/resultISP"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/resultISPTitle"
-        android:layout_alignBottom="@+id/resultISPTitle"
-        android:layout_alignParentRight="true"
-        android:text="Asiatech Data Transmission company"
-        android:textColor="@color/black"
-        android:textSize="14sp" />
-
-</RelativeLayout>
\ No newline at end of file
+        android:layout_marginBottom="28dp">
+
+        <TextView
+            android:id="@+id/resultFinalIPTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_marginTop="16dp"
+            android:alpha="0.6"
+            android:text="Final IP"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/resultFinalIP"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/resultFinalIPTitle"
+            android:layout_alignParentRight="true"
+            android:gravity="bottom"
+            android:paddingLeft="10dp"
+            android:paddingTop="10dp"
+            android:text="255.255.255.255"
+            android:textColor="#002AFF"
+            android:textSize="14sp" />
+
+        <ImageView
+            android:id="@+id/Divider1"
+            android:layout_width="match_parent"
+            android:layout_height="5dp"
+            android:layout_below="@+id/resultFinalIP"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp"
+            android:alpha="0.3"
+            android:layerType="software"
+            android:src="@drawable/dashed_line" />
+
+        <TextView
+            android:id="@+id/resultCountryTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/Divider1"
+            android:layout_alignParentLeft="true"
+            android:alpha="0.6"
+            android:text="Country"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/resultCountry"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@+id/resultCountryTitle"
+            android:layout_alignBottom="@+id/resultCountryTitle"
+            android:layout_alignParentRight="true"
+            android:text="United Kingdom"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+
+        <ImageView
+            android:id="@+id/Divider2"
+            android:layout_width="match_parent"
+            android:layout_height="5dp"
+            android:layout_below="@+id/resultCountry"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp"
+            android:alpha="0.3"
+            android:layerType="software"
+            android:src="@drawable/dashed_line" />
+
+        <TextView
+            android:id="@+id/resultCityTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/Divider2"
+            android:layout_alignParentLeft="true"
+            android:alpha="0.6"
+            android:text="City"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/resultCity"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@+id/resultCityTitle"
+            android:layout_alignBottom="@+id/resultCityTitle"
+            android:layout_alignParentRight="true"
+            android:text="Manchester"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+
+        <ImageView
+            android:id="@+id/Divider3"
+            android:layout_width="match_parent"
+            android:layout_height="5dp"
+            android:layout_below="@+id/resultCity"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp"
+            android:alpha="0.3"
+            android:layerType="software"
+            android:src="@drawable/dashed_line" />
+
+        <TextView
+            android:id="@+id/resultISPTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/Divider3"
+            android:layout_alignParentLeft="true"
+            android:layout_marginRight="4dp"
+            android:alpha="0.6"
+            android:text="ISP Name"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/resultISP"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_alignTop="@+id/resultISPTitle"
+            android:layout_alignBottom="@+id/resultISPTitle"
+            android:layout_alignParentRight="true"
+            android:layout_toRightOf="@id/resultISPTitle"
+            android:gravity="right"
+            android:text="Asiatech Data Transmission company"
+            android:textColor="@color/black"
+            android:textSize="14sp" />
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
new file mode 100644
index 0000000..d501c1f
--- /dev/null
+++ b/app/src/main/res/values/arrays.xml
@@ -0,0 +1,12 @@
+<resources>
+    <!-- Reply Preference -->
+    <string-array name="reply_entries">
+        <item>Socks5</item>
+        <item>HTTP/s</item>
+    </string-array>
+
+    <string-array name="reply_values">
+        <item>socks5</item>
+        <item>https</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f16f4b1..a10966c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,20 @@
 <resources>
     <string name="app_name">ProxyChecker</string>
     <string name="github_address" translatable="false">https://github.com/MrArashAzizi/ProxyChecker</string>
+    <string name="title_activity_settings">SettingsActivity</string>
+
+    <!-- Preference Titles -->
+    <string name="messages_header">Messages</string>
+    <string name="sync_header">Sync</string>
+
+    <!-- Messages Preferences -->
+    <string name="signature_title">Your signature</string>
+    <string name="reply_title">Default reply action</string>
+
+    <!-- Sync Preferences -->
+    <string name="sync_title">Sync email periodically</string>
+    <string name="attachment_title">Download incoming attachments</string>
+    <string name="attachment_summary_on">Automatically download attachments for incoming emails
+    </string>
+    <string name="attachment_summary_off">Only download attachments when manually requested</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b3223d2..b288725 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -14,6 +14,7 @@
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
         <item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
+        <item name="fontFamily">@font/roboto_regular</item>
     </style>
 
     <style name="AppBottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">
@@ -24,16 +25,13 @@
         <item name="android:background">@drawable/rounded_background_for_btm</item>
     </style>
 
-    <style name="SCBSwitch" parent="Theme.AppCompat.Light">
-
-        <item name="colorPrimary">#1F262B</item>
-        <!-- active thumb & track color (30% transparency) -->
-        <item name="colorControlActivated">#1F262B</item>
-
-        <!-- inactive thumb color -->
-        <item name="colorSwitchThumbNormal">#485861</item>
-
-        <!-- inactive track color (30% transparency) -->
-        <item name="android:colorForeground">#485861</item>
+    <style name="AppCompatAlertDialogStyle" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="colorAccent">#25313A</item>
+        <item name="android:layoutDirection">ltr</item>
+        <item name="android:textColorPrimary">#25313A</item>
+        <item name="android:background">@color/white</item>
+        <item name="android:textColor">#25313A</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:dialogCornerRadius" tools:targetApi="p" >8dp</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
new file mode 100644
index 0000000..13d4d51
--- /dev/null
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -0,0 +1,81 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:title="Proxy Config">
+
+        <EditTextPreference
+            app:icon="@drawable/ic_network"
+            app:key="ProxyServer"
+            app:title="Server"
+            app:useSimpleSummaryProvider="true" />
+
+        <EditTextPreference
+            app:icon="@drawable/ic_ship"
+            app:key="RemotePort"
+            app:title="Remote Port"
+            app:useSimpleSummaryProvider="true" />
+
+        <ListPreference
+            app:defaultValue="socks5"
+            app:entries="@array/reply_entries"
+            app:entryValues="@array/reply_values"
+            app:icon="@drawable/ic_road"
+            app:key="ProxyType"
+            app:negativeButtonText="OK"
+            app:title="Proxy Type"
+            app:useSimpleSummaryProvider="true" />
+
+        <EditTextPreference
+            app:icon="@drawable/ic_user"
+            app:key="CredentialUsername"
+            app:title="Username"
+            app:useSimpleSummaryProvider="true" />
+
+        <EditTextPreference
+            app:dependency="CredentialUsername"
+            app:icon="@drawable/ic_lock"
+            app:key="CredentialPassword"
+            app:title="Password"
+            app:useSimpleSummaryProvider="true" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:title="More">
+
+<!--        <Preference-->
+<!--            app:icon="@drawable/ic_telegram"-->
+<!--            app:key="MoreImportTelegramProxy"-->
+<!--            app:summary="Enter your Telegram proxy quickly"-->
+<!--            app:title="Import Telegram proxy" />-->
+
+        <Preference
+            app:icon="@drawable/ic_globe"
+            app:key="MoreMY_IP"
+            app:summary="Your public IP address"
+            app:title="What's my IP" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:title="Settings">
+
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:enabled="false"
+            app:icon="@drawable/ic_shield"
+            app:summary="Use https with requests"
+            app:title="Use SSL" />
+
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            app:icon="@drawable/ic_vpn"
+            app:key="VPN_ALERT"
+            app:title="VPN Alert" />
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b335310..79133dd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.2.2"
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 28dd894..5ce9c96 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Jul 19 16:25:52 IRDT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME