diff --git a/EspressifProvision/EspressifProvision.xcodeproj/project.pbxproj b/EspressifProvision/EspressifProvision.xcodeproj/project.pbxproj
index 4451932..d22e1c1 100644
--- a/EspressifProvision/EspressifProvision.xcodeproj/project.pbxproj
+++ b/EspressifProvision/EspressifProvision.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -44,6 +44,7 @@
 		14DE671C20EC94C600941522 /* ConfigureAVS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14DE671B20EC94C600941522 /* ConfigureAVS.swift */; };
 		14DE671E20ECD04100941522 /* BLETransport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14DE671D20ECD04100941522 /* BLETransport.swift */; };
 		7E89B3398606A35D1BCB7893 /* Pods_EspressifProvisionAll_EspressifProvision.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FC5952F5F6F4A07A0ED190E /* Pods_EspressifProvisionAll_EspressifProvision.framework */; };
+		F11B547422DDE41A00F7D0D3 /* StatusViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F11B547322DDE41A00F7D0D3 /* StatusViewController.swift */; };
 		F1342A48229D697B00AD8626 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1342A47229D697B00AD8626 /* Constants.swift */; };
 		F1342A4B229E7D8700AD8626 /* DeviceListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1342A4A229E7D8700AD8626 /* DeviceListTableViewCell.swift */; };
 		F184C9E4228C3E8B0034C5B7 /* AESDecryptor.m in Sources */ = {isa = PBXBuildFile; fileRef = F184C9E3228C3E8B0034C5B7 /* AESDecryptor.m */; };
@@ -51,6 +52,7 @@
 		F18C3AB8229BEDB2007C197F /* ScannedLocalDevicesVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F18C3AB7229BEDB2007C197F /* ScannedLocalDevicesVC.swift */; };
 		F18C3ABE229BF4D4007C197F /* SSDPService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F18C3ABC229BF4D4007C197F /* SSDPService.swift */; };
 		F18C3ABF229BF4D4007C197F /* SSDPDiscovery.swift in Sources */ = {isa = PBXBuildFile; fileRef = F18C3ABD229BF4D4007C197F /* SSDPDiscovery.swift */; };
+		F1B464B5239A50BE0090B346 /* AppInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1B464B4239A50BE0090B346 /* AppInfoViewController.swift */; };
 		F1DCEC292296CB94005918FE /* ScanWifiList.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DCEC282296CB94005918FE /* ScanWifiList.swift */; };
 		F1DCEC2D2297D577005918FE /* WifiListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DCEC2C2297D577005918FE /* WifiListTableViewCell.swift */; };
 		F1DD7095229FC8620092DAB9 /* AmazonEmberDisplay_Lt.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F1DD7094229FC8590092DAB9 /* AmazonEmberDisplay_Lt.ttf */; };
@@ -58,6 +60,13 @@
 		F1DD7099229FCEDE0092DAB9 /* DeviceDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DD7098229FCEDE0092DAB9 /* DeviceDetailViewController.swift */; };
 		F1DD709B229FDE6C0092DAB9 /* AmazonEmberDisplay_Md.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F1DD709A229FDE6C0092DAB9 /* AmazonEmberDisplay_Md.ttf */; };
 		F1DD709D229FDF5E0092DAB9 /* AmazonEmberDisplay_Rg.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F1DD709C229FDF5E0092DAB9 /* AmazonEmberDisplay_Rg.ttf */; };
+		F1DDA06C2359CE590005F982 /* Utility.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DDA06B2359CE590005F982 /* Utility.swift */; };
+		F1DDA06E2360198E0005F982 /* ConfigureDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DDA06D2360198E0005F982 /* ConfigureDevice.swift */; };
+		F1DDA070237AB9210005F982 /* DeviceSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DDA06F237AB9210005F982 /* DeviceSettingViewController.swift */; };
+		F1DDA0722382AD880005F982 /* SoundSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DDA0712382AD880005F982 /* SoundSettingViewController.swift */; };
+		F1DDA0742383C7130005F982 /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DDA0732383C7130005F982 /* AboutViewController.swift */; };
+		F1DDA07623855BFB0005F982 /* LanguageListTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1DDA07523855BFB0005F982 /* LanguageListTableViewController.swift */; };
+		F1EB558923043B1400AEEBE3 /* BLEDeviceListViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1EB558823043B1400AEEBE3 /* BLEDeviceListViewCell.swift */; };
 		F1F339572296703C000F53A0 /* wifi_scan.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1F339562296703C000F53A0 /* wifi_scan.pb.swift */; };
 		F6D7C9B0F5FDCEEFFA78A8C8 /* Pods_EspressifProvisionAll_EspressifProvisionTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BEBDCCD5B5E7E9D6B8F9AE3 /* Pods_EspressifProvisionAll_EspressifProvisionTests.framework */; };
 /* End PBXBuildFile section */
@@ -151,6 +160,7 @@
 		D2B4EC5704D46C3EA9A47720 /* Pods-EspressifProvisionAll-EspressifProvisionTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EspressifProvisionAll-EspressifProvisionTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-EspressifProvisionAll-EspressifProvisionTests/Pods-EspressifProvisionAll-EspressifProvisionTests.release.xcconfig"; sourceTree = "<group>"; };
 		D3C0A52210E731723240B81F /* Pods-EspressifProvisionAll-EspressifProvision.blesec1avs-release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EspressifProvisionAll-EspressifProvision.blesec1avs-release.xcconfig"; path = "Pods/Target Support Files/Pods-EspressifProvisionAll-EspressifProvision/Pods-EspressifProvisionAll-EspressifProvision.blesec1avs-release.xcconfig"; sourceTree = "<group>"; };
 		EA24507D63588F8C9C0C451B /* Pods-EspressifProvisionAll-EspressifProvision.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EspressifProvisionAll-EspressifProvision.debug.xcconfig"; path = "Pods/Target Support Files/Pods-EspressifProvisionAll-EspressifProvision/Pods-EspressifProvisionAll-EspressifProvision.debug.xcconfig"; sourceTree = "<group>"; };
+		F11B547322DDE41A00F7D0D3 /* StatusViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusViewController.swift; sourceTree = "<group>"; };
 		F1342A47229D697B00AD8626 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
 		F1342A4A229E7D8700AD8626 /* DeviceListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceListTableViewCell.swift; sourceTree = "<group>"; };
 		F184C9E2228C3E8B0034C5B7 /* AESDecryptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AESDecryptor.h; sourceTree = "<group>"; };
@@ -159,6 +169,7 @@
 		F18C3AB7229BEDB2007C197F /* ScannedLocalDevicesVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScannedLocalDevicesVC.swift; sourceTree = "<group>"; };
 		F18C3ABC229BF4D4007C197F /* SSDPService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SSDPService.swift; sourceTree = "<group>"; };
 		F18C3ABD229BF4D4007C197F /* SSDPDiscovery.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SSDPDiscovery.swift; sourceTree = "<group>"; };
+		F1B464B4239A50BE0090B346 /* AppInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppInfoViewController.swift; sourceTree = "<group>"; };
 		F1DCEC282296CB94005918FE /* ScanWifiList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanWifiList.swift; sourceTree = "<group>"; };
 		F1DCEC2C2297D577005918FE /* WifiListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WifiListTableViewCell.swift; sourceTree = "<group>"; };
 		F1DD7094229FC8590092DAB9 /* AmazonEmberDisplay_Lt.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = AmazonEmberDisplay_Lt.ttf; sourceTree = "<group>"; };
@@ -166,6 +177,13 @@
 		F1DD7098229FCEDE0092DAB9 /* DeviceDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceDetailViewController.swift; sourceTree = "<group>"; };
 		F1DD709A229FDE6C0092DAB9 /* AmazonEmberDisplay_Md.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = AmazonEmberDisplay_Md.ttf; sourceTree = "<group>"; };
 		F1DD709C229FDF5E0092DAB9 /* AmazonEmberDisplay_Rg.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = AmazonEmberDisplay_Rg.ttf; sourceTree = "<group>"; };
+		F1DDA06B2359CE590005F982 /* Utility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utility.swift; sourceTree = "<group>"; };
+		F1DDA06D2360198E0005F982 /* ConfigureDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigureDevice.swift; sourceTree = "<group>"; };
+		F1DDA06F237AB9210005F982 /* DeviceSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceSettingViewController.swift; sourceTree = "<group>"; };
+		F1DDA0712382AD880005F982 /* SoundSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoundSettingViewController.swift; sourceTree = "<group>"; };
+		F1DDA0732383C7130005F982 /* AboutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
+		F1DDA07523855BFB0005F982 /* LanguageListTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguageListTableViewController.swift; sourceTree = "<group>"; };
+		F1EB558823043B1400AEEBE3 /* BLEDeviceListViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BLEDeviceListViewCell.swift; sourceTree = "<group>"; };
 		F1F339562296703C000F53A0 /* wifi_scan.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = wifi_scan.pb.swift; sourceTree = "<group>"; };
 		F5A6E92635049FCEB2D5787E /* Pods-EspressifProvisionAll-EspressifProvision.wifisec1avs-debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-EspressifProvisionAll-EspressifProvision.wifisec1avs-debug.xcconfig"; path = "Pods/Target Support Files/Pods-EspressifProvisionAll-EspressifProvision/Pods-EspressifProvisionAll-EspressifProvision.wifisec1avs-debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -336,6 +354,9 @@
 				143146B420EB273B0017E119 /* ProvisionViewController.swift */,
 				14706916211050EE00F8E1D8 /* BLELandingViewController.swift */,
 				144149432126AE09002AD5E1 /* SuccessViewController.swift */,
+				F11B547322DDE41A00F7D0D3 /* StatusViewController.swift */,
+				F1EB558823043B1400AEEBE3 /* BLEDeviceListViewCell.swift */,
+				F1B464B4239A50BE0090B346 /* AppInfoViewController.swift */,
 			);
 			path = ui;
 			sourceTree = "<group>";
@@ -357,6 +378,7 @@
 			isa = PBXGroup;
 			children = (
 				14DE671B20EC94C600941522 /* ConfigureAVS.swift */,
+				F1DDA06D2360198E0005F982 /* ConfigureDevice.swift */,
 			);
 			path = avs;
 			sourceTree = "<group>";
@@ -411,6 +433,7 @@
 			children = (
 				F18C3ABB229BF4D4007C197F /* SSDPClient */,
 				F1342A47229D697B00AD8626 /* Constants.swift */,
+				F1DDA06B2359CE590005F982 /* Utility.swift */,
 			);
 			path = Utilities;
 			sourceTree = "<group>";
@@ -421,6 +444,10 @@
 				F18C3AB7229BEDB2007C197F /* ScannedLocalDevicesVC.swift */,
 				F1342A4A229E7D8700AD8626 /* DeviceListTableViewCell.swift */,
 				F1DD7098229FCEDE0092DAB9 /* DeviceDetailViewController.swift */,
+				F1DDA06F237AB9210005F982 /* DeviceSettingViewController.swift */,
+				F1DDA0712382AD880005F982 /* SoundSettingViewController.swift */,
+				F1DDA0732383C7130005F982 /* AboutViewController.swift */,
+				F1DDA07523855BFB0005F982 /* LanguageListTableViewController.swift */,
 			);
 			path = ManageDevice;
 			sourceTree = "<group>";
@@ -662,19 +689,12 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-EspressifProvisionAll-EspressifProvision/Pods-EspressifProvisionAll-EspressifProvision-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/BlueSocket/Socket.framework",
-				"${BUILT_PRODUCTS_DIR}/Curve25519/Curve25519.framework",
-				"${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework",
-				"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-EspressifProvisionAll-EspressifProvision/Pods-EspressifProvisionAll-EspressifProvision-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Socket.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Curve25519.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-EspressifProvisionAll-EspressifProvision/Pods-EspressifProvisionAll-EspressifProvision-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -686,19 +706,12 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-EspressifProvisionAll-EspressifProvisionTests/Pods-EspressifProvisionAll-EspressifProvisionTests-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/BlueSocket/Socket.framework",
-				"${BUILT_PRODUCTS_DIR}/Curve25519/Curve25519.framework",
-				"${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework",
-				"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-EspressifProvisionAll-EspressifProvisionTests/Pods-EspressifProvisionAll-EspressifProvisionTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Socket.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Curve25519.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-EspressifProvisionAll-EspressifProvisionTests/Pods-EspressifProvisionAll-EspressifProvisionTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -734,29 +747,37 @@
 				F1342A48229D697B00AD8626 /* Constants.swift in Sources */,
 				F1DD7099229FCEDE0092DAB9 /* DeviceDetailViewController.swift in Sources */,
 				1431469820E387C60017E119 /* sec1.pb.swift in Sources */,
+				F1DDA07623855BFB0005F982 /* LanguageListTableViewController.swift in Sources */,
 				F18C3AB6229BECE1007C197F /* AlexaDevice.swift in Sources */,
 				F18C3ABE229BF4D4007C197F /* SSDPService.swift in Sources */,
 				14DE671E20ECD04100941522 /* BLETransport.swift in Sources */,
 				149774DF210C87AB00022841 /* DataExtensions.swift in Sources */,
 				1431468E20E3823F0017E119 /* Provision.swift in Sources */,
+				F1DDA0722382AD880005F982 /* SoundSettingViewController.swift in Sources */,
 				1431469920E387C60017E119 /* sec0.pb.swift in Sources */,
 				14DE671C20EC94C600941522 /* ConfigureAVS.swift in Sources */,
 				1431468420DF69C30017E119 /* Security1.swift in Sources */,
 				F1DCEC2D2297D577005918FE /* WifiListTableViewCell.swift in Sources */,
 				143146B520EB273B0017E119 /* ProvisionViewController.swift in Sources */,
+				F1DDA06C2359CE590005F982 /* Utility.swift in Sources */,
 				1431462920DE994B0017E119 /* ViewController.swift in Sources */,
 				149774DD210C799900022841 /* CryptoAES.swift in Sources */,
+				F11B547422DDE41A00F7D0D3 /* StatusViewController.swift in Sources */,
 				1431466920DEAD1A0017E119 /* SoftAPTransport.swift in Sources */,
 				1431469B20E387C60017E119 /* constants.pb.swift in Sources */,
 				F1342A4B229E7D8700AD8626 /* DeviceListTableViewCell.swift in Sources */,
+				F1DDA0742383C7130005F982 /* AboutViewController.swift in Sources */,
 				149774E1210C89E600022841 /* ArrayExtensions.swift in Sources */,
+				F1DDA06E2360198E0005F982 /* ConfigureDevice.swift in Sources */,
 				1431466720DEAC220017E119 /* Security.swift in Sources */,
 				1431468720DFA58E0017E119 /* HexUtils.swift in Sources */,
+				F1EB558923043B1400AEEBE3 /* BLEDeviceListViewCell.swift in Sources */,
 				F18C3AB8229BEDB2007C197F /* ScannedLocalDevicesVC.swift in Sources */,
 				F1F339572296703C000F53A0 /* wifi_scan.pb.swift in Sources */,
 				F18C3ABF229BF4D4007C197F /* SSDPDiscovery.swift in Sources */,
 				143146B320EB22470017E119 /* ProvisionLandingViewController.swift in Sources */,
 				1431468B20E37B980017E119 /* Session.swift in Sources */,
+				F1B464B5239A50BE0090B346 /* AppInfoViewController.swift in Sources */,
 				143146AA20EA29E90017E119 /* LoginWithAmazonViewController.swift in Sources */,
 				1431469F20E387C60017E119 /* wifi_constants.pb.swift in Sources */,
 				149774E3210C8A0000022841 /* StringExtensions.swift in Sources */,
@@ -769,6 +790,7 @@
 				F184C9E4228C3E8B0034C5B7 /* AESDecryptor.m in Sources */,
 				1431469E20E387C60017E119 /* avsconfig.pb.swift in Sources */,
 				F1DCEC292296CB94005918FE /* ScanWifiList.swift in Sources */,
+				F1DDA070237AB9210005F982 /* DeviceSettingViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/EspressifProvision/EspressifProvision/AppDelegate.swift b/EspressifProvision/EspressifProvision/AppDelegate.swift
index 70954d2..436a18d 100644
--- a/EspressifProvision/EspressifProvision/AppDelegate.swift
+++ b/EspressifProvision/EspressifProvision/AppDelegate.swift
@@ -25,6 +25,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
+//        let BarButtonItemAppearance = UIBarButtonItem.appearance()
+//        BarButtonItemAppearance.setTitleTextAttributes([NSAttributedString.Key.foregroundColor: UIColor.clear], for: .normal)
         return true
     }
 
@@ -51,6 +53,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     func application(_: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
+        // Source application is not available in iOS 13 and above
+        if #available(iOS 13, *) {
+            return AMZNAuthorizationManager.handleOpen(url, sourceApplication: "")
+        }
         return AMZNAuthorizationManager.handleOpen(url, sourceApplication: options[UIApplication.OpenURLOptionsKey.sourceApplication] as! String)
     }
 }
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/Contents.json b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/Contents.json
index e196d82..b966d19 100644
--- a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -3,109 +3,109 @@
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "espressif_app_icon-20@2x.png",
+      "filename" : "iconfinder-icon_4_40x40.png",
       "scale" : "2x"
     },
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "espressif_app_icon-20@3x.png",
+      "filename" : "iconfinder-icon_6_60x60.png",
       "scale" : "3x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "espressif_app_icon-29@2x.png",
+      "filename" : "iconfinder-icon_5_58x58.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "espressif_app_icon-29@3x.png",
+      "filename" : "iconfinder-icon_7_87x87.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "espressif_app_icon-40@2x.png",
+      "filename" : "iconfinder-icon_11_80x80.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "espressif_app_icon-40@3x.png",
+      "filename" : "iconfinder-icon_120x120-1.png",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "espressif_app_icon-60@2x.png",
+      "filename" : "iconfinder-icon_120x120.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "espressif_app_icon-60@3x.png",
+      "filename" : "iconfinder-icon_1_180x180.png",
       "scale" : "3x"
     },
     {
       "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "espressif_app_icon-20.png",
+      "filename" : "iconfinder-icon_2_20x20.png",
       "scale" : "1x"
     },
     {
       "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "espressif_app_icon-20@2x.png",
+      "filename" : "iconfinder-icon_4_40x40-1.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "espressif_app_icon-29.png",
+      "filename" : "iconfinder-icon_3_29x29.png",
       "scale" : "1x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "espressif_app_icon-29@2x.png",
+      "filename" : "iconfinder-icon_5_58x58-2.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "espressif_app_icon-40.png",
+      "filename" : "iconfinder-icon_4_40x40-2.png",
       "scale" : "1x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "espressif_app_icon-40@2x.png",
+      "filename" : "iconfinder-icon_11_80x80-1.png",
       "scale" : "2x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "espressif_app_icon-76.png",
+      "filename" : "iconfinder-icon_12_76x76.png",
       "scale" : "1x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "espressif_app_icon-76@2x.png",
+      "filename" : "iconfinder-icon_8_152x152.png",
       "scale" : "2x"
     },
     {
       "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "filename" : "espressif_app_icon-83.5@2x.png",
+      "filename" : "iconfinder-icon_9_167x167.png",
       "scale" : "2x"
     },
     {
       "size" : "1024x1024",
       "idiom" : "ios-marketing",
-      "filename" : "espressif_app_icon-1024.png",
+      "filename" : "iconfinder-icon_10_1024x1024.png",
       "scale" : "1x"
     }
   ],
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-1024.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-1024.png
deleted file mode 100644
index b2aad0d..0000000
Binary files a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-1024.png and /dev/null differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-20.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-20.png
deleted file mode 100644
index 8ebe7b1..0000000
Binary files a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-20.png and /dev/null differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-20@2x.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-20@2x.png
deleted file mode 100644
index 8364f33..0000000
Binary files a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-20@2x.png and /dev/null differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-20@3x.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-20@3x.png
deleted file mode 100644
index 3b25c90..0000000
Binary files a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-20@3x.png and /dev/null differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-29.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-29.png
deleted file mode 100644
index 3608cd4..0000000
Binary files a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-29.png and /dev/null differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-29@2x.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-29@2x.png
deleted file mode 100644
index a6a50e3..0000000
Binary files a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-29@2x.png and /dev/null differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-29@3x.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-29@3x.png
deleted file mode 100644
index 35f872e..0000000
Binary files a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-29@3x.png and /dev/null differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-40.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-40.png
deleted file mode 100644
index 8364f33..0000000
Binary files a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-40.png and /dev/null differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-40@2x.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-40@2x.png
deleted file mode 100644
index 4b49f4c..0000000
Binary files a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-40@2x.png and /dev/null differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-40@3x.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-40@3x.png
deleted file mode 100644
index ee40b58..0000000
Binary files a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-40@3x.png and /dev/null differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-60@2x.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-60@2x.png
deleted file mode 100644
index ee40b58..0000000
Binary files a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-60@2x.png and /dev/null differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-60@3x.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-60@3x.png
deleted file mode 100644
index 7ba26df..0000000
Binary files a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-60@3x.png and /dev/null differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-76.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-76.png
deleted file mode 100644
index 06a48fe..0000000
Binary files a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-76.png and /dev/null differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-76@2x.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-76@2x.png
deleted file mode 100644
index 6c88ae5..0000000
Binary files a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-76@2x.png and /dev/null differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-83.5@2x.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-83.5@2x.png
deleted file mode 100644
index 199d977..0000000
Binary files a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/espressif_app_icon-83.5@2x.png and /dev/null differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_10_1024x1024.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_10_1024x1024.png
new file mode 100644
index 0000000..23cc02b
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_10_1024x1024.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_11_80x80-1.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_11_80x80-1.png
new file mode 100644
index 0000000..31fe88f
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_11_80x80-1.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_11_80x80.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_11_80x80.png
new file mode 100644
index 0000000..31fe88f
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_11_80x80.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_120x120-1.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_120x120-1.png
new file mode 100644
index 0000000..e3c6c70
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_120x120-1.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_120x120.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_120x120.png
new file mode 100644
index 0000000..e3c6c70
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_120x120.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_12_76x76.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_12_76x76.png
new file mode 100644
index 0000000..48d0a48
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_12_76x76.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_1_180x180.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_1_180x180.png
new file mode 100644
index 0000000..599873f
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_1_180x180.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_2_20x20.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_2_20x20.png
new file mode 100644
index 0000000..4023550
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_2_20x20.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_3_29x29.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_3_29x29.png
new file mode 100644
index 0000000..0bc3c36
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_3_29x29.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_4_40x40-1.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_4_40x40-1.png
new file mode 100644
index 0000000..fa3ead6
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_4_40x40-1.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_4_40x40-2.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_4_40x40-2.png
new file mode 100644
index 0000000..fa3ead6
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_4_40x40-2.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_4_40x40.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_4_40x40.png
new file mode 100644
index 0000000..fa3ead6
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_4_40x40.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_5_58x58-2.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_5_58x58-2.png
new file mode 100644
index 0000000..7d893be
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_5_58x58-2.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_5_58x58.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_5_58x58.png
new file mode 100644
index 0000000..7d893be
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_5_58x58.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_6_60x60.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_6_60x60.png
new file mode 100644
index 0000000..80f14fb
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_6_60x60.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_7_87x87.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_7_87x87.png
new file mode 100644
index 0000000..15d9278
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_7_87x87.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_8_152x152.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_8_152x152.png
new file mode 100644
index 0000000..a1856b4
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_8_152x152.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_9_167x167.png b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_9_167x167.png
new file mode 100644
index 0000000..4ad2b99
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/AppIcon.appiconset/iconfinder-icon_9_167x167.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/add_icon.imageset/211802-128.png b/EspressifProvision/EspressifProvision/Assets.xcassets/add_icon.imageset/211802-128.png
new file mode 100644
index 0000000..90fe0f0
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/add_icon.imageset/211802-128.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/add_icon.imageset/211802-256.png b/EspressifProvision/EspressifProvision/Assets.xcassets/add_icon.imageset/211802-256.png
new file mode 100644
index 0000000..649af39
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/add_icon.imageset/211802-256.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/add_icon.imageset/211802-512.png b/EspressifProvision/EspressifProvision/Assets.xcassets/add_icon.imageset/211802-512.png
new file mode 100644
index 0000000..402b45d
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/add_icon.imageset/211802-512.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/add_icon.imageset/Contents.json b/EspressifProvision/EspressifProvision/Assets.xcassets/add_icon.imageset/Contents.json
new file mode 100644
index 0000000..05e9654
--- /dev/null
+++ b/EspressifProvision/EspressifProvision/Assets.xcassets/add_icon.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "211802-128.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "211802-256.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "211802-512.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/app_info_logo.imageset/18.8.6 logo design-3.PNG b/EspressifProvision/EspressifProvision/Assets.xcassets/app_info_logo.imageset/18.8.6 logo design-3.PNG
new file mode 100644
index 0000000..1c0e12c
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/app_info_logo.imageset/18.8.6 logo design-3.PNG differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/app_info_logo.imageset/18.8.6 logo design-4.PNG b/EspressifProvision/EspressifProvision/Assets.xcassets/app_info_logo.imageset/18.8.6 logo design-4.PNG
new file mode 100644
index 0000000..1c0e12c
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/app_info_logo.imageset/18.8.6 logo design-4.PNG differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/app_info_logo.imageset/18.8.6 logo design-5.PNG b/EspressifProvision/EspressifProvision/Assets.xcassets/app_info_logo.imageset/18.8.6 logo design-5.PNG
new file mode 100644
index 0000000..1c0e12c
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/app_info_logo.imageset/18.8.6 logo design-5.PNG differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/app_info_logo.imageset/Contents.json b/EspressifProvision/EspressifProvision/Assets.xcassets/app_info_logo.imageset/Contents.json
new file mode 100644
index 0000000..fb2d307
--- /dev/null
+++ b/EspressifProvision/EspressifProvision/Assets.xcassets/app_info_logo.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "18.8.6 logo design-3.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "18.8.6 logo design-4.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "18.8.6 logo design-5.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/bluetooth_icon.imageset/925802-128.png b/EspressifProvision/EspressifProvision/Assets.xcassets/bluetooth_icon.imageset/925802-128.png
new file mode 100644
index 0000000..f81acef
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/bluetooth_icon.imageset/925802-128.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/bluetooth_icon.imageset/925802-256.png b/EspressifProvision/EspressifProvision/Assets.xcassets/bluetooth_icon.imageset/925802-256.png
new file mode 100644
index 0000000..d41eaff
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/bluetooth_icon.imageset/925802-256.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/bluetooth_icon.imageset/925802-512.png b/EspressifProvision/EspressifProvision/Assets.xcassets/bluetooth_icon.imageset/925802-512.png
new file mode 100644
index 0000000..2b2ff77
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/bluetooth_icon.imageset/925802-512.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/bluetooth_icon.imageset/Contents.json b/EspressifProvision/EspressifProvision/Assets.xcassets/bluetooth_icon.imageset/Contents.json
index e46f1f0..9bc869e 100644
--- a/EspressifProvision/EspressifProvision/Assets.xcassets/bluetooth_icon.imageset/Contents.json
+++ b/EspressifProvision/EspressifProvision/Assets.xcassets/bluetooth_icon.imageset/Contents.json
@@ -2,15 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
+      "filename" : "925802-128.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "bluetooth_icon.png",
+      "filename" : "925802-256.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
+      "filename" : "925802-512.png",
       "scale" : "3x"
     }
   ],
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/bluetooth_icon.imageset/bluetooth_icon.png b/EspressifProvision/EspressifProvision/Assets.xcassets/bluetooth_icon.imageset/bluetooth_icon.png
deleted file mode 100644
index 9dd15b6..0000000
Binary files a/EspressifProvision/EspressifProvision/Assets.xcassets/bluetooth_icon.imageset/bluetooth_icon.png and /dev/null differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/hide_password.imageset/4280479-128 (1).png b/EspressifProvision/EspressifProvision/Assets.xcassets/hide_password.imageset/4280479-128 (1).png
new file mode 100644
index 0000000..759b524
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/hide_password.imageset/4280479-128 (1).png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/hide_password.imageset/4280479-256 (1).png b/EspressifProvision/EspressifProvision/Assets.xcassets/hide_password.imageset/4280479-256 (1).png
new file mode 100644
index 0000000..8dce058
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/hide_password.imageset/4280479-256 (1).png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/hide_password.imageset/4280479-512 (1).png b/EspressifProvision/EspressifProvision/Assets.xcassets/hide_password.imageset/4280479-512 (1).png
new file mode 100644
index 0000000..b1b1a1f
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/hide_password.imageset/4280479-512 (1).png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/hide_password.imageset/Contents.json b/EspressifProvision/EspressifProvision/Assets.xcassets/hide_password.imageset/Contents.json
new file mode 100644
index 0000000..6c6331e
--- /dev/null
+++ b/EspressifProvision/EspressifProvision/Assets.xcassets/hide_password.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "4280479-128 (1).png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "4280479-256 (1).png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "4280479-512 (1).png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/info_icon.imageset/326659-32 (1).png b/EspressifProvision/EspressifProvision/Assets.xcassets/info_icon.imageset/326659-32 (1).png
new file mode 100644
index 0000000..010cee5
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/info_icon.imageset/326659-32 (1).png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/info_icon.imageset/326659-48 (1).png b/EspressifProvision/EspressifProvision/Assets.xcassets/info_icon.imageset/326659-48 (1).png
new file mode 100644
index 0000000..361c5a4
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/info_icon.imageset/326659-48 (1).png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/info_icon.imageset/326659-64 (1).png b/EspressifProvision/EspressifProvision/Assets.xcassets/info_icon.imageset/326659-64 (1).png
new file mode 100644
index 0000000..76495f6
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/info_icon.imageset/326659-64 (1).png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/info_icon.imageset/Contents.json b/EspressifProvision/EspressifProvision/Assets.xcassets/info_icon.imageset/Contents.json
new file mode 100644
index 0000000..79b8c93
--- /dev/null
+++ b/EspressifProvision/EspressifProvision/Assets.xcassets/info_icon.imageset/Contents.json
@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "326659-32 (1).png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "326659-48 (1).png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "326659-64 (1).png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}
\ No newline at end of file
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/refresh_icon.imageset/211882-128 (1).png b/EspressifProvision/EspressifProvision/Assets.xcassets/refresh_icon.imageset/211882-128 (1).png
new file mode 100644
index 0000000..bed1998
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/refresh_icon.imageset/211882-128 (1).png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/refresh_icon.imageset/211882-256 (1).png b/EspressifProvision/EspressifProvision/Assets.xcassets/refresh_icon.imageset/211882-256 (1).png
new file mode 100644
index 0000000..59438b0
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/refresh_icon.imageset/211882-256 (1).png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/refresh_icon.imageset/211882-512 (1).png b/EspressifProvision/EspressifProvision/Assets.xcassets/refresh_icon.imageset/211882-512 (1).png
new file mode 100644
index 0000000..57e46cb
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/refresh_icon.imageset/211882-512 (1).png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/refresh_icon.imageset/Contents.json b/EspressifProvision/EspressifProvision/Assets.xcassets/refresh_icon.imageset/Contents.json
new file mode 100644
index 0000000..21f5ef5
--- /dev/null
+++ b/EspressifProvision/EspressifProvision/Assets.xcassets/refresh_icon.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "211882-128 (1).png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "211882-256 (1).png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "211882-512 (1).png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/right_arrow.imageset/3209393-128.png b/EspressifProvision/EspressifProvision/Assets.xcassets/right_arrow.imageset/3209393-128.png
new file mode 100644
index 0000000..e7d163a
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/right_arrow.imageset/3209393-128.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/right_arrow.imageset/3209393-256.png b/EspressifProvision/EspressifProvision/Assets.xcassets/right_arrow.imageset/3209393-256.png
new file mode 100644
index 0000000..946c425
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/right_arrow.imageset/3209393-256.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/right_arrow.imageset/3209393-64.png b/EspressifProvision/EspressifProvision/Assets.xcassets/right_arrow.imageset/3209393-64.png
new file mode 100644
index 0000000..1335a25
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/right_arrow.imageset/3209393-64.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/right_arrow.imageset/Contents.json b/EspressifProvision/EspressifProvision/Assets.xcassets/right_arrow.imageset/Contents.json
new file mode 100644
index 0000000..998b2d2
--- /dev/null
+++ b/EspressifProvision/EspressifProvision/Assets.xcassets/right_arrow.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "3209393-64.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "3209393-128.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "3209393-256.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/show_password.imageset/4280479-128.png b/EspressifProvision/EspressifProvision/Assets.xcassets/show_password.imageset/4280479-128.png
new file mode 100644
index 0000000..3a260f5
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/show_password.imageset/4280479-128.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/show_password.imageset/4280479-256.png b/EspressifProvision/EspressifProvision/Assets.xcassets/show_password.imageset/4280479-256.png
new file mode 100644
index 0000000..d5c514b
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/show_password.imageset/4280479-256.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/show_password.imageset/4280479-512.png b/EspressifProvision/EspressifProvision/Assets.xcassets/show_password.imageset/4280479-512.png
new file mode 100644
index 0000000..f4c49e8
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/show_password.imageset/4280479-512.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/show_password.imageset/Contents.json b/EspressifProvision/EspressifProvision/Assets.xcassets/show_password.imageset/Contents.json
new file mode 100644
index 0000000..72534b4
--- /dev/null
+++ b/EspressifProvision/EspressifProvision/Assets.xcassets/show_password.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "4280479-128.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "4280479-256.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "4280479-512.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/wifi_security.imageset/293687-128.png b/EspressifProvision/EspressifProvision/Assets.xcassets/wifi_security.imageset/293687-128.png
new file mode 100644
index 0000000..5cc103d
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/wifi_security.imageset/293687-128.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/wifi_security.imageset/293687-32.png b/EspressifProvision/EspressifProvision/Assets.xcassets/wifi_security.imageset/293687-32.png
new file mode 100644
index 0000000..ec0f6ff
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/wifi_security.imageset/293687-32.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/wifi_security.imageset/293687-64.png b/EspressifProvision/EspressifProvision/Assets.xcassets/wifi_security.imageset/293687-64.png
new file mode 100644
index 0000000..a91acf4
Binary files /dev/null and b/EspressifProvision/EspressifProvision/Assets.xcassets/wifi_security.imageset/293687-64.png differ
diff --git a/EspressifProvision/EspressifProvision/Assets.xcassets/wifi_security.imageset/Contents.json b/EspressifProvision/EspressifProvision/Assets.xcassets/wifi_security.imageset/Contents.json
new file mode 100644
index 0000000..d5fc6b8
--- /dev/null
+++ b/EspressifProvision/EspressifProvision/Assets.xcassets/wifi_security.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "293687-32.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "293687-64.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "293687-128.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/EspressifProvision/EspressifProvision/Base.lproj/Main.storyboard b/EspressifProvision/EspressifProvision/Base.lproj/Main.storyboard
index dab744c..e4e8f02 100644
--- a/EspressifProvision/EspressifProvision/Base.lproj/Main.storyboard
+++ b/EspressifProvision/EspressifProvision/Base.lproj/Main.storyboard
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="mgC-Sj-4EB">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="mgC-Sj-4EB">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -26,19 +24,85 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GBL-o3-BJC">
-                                <rect key="frame" x="83" y="519" width="209" height="48"/>
-                                <state key="normal" backgroundImage="btnLWA_gold_209x48"/>
-                                <state key="selected" backgroundImage="btnLWA_gold_209x48_pressed"/>
-                                <connections>
-                                    <action selector="onAmazonLoginClicked:" destination="0Hz-c3-bd6" eventType="touchUpInside" id="eyK-Yy-ezT"/>
-                                </connections>
-                            </button>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="alexa_logo" translatesAutoresizingMaskIntoConstraints="NO" id="og7-zo-7Gv">
+                                <rect key="frame" x="62" y="20" width="251" height="188.5"/>
+                            </imageView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Med-En-HI0">
+                                <rect key="frame" x="0.0" y="208.5" width="375" height="458.5"/>
+                                <subviews>
+                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="n5o-MU-mui">
+                                        <rect key="frame" x="20" y="2" width="335" height="102"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="102" id="Vs7-dW-aUW"/>
+                                        </constraints>
+                                        <string key="text">Your device includes access to Alexa.
+Connect your Amazon account to access personalized features.</string>
+                                        <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <fontDescription key="fontDescription" name="AmazonEmberDisplay-Light" family="Amazon Ember Display" pointSize="20"/>
+                                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                                        <variation key="heightClass=regular-widthClass=regular">
+                                            <fontDescription key="fontDescription" name="AmazonEmberDisplay-Light" family="Amazon Ember Display" pointSize="26"/>
+                                        </variation>
+                                    </textView>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IZj-DA-GXg">
+                                        <rect key="frame" x="94" y="308.5" width="187.5" height="50"/>
+                                        <color key="backgroundColor" red="0.0" green="0.60392156860000001" blue="0.76470588240000004" alpha="1" colorSpace="calibratedRGB"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="50" id="7yK-nC-1jW"/>
+                                        </constraints>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <state key="normal" title="Sign in with Amazon">
+                                            <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        </state>
+                                        <userDefinedRuntimeAttributes>
+                                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                <integer key="value" value="18"/>
+                                            </userDefinedRuntimeAttribute>
+                                        </userDefinedRuntimeAttributes>
+                                        <connections>
+                                            <action selector="onAmazonLoginClicked:" destination="0Hz-c3-bd6" eventType="touchUpInside" id="aBQ-cO-CIH"/>
+                                            <action selector="signInAmazon:" destination="48V-9A-pox" eventType="touchUpInside" id="BB5-YC-ANy"/>
+                                        </connections>
+                                    </button>
+                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="0rd-jo-PgA">
+                                        <rect key="frame" x="20" y="114" width="335" height="169.5"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <string key="text">Alexa allows you to use your voice to play music and get news, sports, scores, weather and more.
+All you have to do is ask Alexa.</string>
+                                        <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <fontDescription key="fontDescription" name="AmazonEmberDisplay-Light" family="Amazon Ember Display" pointSize="18"/>
+                                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                                        <variation key="heightClass=regular-widthClass=regular">
+                                            <fontDescription key="fontDescription" name="AmazonEmberDisplay-Light" family="Amazon Ember Display" pointSize="24"/>
+                                        </variation>
+                                    </textView>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="bottom" secondItem="IZj-DA-GXg" secondAttribute="bottom" constant="100" id="H4Y-dG-uME"/>
+                                    <constraint firstItem="IZj-DA-GXg" firstAttribute="top" secondItem="0rd-jo-PgA" secondAttribute="bottom" constant="25" id="MjU-VO-t9W"/>
+                                    <constraint firstItem="0rd-jo-PgA" firstAttribute="leading" secondItem="Med-En-HI0" secondAttribute="leading" constant="20" id="ORT-yl-U7u"/>
+                                    <constraint firstItem="0rd-jo-PgA" firstAttribute="top" secondItem="n5o-MU-mui" secondAttribute="bottom" constant="10" id="OtT-PM-bcH"/>
+                                    <constraint firstItem="n5o-MU-mui" firstAttribute="top" secondItem="Med-En-HI0" secondAttribute="top" constant="2" id="PMa-0I-57F"/>
+                                    <constraint firstItem="IZj-DA-GXg" firstAttribute="width" secondItem="Med-En-HI0" secondAttribute="width" multiplier="0.5" id="SUm-Cb-nMI"/>
+                                    <constraint firstItem="IZj-DA-GXg" firstAttribute="centerX" secondItem="Med-En-HI0" secondAttribute="centerX" id="T5v-Jr-dht"/>
+                                    <constraint firstItem="n5o-MU-mui" firstAttribute="leading" secondItem="Med-En-HI0" secondAttribute="leading" constant="20" id="cJe-R0-LhH"/>
+                                    <constraint firstAttribute="trailing" secondItem="n5o-MU-mui" secondAttribute="trailing" constant="20" id="uax-VG-Kr0"/>
+                                    <constraint firstAttribute="trailing" secondItem="0rd-jo-PgA" secondAttribute="trailing" constant="20" id="y9c-0V-q43"/>
+                                </constraints>
+                            </view>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
-                            <constraint firstItem="zPV-X8-7Ke" firstAttribute="bottom" secondItem="GBL-o3-BJC" secondAttribute="bottom" constant="100" id="8F5-rt-4Zg"/>
-                            <constraint firstItem="GBL-o3-BJC" firstAttribute="centerX" secondItem="zPV-X8-7Ke" secondAttribute="centerX" id="LQV-wQ-Vqz"/>
+                            <constraint firstItem="zPV-X8-7Ke" firstAttribute="bottom" secondItem="Med-En-HI0" secondAttribute="bottom" id="Iuv-Ek-euy"/>
+                            <constraint firstItem="og7-zo-7Gv" firstAttribute="width" secondItem="OIs-7f-pk8" secondAttribute="width" multiplier="0.67" id="ZFc-vV-yEW"/>
+                            <constraint firstItem="Med-En-HI0" firstAttribute="trailing" secondItem="zPV-X8-7Ke" secondAttribute="trailing" id="cGq-wh-9NH"/>
+                            <constraint firstItem="Med-En-HI0" firstAttribute="top" secondItem="og7-zo-7Gv" secondAttribute="bottom" id="eum-Ln-LOI"/>
+                            <constraint firstItem="og7-zo-7Gv" firstAttribute="width" secondItem="og7-zo-7Gv" secondAttribute="height" multiplier="4:3" id="g77-y2-Ln5"/>
+                            <constraint firstItem="Med-En-HI0" firstAttribute="leading" secondItem="zPV-X8-7Ke" secondAttribute="leading" id="hR5-es-O0f"/>
+                            <constraint firstItem="og7-zo-7Gv" firstAttribute="centerX" secondItem="OIs-7f-pk8" secondAttribute="centerX" id="m9G-77-4no"/>
+                            <constraint firstItem="og7-zo-7Gv" firstAttribute="top" secondItem="zPV-X8-7Ke" secondAttribute="top" constant="20" id="syG-wL-NTs"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="zPV-X8-7Ke"/>
                     </view>
@@ -71,15 +135,15 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="6" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HDv-gl-45v">
-                                <rect key="frame" x="16" y="52" width="343" height="143.5"/>
-                                <string key="text">To provision your new device, please make sure that your device is turned on and the Wifi symbol blinks green. Now connect your phone to the Wifi network with a name like : 
+                                <rect key="frame" x="16" y="32" width="343" height="143.5"/>
+                                <string key="text">To add your new device, please make sure that your device is turned on and the Wi-Fi symbol blinks green. Now connect your phone to your home Wi-Fi network with a name like : 
 </string>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <color key="textColor" red="0.61960784313725492" green="0.61960784313725492" blue="0.61960784313725492" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wifi_symbol" translatesAutoresizingMaskIntoConstraints="NO" id="ocj-eE-ybM">
-                                <rect key="frame" x="179.5" y="243" width="16" height="16"/>
+                                <rect key="frame" x="78.5" y="223" width="218" height="166"/>
                             </imageView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GeR-un-w12">
                                 <rect key="frame" x="56" y="435" width="263.5" height="50"/>
@@ -127,11 +191,11 @@
             <objects>
                 <viewController storyboardIdentifier="provision" title="Provision" id="Xh7-kO-DLD" customClass="ProvisionViewController" customModule="EspressifProvision" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="yXd-mP-AAN">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0cJ-tP-8gh">
-                                <rect key="frame" x="56.5" y="517" width="262.5" height="50"/>
+                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0cJ-tP-8gh">
+                                <rect key="frame" x="56.5" y="497" width="262.5" height="50"/>
                                 <color key="backgroundColor" red="1" green="0.14913141730000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="2sR-Ce-0ah"/>
@@ -147,48 +211,83 @@
                                 </connections>
                             </button>
                             <textField hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Network Name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="f4f-GO-d26">
-                                <rect key="frame" x="56.5" y="157" width="262.5" height="50"/>
+                                <rect key="frame" x="56.5" y="137" width="262.5" height="50"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="kxw-zY-WF7"/>
                                 </constraints>
-                                <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                 <textInputTraits key="textInputTraits" keyboardAppearance="alert" returnKeyType="next" textContentType="name"/>
                             </textField>
-                            <textField hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Passphrase" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="nCf-NW-Ff0">
-                                <rect key="frame" x="56.5" y="239" width="262.5" height="50"/>
+                            <textField hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Password" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="nCf-NW-Ff0">
+                                <rect key="frame" x="56.5" y="219" width="262.5" height="50"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="QUV-fg-kwq"/>
                                 </constraints>
-                                <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                 <textInputTraits key="textInputTraits" keyboardAppearance="alert" returnKeyType="go" secureTextEntry="YES" textContentType="password"/>
                             </textField>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To complete setup of your device, please provide your home Network's credentials." textAlignment="center" lineBreakMode="wordWrap" numberOfLines="6" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="426-xy-WDe">
-                                <rect key="frame" x="16" y="52" width="343" height="41"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To complete setup of your device, select your home Wi-Fi network." textAlignment="center" lineBreakMode="wordWrap" numberOfLines="6" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="426-xy-WDe">
+                                <rect key="frame" x="16" y="32" width="343" height="41"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.61960784310000006" green="0.61960784310000006" blue="0.61960784310000006" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eCL-Ao-2Zt">
+                                <rect key="frame" x="0.0" y="93" width="375" height="30"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Networks" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7sj-QA-5FU">
+                                        <rect key="frame" x="16" y="4.5" width="76.5" height="21"/>
+                                        <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
+                                        <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9yk-TD-Bi7">
+                                        <rect key="frame" x="317" y="2.5" width="25" height="25"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="25" id="6Ww-CU-zZo"/>
+                                            <constraint firstAttribute="height" constant="25" id="AjB-0k-qaR"/>
+                                        </constraints>
+                                        <state key="normal" image="refresh_icon"/>
+                                        <connections>
+                                            <action selector="rescanWiFiList:" destination="Xh7-kO-DLD" eventType="touchUpInside" id="FHk-37-SNx"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                                <color key="backgroundColor" white="0.95999999999999996" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="3V2-hr-WJe"/>
+                                    <constraint firstAttribute="trailing" secondItem="9yk-TD-Bi7" secondAttribute="trailing" constant="33" id="OdA-PK-5sC"/>
+                                    <constraint firstItem="9yk-TD-Bi7" firstAttribute="centerY" secondItem="eCL-Ao-2Zt" secondAttribute="centerY" id="dAz-E6-Lov"/>
+                                    <constraint firstItem="7sj-QA-5FU" firstAttribute="leading" secondItem="eCL-Ao-2Zt" secondAttribute="leading" constant="16" id="v4t-6L-IJa"/>
+                                    <constraint firstItem="7sj-QA-5FU" firstAttribute="centerY" secondItem="eCL-Ao-2Zt" secondAttribute="centerY" id="xEE-gB-Uu7"/>
+                                </constraints>
+                            </view>
                             <tableView hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="RyJ-Ri-wep">
-                                <rect key="frame" x="0.0" y="118" width="375" height="381"/>
+                                <rect key="frame" x="0.0" y="133" width="375" height="514"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="wifiListCell" rowHeight="60" id="PER-8p-OLi" customClass="WifiListTableViewCell" customModule="EspressifProvision" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="28" width="375" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="PER-8p-OLi" id="19T-oW-WYe">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="59.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="670-DZ-eiW">
-                                                    <rect key="frame" x="15" y="19.5" width="663" height="21"/>
+                                                    <rect key="frame" x="15" y="19.5" width="253" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Fc1-Md-Go3">
+                                                    <rect key="frame" x="278" y="22.5" width="20" height="15"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="20" id="emf-qh-33y"/>
+                                                        <constraint firstAttribute="width" secondItem="Fc1-Md-Go3" secondAttribute="height" multiplier="4:3" id="xNA-zX-Qys"/>
+                                                    </constraints>
+                                                </imageView>
                                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wifi_symbol_weak" translatesAutoresizingMaskIntoConstraints="NO" id="fPb-NJ-4le">
-                                                    <rect key="frame" x="698" y="13" width="45" height="33.5"/>
+                                                    <rect key="frame" x="310" y="13" width="45" height="34"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="45" id="OQc-Ym-vD3"/>
                                                         <constraint firstAttribute="width" secondItem="fPb-NJ-4le" secondAttribute="height" multiplier="4:3" id="yIJ-5m-G4g"/>
@@ -196,15 +295,18 @@
                                                 </imageView>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="fPb-NJ-4le" firstAttribute="leading" secondItem="670-DZ-eiW" secondAttribute="trailing" constant="20" id="5dS-46-Mho"/>
+                                                <constraint firstItem="Fc1-Md-Go3" firstAttribute="centerY" secondItem="19T-oW-WYe" secondAttribute="centerY" id="Fkv-Us-dYc"/>
                                                 <constraint firstItem="fPb-NJ-4le" firstAttribute="centerY" secondItem="19T-oW-WYe" secondAttribute="centerY" id="LE8-Os-WCM"/>
                                                 <constraint firstItem="670-DZ-eiW" firstAttribute="centerY" secondItem="19T-oW-WYe" secondAttribute="centerY" id="XXJ-bX-bcE"/>
-                                                <constraint firstAttribute="trailing" secondItem="fPb-NJ-4le" secondAttribute="trailing" constant="25" id="otE-D5-CER"/>
+                                                <constraint firstAttribute="trailing" secondItem="fPb-NJ-4le" secondAttribute="trailing" constant="20" id="otE-D5-CER"/>
+                                                <constraint firstItem="Fc1-Md-Go3" firstAttribute="leading" secondItem="670-DZ-eiW" secondAttribute="trailing" constant="10" id="tGO-ZY-He8"/>
                                                 <constraint firstItem="670-DZ-eiW" firstAttribute="leading" secondItem="19T-oW-WYe" secondAttribute="leading" constant="15" id="ujS-jM-3YH"/>
+                                                <constraint firstItem="fPb-NJ-4le" firstAttribute="leading" secondItem="Fc1-Md-Go3" secondAttribute="trailing" constant="12" id="ze5-T8-bK2"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                         <connections>
-                                            <outlet property="signalImageView" destination="fPb-NJ-4le" id="adN-lF-vds"/>
+                                            <outlet property="authenticationImageView" destination="Fc1-Md-Go3" id="eU9-Lc-6AF"/>
+                                            <outlet property="signalImageView" destination="fPb-NJ-4le" id="70e-Qy-P0f"/>
                                             <outlet property="ssidLabel" destination="670-DZ-eiW" id="AXS-6Z-lUb"/>
                                         </connections>
                                     </tableViewCell>
@@ -217,19 +319,22 @@
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
+                            <constraint firstItem="dP9-FR-avv" firstAttribute="bottom" secondItem="RyJ-Ri-wep" secondAttribute="bottom" id="5gH-aX-W3j"/>
+                            <constraint firstItem="eCL-Ao-2Zt" firstAttribute="trailing" secondItem="dP9-FR-avv" secondAttribute="trailing" id="C31-s1-UCf"/>
+                            <constraint firstItem="RyJ-Ri-wep" firstAttribute="top" secondItem="eCL-Ao-2Zt" secondAttribute="bottom" constant="10" id="DDR-jj-q15"/>
                             <constraint firstItem="RyJ-Ri-wep" firstAttribute="trailing" secondItem="dP9-FR-avv" secondAttribute="trailing" id="DF0-rQ-dVz"/>
                             <constraint firstItem="0cJ-tP-8gh" firstAttribute="centerX" secondItem="dP9-FR-avv" secondAttribute="centerX" id="Eao-C1-UPO"/>
                             <constraint firstItem="f4f-GO-d26" firstAttribute="centerX" secondItem="dP9-FR-avv" secondAttribute="centerX" id="GXY-ix-67w"/>
                             <constraint firstItem="f4f-GO-d26" firstAttribute="top" secondItem="426-xy-WDe" secondAttribute="bottom" constant="64" id="MWi-E9-j7P"/>
                             <constraint firstItem="0cJ-tP-8gh" firstAttribute="width" secondItem="yXd-mP-AAN" secondAttribute="width" multiplier="0.7" id="Pij-zs-v3v"/>
-                            <constraint firstItem="RyJ-Ri-wep" firstAttribute="top" secondItem="426-xy-WDe" secondAttribute="bottom" constant="25" id="XDW-PD-EsT"/>
+                            <constraint firstItem="eCL-Ao-2Zt" firstAttribute="top" secondItem="426-xy-WDe" secondAttribute="bottom" constant="20" id="avl-qt-nHs"/>
                             <constraint firstItem="426-xy-WDe" firstAttribute="width" secondItem="yXd-mP-AAN" secondAttribute="width" constant="-32" id="bMH-ms-q3f"/>
                             <constraint firstItem="f4f-GO-d26" firstAttribute="width" secondItem="yXd-mP-AAN" secondAttribute="width" multiplier="0.7" id="eUx-2O-1y0"/>
                             <constraint firstItem="RyJ-Ri-wep" firstAttribute="leading" secondItem="dP9-FR-avv" secondAttribute="leading" id="fXQ-c4-sdK"/>
                             <constraint firstItem="nCf-NW-Ff0" firstAttribute="top" secondItem="f4f-GO-d26" secondAttribute="bottom" constant="32" id="fof-iv-gpV"/>
                             <constraint firstItem="426-xy-WDe" firstAttribute="centerX" secondItem="dP9-FR-avv" secondAttribute="centerX" id="k08-4o-vas"/>
                             <constraint firstItem="dP9-FR-avv" firstAttribute="bottom" secondItem="0cJ-tP-8gh" secondAttribute="bottom" constant="100" id="loK-hV-4uz"/>
-                            <constraint firstItem="0cJ-tP-8gh" firstAttribute="top" secondItem="RyJ-Ri-wep" secondAttribute="bottom" constant="18" id="r52-el-lzP"/>
+                            <constraint firstItem="eCL-Ao-2Zt" firstAttribute="leading" secondItem="dP9-FR-avv" secondAttribute="leading" id="phb-Io-x1a"/>
                             <constraint firstItem="nCf-NW-Ff0" firstAttribute="centerX" secondItem="dP9-FR-avv" secondAttribute="centerX" id="rWW-Vr-OFf"/>
                             <constraint firstItem="nCf-NW-Ff0" firstAttribute="width" secondItem="yXd-mP-AAN" secondAttribute="width" multiplier="0.7" id="u1h-zL-bFB"/>
                             <constraint firstItem="426-xy-WDe" firstAttribute="top" secondItem="dP9-FR-avv" secondAttribute="top" constant="32" id="uYU-Jf-hnw"/>
@@ -237,6 +342,7 @@
                         <viewLayoutGuide key="safeArea" id="dP9-FR-avv"/>
                     </view>
                     <connections>
+                        <outlet property="headerView" destination="eCL-Ao-2Zt" id="tdq-zg-gGY"/>
                         <outlet property="passphraseTextfield" destination="nCf-NW-Ff0" id="7HP-9d-GYU"/>
                         <outlet property="provisionButton" destination="0cJ-tP-8gh" id="oWz-jQ-60b"/>
                         <outlet property="ssidTextfield" destination="f4f-GO-d26" id="g8N-yW-tQ4"/>
@@ -247,16 +353,18 @@
             </objects>
             <point key="canvasLocation" x="1752.8" y="31.934032983508249"/>
         </scene>
-        <!--Success View Controller-->
+        <!--Status View Controller-->
         <scene sceneID="1NK-5s-vK5">
             <objects>
-                <viewController storyboardIdentifier="successViewController" id="kI4-hk-B8X" customClass="SuccessViewController" customModule="EspressifProvision" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="statusViewController" id="kI4-hk-B8X" customClass="StatusViewController" customModule="EspressifProvision" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Cg9-vu-1LI">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Device has been successfully provisioned!" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="6" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wHO-RU-suR">
-                                <rect key="frame" x="56.5" y="319.5" width="262.5" height="48"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="6" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wHO-RU-suR">
+                                <rect key="frame" x="56.5" y="297.5" width="262.5" height="72"/>
+                                <string key="text">Some error was encountered.
+Please reset your device and retry again.</string>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <color key="textColor" red="0.61960784310000006" green="0.61960784310000006" blue="0.61960784310000006" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
@@ -291,17 +399,17 @@
                         <viewLayoutGuide key="safeArea" id="k5F-pP-pmt"/>
                     </view>
                     <connections>
-                        <outlet property="successLabel" destination="wHO-RU-suR" id="1LM-Po-fT5"/>
+                        <outlet property="successLabel" destination="wHO-RU-suR" id="kPH-AE-bHP"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="55T-vs-eK8" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="2548" y="27"/>
         </scene>
-        <!--Int AVS BLE-->
+        <!--ESP Alexa-->
         <scene sceneID="vpc-50-hsG">
             <objects>
-                <viewController id="ZH1-Yn-aSM" customClass="ViewController" customModule="EspressifProvision" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="firstVC" id="ZH1-Yn-aSM" customClass="ViewController" customModule="EspressifProvision" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="63H-8f-fMi">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -314,13 +422,11 @@
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                 <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <state key="normal" title="Start Provisioning">
+                                <state key="normal" title="Add New Device">
                                     <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <connections>
-                                    <action selector="provisionButtonClicked:" destination="Xh7-kO-DLD" eventType="touchUpInside" id="QsJ-KO-MSY"/>
-                                    <action selector="provisionButtonClicked:" destination="ZH1-Yn-aSM" eventType="touchUpInside" id="cgf-wP-dIZ"/>
-                                    <action selector="provisionButtonPressed:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Dg0-Qe-B8i"/>
+                                    <action selector="provisionButtonClicked:" destination="ZH1-Yn-aSM" eventType="touchUpInside" id="CnW-Uc-ycq"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Bem-LB-vVn">
@@ -331,7 +437,7 @@
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                 <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <state key="normal" title="Manage">
+                                <state key="normal" title="Manage Devices">
                                     <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <connections>
@@ -351,12 +457,58 @@
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="J6f-Ap-nzK"/>
                     </view>
-                    <navigationItem key="navigationItem" title="Int AVS BLE" id="Pyf-5z-bsl" userLabel="Int AVS BLE"/>
+                    <navigationItem key="navigationItem" title="ESP Alexa" id="Pyf-5z-bsl" userLabel="Int AVS BLE">
+                        <barButtonItem key="rightBarButtonItem" title="Info" style="plain" id="3vd-IX-DgB">
+                            <connections>
+                                <segue destination="1mB-f4-lea" kind="show" id="qEh-Jm-FT6"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="g1t-Ju-tVJ" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="1753" y="-695"/>
         </scene>
+        <!--App Info View Controller-->
+        <scene sceneID="3Xp-Td-1hu">
+            <objects>
+                <viewController id="1mB-f4-lea" customClass="AppInfoViewController" customModule="EspressifProvision" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="0aH-bD-Zv6">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="app_info_logo" translatesAutoresizingMaskIntoConstraints="NO" id="bAW-Rv-fUS">
+                                <rect key="frame" x="19" y="249" width="337.5" height="169"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" secondItem="bAW-Rv-fUS" secondAttribute="height" multiplier="4:2" id="7FG-31-Skh"/>
+                                </constraints>
+                            </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="App Version" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W3W-2H-qtc">
+                                <rect key="frame" x="141" y="418" width="93.5" height="21"/>
+                                <fontDescription key="fontDescription" type="italicSystem" pointSize="17"/>
+                                <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="W3W-2H-qtc" firstAttribute="centerX" secondItem="0aH-bD-Zv6" secondAttribute="centerX" id="4v2-R5-0NH"/>
+                            <constraint firstItem="bAW-Rv-fUS" firstAttribute="centerY" secondItem="0aH-bD-Zv6" secondAttribute="centerY" id="SkD-5I-pKv"/>
+                            <constraint firstItem="W3W-2H-qtc" firstAttribute="top" secondItem="bAW-Rv-fUS" secondAttribute="bottom" id="SyU-82-SGn"/>
+                            <constraint firstItem="bAW-Rv-fUS" firstAttribute="centerX" secondItem="0aH-bD-Zv6" secondAttribute="centerX" id="mHC-CI-dgM"/>
+                            <constraint firstItem="bAW-Rv-fUS" firstAttribute="width" secondItem="eeZ-cy-Fh3" secondAttribute="width" multiplier="0.9" id="yXV-bZ-npq"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="eeZ-cy-Fh3"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="408-Zp-zPy"/>
+                    <connections>
+                        <outlet property="appVersionLabel" destination="W3W-2H-qtc" id="rAt-ge-8Jc"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="vWa-XX-uho" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2508" y="-1416"/>
+        </scene>
         <!--Scanned Local DevicesVC-->
         <scene sceneID="dcU-VH-F9i">
             <objects>
@@ -366,63 +518,55 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="6" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zte-Ow-vZc">
-                                <rect key="frame" x="16" y="84" width="343" height="95.5"/>
-                                <string key="text">Make sure you are connected on the same WiFi network as the Alexa Device.
+                                <rect key="frame" x="16" y="64" width="343" height="95.5"/>
+                                <string key="text">Make sure you are connected on the same Wi-Fi network as the Alexa Device.
 </string>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <color key="textColor" red="0.61960784310000006" green="0.61960784310000006" blue="0.61960784310000006" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Devices" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qG7-xi-xSA">
-                                <rect key="frame" x="16" y="189.5" width="309" height="21"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" red="0.61960784310000006" green="0.61960784310000006" blue="0.61960784310000006" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <rect key="frame" x="16" y="169.5" width="68" height="23"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="19"/>
+                                <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ddI-E6-VYU">
-                                <rect key="frame" x="56.5" y="517" width="262.5" height="50"/>
-                                <color key="backgroundColor" red="1" green="0.14913141730000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="50" id="18o-DL-27H"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <state key="normal" title="Scan again">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
-                                <connections>
-                                    <action selector="provisionButtonClicked:" destination="ZH1-Yn-aSM" eventType="touchUpInside" id="2G8-uN-gDJ"/>
-                                    <action selector="provisionButtonClicked:" destination="Xh7-kO-DLD" eventType="touchUpInside" id="DfS-Tt-8OE"/>
-                                    <action selector="provisionButtonPressed:" destination="BYZ-38-t0r" eventType="touchUpInside" id="aFa-3M-c13"/>
-                                    <action selector="scanDevicesAgain:" destination="kVO-hL-V3g" eventType="touchUpInside" id="PWI-dD-AWz"/>
-                                </connections>
-                            </button>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="TiC-Nw-TBG">
-                                <rect key="frame" x="0.0" y="220.5" width="375" height="272.5"/>
+                                <rect key="frame" x="0.0" y="212.5" width="375" height="454.5"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="deviceListCell" rowHeight="60" id="dWO-dQ-qNz" customClass="DeviceListTableViewCell" customModule="EspressifProvision" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="28" width="375" height="60"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="deviceListCell" rowHeight="70" id="W4G-qU-CvS" customClass="BLEDeviceListViewCell" customModule="EspressifProvision" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="28" width="375" height="70"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="dWO-dQ-qNz" id="Pku-5d-ji6">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="59.5"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="W4G-qU-CvS" id="bLH-Oo-cP7">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sCS-lr-wK6">
-                                                    <rect key="frame" x="15" y="19.5" width="737" height="21"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bluetooth_icon" translatesAutoresizingMaskIntoConstraints="NO" id="svd-hr-NYX">
+                                                    <rect key="frame" x="16" y="17.5" width="35" height="35"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" secondItem="svd-hr-NYX" secondAttribute="height" multiplier="1:1" id="gq2-de-3YF"/>
+                                                        <constraint firstAttribute="width" constant="35" id="kKw-iF-DPO"/>
+                                                    </constraints>
+                                                </imageView>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VOf-uu-VAL">
+                                                    <rect key="frame" x="67" y="24.5" width="44" height="21"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
+                                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <constraints>
-                                                <constraint firstItem="sCS-lr-wK6" firstAttribute="centerY" secondItem="Pku-5d-ji6" secondAttribute="centerY" id="FZZ-ad-2oC"/>
-                                                <constraint firstAttribute="trailing" secondItem="sCS-lr-wK6" secondAttribute="trailing" constant="16" id="Kyn-EI-Q7S"/>
-                                                <constraint firstItem="sCS-lr-wK6" firstAttribute="leading" secondItem="Pku-5d-ji6" secondAttribute="leading" constant="15" id="cVN-B7-hnL"/>
+                                                <constraint firstItem="VOf-uu-VAL" firstAttribute="leading" secondItem="svd-hr-NYX" secondAttribute="trailing" constant="16" id="Ytg-XJ-TTh"/>
+                                                <constraint firstItem="VOf-uu-VAL" firstAttribute="centerY" secondItem="bLH-Oo-cP7" secondAttribute="centerY" id="Zde-gD-slB"/>
+                                                <constraint firstItem="svd-hr-NYX" firstAttribute="leading" secondItem="bLH-Oo-cP7" secondAttribute="leading" constant="16" id="ntF-63-tJa"/>
+                                                <constraint firstItem="svd-hr-NYX" firstAttribute="centerY" secondItem="bLH-Oo-cP7" secondAttribute="centerY" id="uqr-fa-WqU"/>
                                             </constraints>
                                         </tableViewCellContentView>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <connections>
-                                            <outlet property="deviceNameLabel" destination="sCS-lr-wK6" id="CkP-Ww-RTN"/>
+                                            <outlet property="deviceName" destination="VOf-uu-VAL" id="IcW-VG-GrS"/>
                                         </connections>
                                     </tableViewCell>
                                 </prototypes>
@@ -431,21 +575,30 @@
                                     <outlet property="delegate" destination="kVO-hL-V3g" id="dYb-z0-Ts6"/>
                                 </connections>
                             </tableView>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="p8H-L6-Wvm">
+                                <rect key="frame" x="330" y="168.5" width="25" height="25"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="25" id="cPP-oN-sXe"/>
+                                    <constraint firstAttribute="height" constant="25" id="r2n-ri-djV"/>
+                                </constraints>
+                                <state key="normal" image="refresh_icon"/>
+                                <connections>
+                                    <action selector="scanDevicesAgain:" destination="kVO-hL-V3g" eventType="touchUpInside" id="rdN-MZ-lGX"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="qG7-xi-xSA" firstAttribute="top" secondItem="Zte-Ow-vZc" secondAttribute="bottom" constant="10" id="EqY-Mq-LYC"/>
-                            <constraint firstItem="ddI-E6-VYU" firstAttribute="top" secondItem="TiC-Nw-TBG" secondAttribute="bottom" constant="24" id="Fer-zS-tTQ"/>
                             <constraint firstItem="Zte-Ow-vZc" firstAttribute="centerX" secondItem="6MV-fn-uWe" secondAttribute="centerX" id="Kon-xK-GSC"/>
                             <constraint firstItem="fyJ-g5-ERw" firstAttribute="trailing" secondItem="Zte-Ow-vZc" secondAttribute="trailing" constant="16" id="O38-i3-gLF"/>
-                            <constraint firstItem="ddI-E6-VYU" firstAttribute="width" secondItem="6MV-fn-uWe" secondAttribute="width" multiplier="0.7" id="UhQ-fV-bbI"/>
+                            <constraint firstItem="p8H-L6-Wvm" firstAttribute="centerY" secondItem="qG7-xi-xSA" secondAttribute="centerY" id="W8U-W9-owE"/>
+                            <constraint firstItem="fyJ-g5-ERw" firstAttribute="trailing" secondItem="p8H-L6-Wvm" secondAttribute="trailing" constant="20" id="XWx-XP-QXN"/>
                             <constraint firstItem="TiC-Nw-TBG" firstAttribute="leading" secondItem="fyJ-g5-ERw" secondAttribute="leading" id="c7Q-mI-Iq7"/>
-                            <constraint firstItem="ddI-E6-VYU" firstAttribute="centerX" secondItem="6MV-fn-uWe" secondAttribute="centerX" id="i6f-IX-eEZ"/>
+                            <constraint firstItem="fyJ-g5-ERw" firstAttribute="bottom" secondItem="TiC-Nw-TBG" secondAttribute="bottom" id="ep1-Fq-oRN"/>
                             <constraint firstItem="qG7-xi-xSA" firstAttribute="leading" secondItem="fyJ-g5-ERw" secondAttribute="leading" constant="16" id="jEc-4j-ojN"/>
-                            <constraint firstItem="fyJ-g5-ERw" firstAttribute="trailing" secondItem="qG7-xi-xSA" secondAttribute="trailing" constant="50" id="lHw-bj-V7r"/>
-                            <constraint firstItem="TiC-Nw-TBG" firstAttribute="top" secondItem="qG7-xi-xSA" secondAttribute="bottom" constant="10" id="t7K-29-JDD"/>
+                            <constraint firstItem="TiC-Nw-TBG" firstAttribute="top" secondItem="qG7-xi-xSA" secondAttribute="bottom" constant="20" id="t7K-29-JDD"/>
                             <constraint firstItem="TiC-Nw-TBG" firstAttribute="trailing" secondItem="fyJ-g5-ERw" secondAttribute="trailing" id="ucr-gQ-puf"/>
-                            <constraint firstItem="fyJ-g5-ERw" firstAttribute="bottom" secondItem="ddI-E6-VYU" secondAttribute="bottom" constant="100" id="usO-qd-aUg"/>
                             <constraint firstItem="Zte-Ow-vZc" firstAttribute="top" secondItem="fyJ-g5-ERw" secondAttribute="top" constant="20" id="y9t-Gx-H41"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="fyJ-g5-ERw"/>
@@ -458,6 +611,655 @@
             </objects>
             <point key="canvasLocation" x="2509.5999999999999" y="-696.7016491754124"/>
         </scene>
+        <!--Device Setting View Controller-->
+        <scene sceneID="5Tm-ka-WIw">
+            <objects>
+                <viewController storyboardIdentifier="deviceSettingVC" id="LbZ-B5-z64" customClass="DeviceSettingViewController" customModule="EspressifProvision" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Pyh-fb-IbN">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4W4-DT-07r">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Device Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WEh-Wx-c02">
+                                        <rect key="frame" x="16" y="24.5" width="113" height="21"/>
+                                        <fontDescription key="fontDescription" name="Verdana" family="Verdana" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ma8-ws-GBR">
+                                        <rect key="frame" x="10" y="69" width="355" height="1"/>
+                                        <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="1" id="5Lo-Di-PSf"/>
+                                        </constraints>
+                                    </view>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TVV-eX-FYa">
+                                        <rect key="frame" x="280" y="25" width="42" height="20.5"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lek-lr-Kmo">
+                                        <rect key="frame" x="337" y="25" width="22" height="20"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="20" id="fiT-qo-dst"/>
+                                            <constraint firstAttribute="width" constant="22" id="ulp-Fh-kjR"/>
+                                        </constraints>
+                                        <state key="normal" image="right_arrow"/>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UUm-p3-Sdg">
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="69"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <connections>
+                                            <action selector="setDeviceName:" destination="LbZ-B5-z64" eventType="touchUpInside" id="ZWx-A7-KTA"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstItem="WEh-Wx-c02" firstAttribute="centerY" secondItem="4W4-DT-07r" secondAttribute="centerY" id="3RU-J1-ha3"/>
+                                    <constraint firstAttribute="trailing" secondItem="lek-lr-Kmo" secondAttribute="trailing" constant="16" id="6bA-ch-LPJ"/>
+                                    <constraint firstItem="Ma8-ws-GBR" firstAttribute="leading" secondItem="4W4-DT-07r" secondAttribute="leading" constant="10" id="7FM-6B-G6X"/>
+                                    <constraint firstItem="lek-lr-Kmo" firstAttribute="leading" secondItem="TVV-eX-FYa" secondAttribute="trailing" constant="15" id="Dh9-md-MRc"/>
+                                    <constraint firstAttribute="trailing" secondItem="UUm-p3-Sdg" secondAttribute="trailing" id="GwW-kF-t8T"/>
+                                    <constraint firstItem="WEh-Wx-c02" firstAttribute="leading" secondItem="4W4-DT-07r" secondAttribute="leading" constant="16" id="Ie6-zl-p6I"/>
+                                    <constraint firstItem="UUm-p3-Sdg" firstAttribute="top" secondItem="4W4-DT-07r" secondAttribute="top" id="Lwg-He-Ov0"/>
+                                    <constraint firstItem="Ma8-ws-GBR" firstAttribute="top" secondItem="UUm-p3-Sdg" secondAttribute="bottom" id="Sev-oh-paS"/>
+                                    <constraint firstAttribute="trailing" secondItem="Ma8-ws-GBR" secondAttribute="trailing" constant="10" id="Vbt-1D-sv6"/>
+                                    <constraint firstItem="TVV-eX-FYa" firstAttribute="centerY" secondItem="4W4-DT-07r" secondAttribute="centerY" id="bSG-pS-UCz"/>
+                                    <constraint firstAttribute="bottom" secondItem="Ma8-ws-GBR" secondAttribute="bottom" id="gzm-zW-h4Y"/>
+                                    <constraint firstItem="UUm-p3-Sdg" firstAttribute="leading" secondItem="4W4-DT-07r" secondAttribute="leading" id="lAH-wh-sgc"/>
+                                    <constraint firstItem="lek-lr-Kmo" firstAttribute="centerY" secondItem="4W4-DT-07r" secondAttribute="centerY" id="trU-qm-tNI"/>
+                                    <constraint firstAttribute="height" constant="70" id="wvP-Mx-DEz"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fv8-0Y-BZD">
+                                <rect key="frame" x="0.0" y="70" width="375" height="70"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Volume :" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aa4-Yj-eyX">
+                                        <rect key="frame" x="16" y="8" width="77" height="21"/>
+                                        <fontDescription key="fontDescription" name="Verdana" family="Verdana" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4oD-SV-EO5">
+                                        <rect key="frame" x="10" y="69" width="355" height="1"/>
+                                        <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="1" id="eDw-wv-H5D"/>
+                                        </constraints>
+                                    </view>
+                                    <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="50" minValue="0.0" maxValue="100" continuous="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wzn-MS-VCI">
+                                        <rect key="frame" x="20" y="35" width="335" height="31"/>
+                                        <color key="minimumTrackTintColor" systemColor="linkColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="thumbTintColor" systemColor="opaqueSeparatorColor" red="0.77647058820000003" green="0.77647058820000003" blue="0.7843137255" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <connections>
+                                            <action selector="setDeviceVolume:" destination="LbZ-B5-z64" eventType="valueChanged" id="WRd-VQ-enj"/>
+                                        </connections>
+                                    </slider>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b9k-L6-BQB">
+                                        <rect key="frame" x="101" y="8" width="10.5" height="21"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstItem="b9k-L6-BQB" firstAttribute="leading" secondItem="aa4-Yj-eyX" secondAttribute="trailing" constant="8" id="CmQ-9K-TgU"/>
+                                    <constraint firstItem="b9k-L6-BQB" firstAttribute="centerY" secondItem="aa4-Yj-eyX" secondAttribute="centerY" id="D7c-Vb-QOg"/>
+                                    <constraint firstAttribute="height" constant="70" id="UOt-IC-v67"/>
+                                    <constraint firstAttribute="trailing" secondItem="4oD-SV-EO5" secondAttribute="trailing" constant="10" id="UvA-1K-eN9"/>
+                                    <constraint firstItem="aa4-Yj-eyX" firstAttribute="top" secondItem="fv8-0Y-BZD" secondAttribute="top" constant="8" id="W23-u7-Aal"/>
+                                    <constraint firstItem="4oD-SV-EO5" firstAttribute="leading" secondItem="fv8-0Y-BZD" secondAttribute="leading" constant="10" id="WOW-u9-5yW"/>
+                                    <constraint firstItem="wzn-MS-VCI" firstAttribute="leading" secondItem="fv8-0Y-BZD" secondAttribute="leading" constant="22" id="a4N-9Q-J5V"/>
+                                    <constraint firstAttribute="trailing" secondItem="wzn-MS-VCI" secondAttribute="trailing" constant="22" id="cMP-aD-AYn"/>
+                                    <constraint firstItem="4oD-SV-EO5" firstAttribute="top" secondItem="wzn-MS-VCI" secondAttribute="bottom" constant="4" id="mNK-4U-NHf"/>
+                                    <constraint firstItem="aa4-Yj-eyX" firstAttribute="leading" secondItem="fv8-0Y-BZD" secondAttribute="leading" constant="16" id="ufo-NY-ZmN"/>
+                                    <constraint firstAttribute="bottom" secondItem="4oD-SV-EO5" secondAttribute="bottom" id="znU-pp-VGd"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hfx-Q4-31B">
+                                <rect key="frame" x="0.0" y="140" width="375" height="70"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sound" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LvN-fb-b9Y">
+                                        <rect key="frame" x="16" y="24.5" width="54.5" height="21"/>
+                                        <fontDescription key="fontDescription" name="Verdana" family="Verdana" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tIf-2R-qcY">
+                                        <rect key="frame" x="10" y="69" width="355" height="1"/>
+                                        <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="1" id="cmn-xO-TuB"/>
+                                        </constraints>
+                                    </view>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CAD-IQ-uDd">
+                                        <rect key="frame" x="337" y="25" width="22" height="20"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="20" id="Zfv-5g-Pkg"/>
+                                            <constraint firstAttribute="width" constant="22" id="sm8-dA-YOn"/>
+                                        </constraints>
+                                        <state key="normal" image="right_arrow"/>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kSw-3b-g46">
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <connections>
+                                            <action selector="setSoundClicked:" destination="LbZ-B5-z64" eventType="touchUpInside" id="VQY-Jt-e9V"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstItem="tIf-2R-qcY" firstAttribute="leading" secondItem="hfx-Q4-31B" secondAttribute="leading" constant="10" id="0kz-qJ-bP9"/>
+                                    <constraint firstAttribute="trailing" secondItem="kSw-3b-g46" secondAttribute="trailing" id="4M5-OK-drT"/>
+                                    <constraint firstItem="LvN-fb-b9Y" firstAttribute="centerY" secondItem="hfx-Q4-31B" secondAttribute="centerY" id="4yu-s9-Def"/>
+                                    <constraint firstAttribute="trailing" secondItem="CAD-IQ-uDd" secondAttribute="trailing" constant="16" id="5Ka-Ol-2vv"/>
+                                    <constraint firstItem="CAD-IQ-uDd" firstAttribute="centerY" secondItem="hfx-Q4-31B" secondAttribute="centerY" id="9R8-9M-mmJ"/>
+                                    <constraint firstAttribute="bottom" secondItem="tIf-2R-qcY" secondAttribute="bottom" id="AkR-uc-RlD"/>
+                                    <constraint firstAttribute="bottom" secondItem="kSw-3b-g46" secondAttribute="bottom" id="VkW-6X-o3T"/>
+                                    <constraint firstItem="LvN-fb-b9Y" firstAttribute="leading" secondItem="hfx-Q4-31B" secondAttribute="leading" constant="16" id="asX-KV-TG2"/>
+                                    <constraint firstItem="kSw-3b-g46" firstAttribute="top" secondItem="hfx-Q4-31B" secondAttribute="top" id="d7j-da-xT3"/>
+                                    <constraint firstItem="kSw-3b-g46" firstAttribute="leading" secondItem="hfx-Q4-31B" secondAttribute="leading" id="eb3-A4-6Ua"/>
+                                    <constraint firstAttribute="height" constant="70" id="l4h-2R-ckT"/>
+                                    <constraint firstAttribute="trailing" secondItem="tIf-2R-qcY" secondAttribute="trailing" constant="10" id="lr1-uG-56R"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vvh-GU-RM7">
+                                <rect key="frame" x="0.0" y="210" width="375" height="70"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Language" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1Tg-Z9-dsm">
+                                        <rect key="frame" x="16" y="24.5" width="83" height="21"/>
+                                        <fontDescription key="fontDescription" name="Verdana" family="Verdana" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lcU-cP-hfT">
+                                        <rect key="frame" x="10" y="69" width="355" height="1"/>
+                                        <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="1" id="Kb8-9O-BTn"/>
+                                        </constraints>
+                                    </view>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9aY-sa-MQ1">
+                                        <rect key="frame" x="285" y="24.5" width="42" height="21"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="p7F-FH-rtr">
+                                        <rect key="frame" x="337" y="25" width="22" height="20"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="22" id="NN4-zX-Hzr"/>
+                                            <constraint firstAttribute="height" constant="20" id="dam-Fs-5s5"/>
+                                        </constraints>
+                                        <state key="normal" image="right_arrow"/>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Iy4-dO-L3D">
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <connections>
+                                            <action selector="setLanguageClicked:" destination="LbZ-B5-z64" eventType="touchUpInside" id="Cw2-l8-3JU"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstItem="p7F-FH-rtr" firstAttribute="centerY" secondItem="vvh-GU-RM7" secondAttribute="centerY" id="5Ex-Gi-HPH"/>
+                                    <constraint firstItem="lcU-cP-hfT" firstAttribute="leading" secondItem="vvh-GU-RM7" secondAttribute="leading" constant="10" id="7LG-2Z-RgX"/>
+                                    <constraint firstItem="1Tg-Z9-dsm" firstAttribute="centerY" secondItem="vvh-GU-RM7" secondAttribute="centerY" id="9sY-ex-ouY"/>
+                                    <constraint firstAttribute="bottom" secondItem="Iy4-dO-L3D" secondAttribute="bottom" id="UBH-Ni-QmL"/>
+                                    <constraint firstAttribute="trailing" secondItem="p7F-FH-rtr" secondAttribute="trailing" constant="16" id="YcC-0e-NFT"/>
+                                    <constraint firstAttribute="trailing" secondItem="Iy4-dO-L3D" secondAttribute="trailing" id="ePj-xw-UVU"/>
+                                    <constraint firstItem="Iy4-dO-L3D" firstAttribute="top" secondItem="vvh-GU-RM7" secondAttribute="top" id="h3r-ob-SYc"/>
+                                    <constraint firstItem="1Tg-Z9-dsm" firstAttribute="leading" secondItem="vvh-GU-RM7" secondAttribute="leading" constant="16" id="hOa-bV-Ptb"/>
+                                    <constraint firstItem="p7F-FH-rtr" firstAttribute="leading" secondItem="9aY-sa-MQ1" secondAttribute="trailing" constant="10" id="i6S-Vb-HLe"/>
+                                    <constraint firstItem="9aY-sa-MQ1" firstAttribute="centerY" secondItem="vvh-GU-RM7" secondAttribute="centerY" id="iJh-BH-1tv"/>
+                                    <constraint firstAttribute="bottom" secondItem="lcU-cP-hfT" secondAttribute="bottom" id="izV-8I-rBF"/>
+                                    <constraint firstItem="Iy4-dO-L3D" firstAttribute="leading" secondItem="vvh-GU-RM7" secondAttribute="leading" id="p1G-ol-Akk"/>
+                                    <constraint firstAttribute="trailing" secondItem="lcU-cP-hfT" secondAttribute="trailing" constant="10" id="pxH-ai-4dZ"/>
+                                    <constraint firstAttribute="height" constant="70" id="zMm-s9-d3B"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JHD-QE-cFd">
+                                <rect key="frame" x="0.0" y="280" width="375" height="70"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="About" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vd9-vY-V8k">
+                                        <rect key="frame" x="16" y="24.5" width="50" height="21"/>
+                                        <fontDescription key="fontDescription" name="Verdana" family="Verdana" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qye-rT-C5e">
+                                        <rect key="frame" x="10" y="69" width="355" height="1"/>
+                                        <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="1" id="yHu-Jx-p9v"/>
+                                        </constraints>
+                                    </view>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eag-9c-gth">
+                                        <rect key="frame" x="337" y="25" width="22" height="20"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="20" id="NqY-aQ-Csq"/>
+                                            <constraint firstAttribute="width" constant="22" id="uTc-by-JGU"/>
+                                        </constraints>
+                                        <state key="normal" image="right_arrow"/>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ak8-Ns-pgn">
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <connections>
+                                            <action selector="aboutBtnClicked:" destination="LbZ-B5-z64" eventType="touchUpInside" id="m7Q-vi-e8u"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="bottom" secondItem="Ak8-Ns-pgn" secondAttribute="bottom" id="7fV-Ws-j9j"/>
+                                    <constraint firstItem="Ak8-Ns-pgn" firstAttribute="leading" secondItem="JHD-QE-cFd" secondAttribute="leading" id="Ffc-fB-HQy"/>
+                                    <constraint firstAttribute="bottom" secondItem="qye-rT-C5e" secondAttribute="bottom" id="G30-tj-JCa"/>
+                                    <constraint firstAttribute="trailing" secondItem="qye-rT-C5e" secondAttribute="trailing" constant="10" id="P8N-3q-hTe"/>
+                                    <constraint firstAttribute="trailing" secondItem="Ak8-Ns-pgn" secondAttribute="trailing" id="PSL-99-zdN"/>
+                                    <constraint firstAttribute="trailing" secondItem="eag-9c-gth" secondAttribute="trailing" constant="16" id="ThK-Sa-7ig"/>
+                                    <constraint firstItem="Vd9-vY-V8k" firstAttribute="leading" secondItem="JHD-QE-cFd" secondAttribute="leading" constant="16" id="XWG-AJ-wbr"/>
+                                    <constraint firstItem="Ak8-Ns-pgn" firstAttribute="top" secondItem="JHD-QE-cFd" secondAttribute="top" id="c0b-Ui-onm"/>
+                                    <constraint firstItem="eag-9c-gth" firstAttribute="centerY" secondItem="JHD-QE-cFd" secondAttribute="centerY" id="jiI-lJ-Hdp"/>
+                                    <constraint firstAttribute="height" constant="70" id="l3g-Zb-Br6"/>
+                                    <constraint firstItem="Vd9-vY-V8k" firstAttribute="centerY" secondItem="JHD-QE-cFd" secondAttribute="centerY" id="vIu-X0-oZV"/>
+                                    <constraint firstItem="qye-rT-C5e" firstAttribute="leading" secondItem="JHD-QE-cFd" secondAttribute="leading" constant="10" id="vPy-mX-Lav"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yrs-Tl-5nS">
+                                <rect key="frame" x="0.0" y="350" width="375" height="70"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Manage Account" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ehf-dh-UkV">
+                                        <rect key="frame" x="16" y="24.5" width="140.5" height="21"/>
+                                        <fontDescription key="fontDescription" name="Verdana" family="Verdana" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="La8-MW-JZK">
+                                        <rect key="frame" x="337" y="25" width="22" height="20"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="22" id="xO6-Bf-dO6"/>
+                                            <constraint firstAttribute="height" constant="20" id="zW2-3D-Izg"/>
+                                        </constraints>
+                                        <state key="normal" image="right_arrow"/>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="32y-QB-0OL">
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
+                                        <connections>
+                                            <action selector="manageAccountClicked:" destination="LbZ-B5-z64" eventType="touchUpInside" id="UaZ-9g-qR0"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="trailing" secondItem="32y-QB-0OL" secondAttribute="trailing" id="9rg-R3-z6M"/>
+                                    <constraint firstAttribute="height" constant="70" id="JeS-BE-ojl"/>
+                                    <constraint firstAttribute="trailing" secondItem="La8-MW-JZK" secondAttribute="trailing" constant="16" id="OMB-gF-5oP"/>
+                                    <constraint firstAttribute="bottom" secondItem="32y-QB-0OL" secondAttribute="bottom" id="T26-vq-rpu"/>
+                                    <constraint firstItem="Ehf-dh-UkV" firstAttribute="leading" secondItem="Yrs-Tl-5nS" secondAttribute="leading" constant="16" id="Wt9-Vi-RGV"/>
+                                    <constraint firstItem="32y-QB-0OL" firstAttribute="leading" secondItem="Yrs-Tl-5nS" secondAttribute="leading" id="bzk-oA-wew"/>
+                                    <constraint firstItem="32y-QB-0OL" firstAttribute="top" secondItem="Yrs-Tl-5nS" secondAttribute="top" id="cc9-wA-k56"/>
+                                    <constraint firstItem="La8-MW-JZK" firstAttribute="centerY" secondItem="Yrs-Tl-5nS" secondAttribute="centerY" id="qlr-S8-7a6"/>
+                                    <constraint firstItem="Ehf-dh-UkV" firstAttribute="centerY" secondItem="Yrs-Tl-5nS" secondAttribute="centerY" id="rxz-GO-bz2"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="Yrs-Tl-5nS" firstAttribute="leading" secondItem="CB0-wY-Oij" secondAttribute="leading" id="0Bi-cP-lJN"/>
+                            <constraint firstItem="4W4-DT-07r" firstAttribute="top" secondItem="CB0-wY-Oij" secondAttribute="top" id="5vD-A0-S6t"/>
+                            <constraint firstItem="Yrs-Tl-5nS" firstAttribute="trailing" secondItem="CB0-wY-Oij" secondAttribute="trailing" id="9BF-ub-z1q"/>
+                            <constraint firstItem="JHD-QE-cFd" firstAttribute="trailing" secondItem="CB0-wY-Oij" secondAttribute="trailing" id="Cgu-Ix-yJl"/>
+                            <constraint firstItem="fv8-0Y-BZD" firstAttribute="trailing" secondItem="CB0-wY-Oij" secondAttribute="trailing" id="GST-Og-RNs"/>
+                            <constraint firstItem="hfx-Q4-31B" firstAttribute="top" secondItem="fv8-0Y-BZD" secondAttribute="bottom" id="JMF-no-5QU"/>
+                            <constraint firstItem="vvh-GU-RM7" firstAttribute="leading" secondItem="CB0-wY-Oij" secondAttribute="leading" id="L3C-8u-2CR"/>
+                            <constraint firstItem="Yrs-Tl-5nS" firstAttribute="top" secondItem="JHD-QE-cFd" secondAttribute="bottom" id="NGh-lQ-KWR"/>
+                            <constraint firstItem="fv8-0Y-BZD" firstAttribute="top" secondItem="4W4-DT-07r" secondAttribute="bottom" id="Sxn-j9-hAm"/>
+                            <constraint firstItem="hfx-Q4-31B" firstAttribute="trailing" secondItem="CB0-wY-Oij" secondAttribute="trailing" id="Tqn-IF-qKw"/>
+                            <constraint firstItem="4W4-DT-07r" firstAttribute="trailing" secondItem="CB0-wY-Oij" secondAttribute="trailing" id="VqY-QF-lFc"/>
+                            <constraint firstItem="4W4-DT-07r" firstAttribute="leading" secondItem="CB0-wY-Oij" secondAttribute="leading" id="W0i-ek-Oh8"/>
+                            <constraint firstItem="fv8-0Y-BZD" firstAttribute="leading" secondItem="CB0-wY-Oij" secondAttribute="leading" id="bcP-ad-k9d"/>
+                            <constraint firstItem="JHD-QE-cFd" firstAttribute="top" secondItem="vvh-GU-RM7" secondAttribute="bottom" id="dUz-Tq-Vd1"/>
+                            <constraint firstItem="hfx-Q4-31B" firstAttribute="leading" secondItem="CB0-wY-Oij" secondAttribute="leading" id="jtb-g5-NLl"/>
+                            <constraint firstItem="vvh-GU-RM7" firstAttribute="top" secondItem="hfx-Q4-31B" secondAttribute="bottom" id="kjA-lp-MOU"/>
+                            <constraint firstItem="vvh-GU-RM7" firstAttribute="trailing" secondItem="CB0-wY-Oij" secondAttribute="trailing" id="ldA-gb-fy6"/>
+                            <constraint firstItem="JHD-QE-cFd" firstAttribute="leading" secondItem="CB0-wY-Oij" secondAttribute="leading" id="vGK-U2-gZa"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="CB0-wY-Oij"/>
+                    </view>
+                    <connections>
+                        <outlet property="deviceNameLabel" destination="TVV-eX-FYa" id="pPx-MO-PBz"/>
+                        <outlet property="languageLabel" destination="9aY-sa-MQ1" id="69o-vC-aZ4"/>
+                        <outlet property="volumeLabel" destination="b9k-L6-BQB" id="ab9-Qu-i3c"/>
+                        <outlet property="volumeSlider" destination="wzn-MS-VCI" id="iyt-sT-xO7"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="B7m-Ik-MD2" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3316" y="-696.7016491754124"/>
+        </scene>
+        <!--Language List Table View Controller-->
+        <scene sceneID="tzm-MU-y7C">
+            <objects>
+                <tableViewController storyboardIdentifier="languageListVC" id="rQl-lP-uLh" customClass="LanguageListTableViewController" customModule="EspressifProvision" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="QbT-OW-IqK">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <prototypes>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="languageListCell" id="T0A-ki-ayI">
+                                <rect key="frame" x="0.0" y="28" width="375" height="43.5"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="T0A-ki-ayI" id="iVk-lX-YY0">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                </tableViewCellContentView>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="rQl-lP-uLh" id="doy-a6-Ltk"/>
+                            <outlet property="delegate" destination="rQl-lP-uLh" id="55Q-9l-QBc"/>
+                        </connections>
+                    </tableView>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iso-M4-VIn" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4039" y="-785"/>
+        </scene>
+        <!--About View Controller-->
+        <scene sceneID="4uC-Cr-6Xs">
+            <objects>
+                <viewController storyboardIdentifier="aboutVC" id="zLQ-ma-I0K" customClass="AboutViewController" customModule="EspressifProvision" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="qVB-lu-Oux">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dby-Wy-aSj">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Device Name :" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MLk-K8-7RS">
+                                        <rect key="frame" x="16" y="16" width="126.5" height="21"/>
+                                        <fontDescription key="fontDescription" name="Verdana" family="Verdana" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="device" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yQB-i0-mGS">
+                                        <rect key="frame" x="16" y="45" width="50.5" height="21"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="70" id="2Wb-zO-Vh7"/>
+                                    <constraint firstItem="MLk-K8-7RS" firstAttribute="top" secondItem="Dby-Wy-aSj" secondAttribute="top" constant="16" id="Fyy-ZW-6Lo"/>
+                                    <constraint firstItem="yQB-i0-mGS" firstAttribute="top" secondItem="MLk-K8-7RS" secondAttribute="bottom" constant="8" id="JqH-sW-oxe"/>
+                                    <constraint firstItem="yQB-i0-mGS" firstAttribute="leading" secondItem="Dby-Wy-aSj" secondAttribute="leading" constant="16" id="rIU-UD-tv4"/>
+                                    <constraint firstItem="MLk-K8-7RS" firstAttribute="leading" secondItem="Dby-Wy-aSj" secondAttribute="leading" constant="16" id="vej-AA-vJI"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mgQ-So-SQA">
+                                <rect key="frame" x="0.0" y="70" width="375" height="70"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Connected Wi-Fi :" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pub-ab-luO">
+                                        <rect key="frame" x="16" y="16" width="153.5" height="21"/>
+                                        <fontDescription key="fontDescription" name="Verdana" family="Verdana" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="device" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qez-BF-D5Q">
+                                        <rect key="frame" x="16" y="45" width="50.5" height="21"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="70" id="NPz-ZB-7GI"/>
+                                    <constraint firstItem="Pub-ab-luO" firstAttribute="top" secondItem="mgQ-So-SQA" secondAttribute="top" constant="16" id="bUM-rp-9GV"/>
+                                    <constraint firstItem="Pub-ab-luO" firstAttribute="leading" secondItem="mgQ-So-SQA" secondAttribute="leading" constant="16" id="h3d-Gf-99a"/>
+                                    <constraint firstItem="Qez-BF-D5Q" firstAttribute="top" secondItem="Pub-ab-luO" secondAttribute="bottom" constant="8" id="m0a-cW-JXG"/>
+                                    <constraint firstItem="Qez-BF-D5Q" firstAttribute="leading" secondItem="mgQ-So-SQA" secondAttribute="leading" constant="16" id="m3V-5H-osU"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GZT-bL-EBH">
+                                <rect key="frame" x="0.0" y="140" width="375" height="70"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="IP Address :" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Kh-JX-5Sd">
+                                        <rect key="frame" x="16" y="16" width="105" height="21"/>
+                                        <fontDescription key="fontDescription" name="Verdana" family="Verdana" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="device" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zRX-uE-0el">
+                                        <rect key="frame" x="16" y="45" width="50.5" height="21"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstItem="7Kh-JX-5Sd" firstAttribute="leading" secondItem="GZT-bL-EBH" secondAttribute="leading" constant="16" id="OP8-Fy-FXO"/>
+                                    <constraint firstAttribute="height" constant="70" id="UgP-AS-Se8"/>
+                                    <constraint firstItem="7Kh-JX-5Sd" firstAttribute="top" secondItem="GZT-bL-EBH" secondAttribute="top" constant="16" id="X6i-Yf-pTj"/>
+                                    <constraint firstItem="zRX-uE-0el" firstAttribute="top" secondItem="7Kh-JX-5Sd" secondAttribute="bottom" constant="8" id="XD7-pG-lI1"/>
+                                    <constraint firstItem="zRX-uE-0el" firstAttribute="leading" secondItem="GZT-bL-EBH" secondAttribute="leading" constant="16" id="pAO-Hn-ZDO"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5qa-6J-VNh">
+                                <rect key="frame" x="0.0" y="210" width="375" height="70"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MAC :" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Xg-Jt-9be">
+                                        <rect key="frame" x="16" y="16" width="52" height="21"/>
+                                        <fontDescription key="fontDescription" name="Verdana" family="Verdana" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="device" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="96f-RR-HN2">
+                                        <rect key="frame" x="16" y="45" width="50.5" height="21"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstItem="6Xg-Jt-9be" firstAttribute="top" secondItem="5qa-6J-VNh" secondAttribute="top" constant="16" id="BMx-Kd-E5O"/>
+                                    <constraint firstItem="96f-RR-HN2" firstAttribute="top" secondItem="6Xg-Jt-9be" secondAttribute="bottom" constant="8" id="Qm9-qe-FG9"/>
+                                    <constraint firstAttribute="height" constant="70" id="ozB-V2-Qtz"/>
+                                    <constraint firstItem="6Xg-Jt-9be" firstAttribute="leading" secondItem="5qa-6J-VNh" secondAttribute="leading" constant="16" id="ueT-R5-Ibi"/>
+                                    <constraint firstItem="96f-RR-HN2" firstAttribute="leading" secondItem="5qa-6J-VNh" secondAttribute="leading" constant="16" id="vlE-f5-Dff"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0KQ-LR-oXT">
+                                <rect key="frame" x="0.0" y="280" width="375" height="70"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Serial Number :" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jSQ-uJ-NUC">
+                                        <rect key="frame" x="16" y="16" width="137" height="21"/>
+                                        <fontDescription key="fontDescription" name="Verdana" family="Verdana" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="device" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D7j-8P-mBZ">
+                                        <rect key="frame" x="16" y="45" width="50.5" height="21"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="70" id="9wK-SO-txm"/>
+                                    <constraint firstItem="D7j-8P-mBZ" firstAttribute="leading" secondItem="0KQ-LR-oXT" secondAttribute="leading" constant="16" id="BcL-DS-duZ"/>
+                                    <constraint firstItem="jSQ-uJ-NUC" firstAttribute="leading" secondItem="0KQ-LR-oXT" secondAttribute="leading" constant="16" id="JCi-AV-lHy"/>
+                                    <constraint firstItem="D7j-8P-mBZ" firstAttribute="top" secondItem="jSQ-uJ-NUC" secondAttribute="bottom" constant="8" id="WVQ-he-1QM"/>
+                                    <constraint firstItem="jSQ-uJ-NUC" firstAttribute="top" secondItem="0KQ-LR-oXT" secondAttribute="top" constant="16" id="mVb-RI-8zs"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JvM-X6-3YJ">
+                                <rect key="frame" x="0.0" y="350" width="375" height="70"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Firmware Version :" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="js6-3M-ItV">
+                                        <rect key="frame" x="16" y="16" width="162" height="21"/>
+                                        <fontDescription key="fontDescription" name="Verdana" family="Verdana" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="device" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2p9-Hn-rjf">
+                                        <rect key="frame" x="16" y="45" width="50.5" height="21"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstItem="2p9-Hn-rjf" firstAttribute="top" secondItem="js6-3M-ItV" secondAttribute="bottom" constant="8" id="HLu-ey-wTf"/>
+                                    <constraint firstAttribute="height" constant="70" id="KVc-ad-Gcz"/>
+                                    <constraint firstItem="2p9-Hn-rjf" firstAttribute="leading" secondItem="JvM-X6-3YJ" secondAttribute="leading" constant="16" id="LPN-c3-27W"/>
+                                    <constraint firstItem="js6-3M-ItV" firstAttribute="leading" secondItem="JvM-X6-3YJ" secondAttribute="leading" constant="16" id="LXF-S6-EDx"/>
+                                    <constraint firstItem="js6-3M-ItV" firstAttribute="top" secondItem="JvM-X6-3YJ" secondAttribute="top" constant="16" id="c8M-ea-qbI"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="GZT-bL-EBH" firstAttribute="leading" secondItem="0MY-Nn-j5Q" secondAttribute="leading" id="28h-9U-hxp"/>
+                            <constraint firstItem="JvM-X6-3YJ" firstAttribute="trailing" secondItem="0MY-Nn-j5Q" secondAttribute="trailing" id="2SN-Lj-qoS"/>
+                            <constraint firstItem="5qa-6J-VNh" firstAttribute="top" secondItem="GZT-bL-EBH" secondAttribute="bottom" id="6jo-6y-UmU"/>
+                            <constraint firstItem="mgQ-So-SQA" firstAttribute="top" secondItem="Dby-Wy-aSj" secondAttribute="bottom" id="7z4-EA-KBX"/>
+                            <constraint firstItem="0KQ-LR-oXT" firstAttribute="leading" secondItem="0MY-Nn-j5Q" secondAttribute="leading" id="8Yi-Oe-z8P"/>
+                            <constraint firstItem="GZT-bL-EBH" firstAttribute="top" secondItem="mgQ-So-SQA" secondAttribute="bottom" id="Arh-S4-iIZ"/>
+                            <constraint firstItem="5qa-6J-VNh" firstAttribute="trailing" secondItem="0MY-Nn-j5Q" secondAttribute="trailing" id="Ktr-hg-vau"/>
+                            <constraint firstAttribute="trailing" secondItem="mgQ-So-SQA" secondAttribute="trailing" id="MiV-c1-pkY"/>
+                            <constraint firstItem="5qa-6J-VNh" firstAttribute="leading" secondItem="0MY-Nn-j5Q" secondAttribute="leading" id="Nd7-2h-izw"/>
+                            <constraint firstItem="0KQ-LR-oXT" firstAttribute="top" secondItem="5qa-6J-VNh" secondAttribute="bottom" id="Ouw-Ys-NNm"/>
+                            <constraint firstItem="mgQ-So-SQA" firstAttribute="leading" secondItem="0MY-Nn-j5Q" secondAttribute="leading" id="Zso-bs-1iZ"/>
+                            <constraint firstItem="Dby-Wy-aSj" firstAttribute="trailing" secondItem="0MY-Nn-j5Q" secondAttribute="trailing" id="aum-tD-idX"/>
+                            <constraint firstItem="JvM-X6-3YJ" firstAttribute="leading" secondItem="0MY-Nn-j5Q" secondAttribute="leading" id="b5S-7P-eYm"/>
+                            <constraint firstItem="GZT-bL-EBH" firstAttribute="trailing" secondItem="0MY-Nn-j5Q" secondAttribute="trailing" id="gKp-nX-ft4"/>
+                            <constraint firstItem="0KQ-LR-oXT" firstAttribute="trailing" secondItem="0MY-Nn-j5Q" secondAttribute="trailing" id="krc-GG-lix"/>
+                            <constraint firstItem="Dby-Wy-aSj" firstAttribute="leading" secondItem="0MY-Nn-j5Q" secondAttribute="leading" id="o7q-mq-d10"/>
+                            <constraint firstItem="Dby-Wy-aSj" firstAttribute="top" secondItem="0MY-Nn-j5Q" secondAttribute="top" id="sa6-w4-2Jh"/>
+                            <constraint firstItem="JvM-X6-3YJ" firstAttribute="top" secondItem="0KQ-LR-oXT" secondAttribute="bottom" id="vYp-Qt-4Ab"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="0MY-Nn-j5Q"/>
+                    </view>
+                    <connections>
+                        <outlet property="deviceNameLabel" destination="yQB-i0-mGS" id="AOX-LQ-yD4"/>
+                        <outlet property="firmwareVersionLabel" destination="2p9-Hn-rjf" id="1gv-yS-sdA"/>
+                        <outlet property="ipAddressLabel" destination="zRX-uE-0el" id="SBa-ue-WYC"/>
+                        <outlet property="macLabel" destination="96f-RR-HN2" id="mLK-Ol-omU"/>
+                        <outlet property="serialNumberLabel" destination="D7j-8P-mBZ" id="mcH-0j-dwP"/>
+                        <outlet property="wifiLabel" destination="Qez-BF-D5Q" id="vN3-zD-B3o"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="l13-7J-Ext" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4727" y="-707"/>
+        </scene>
+        <!--Sound Setting View Controller-->
+        <scene sceneID="quK-Zk-n5N">
+            <objects>
+                <viewController storyboardIdentifier="soundSettingVC" id="3tY-aG-7Tl" customClass="SoundSettingViewController" customModule="EspressifProvision" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="oFz-dX-ZC1">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gd7-qB-vpl">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Start of Request" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Oq2-y4-5Wb">
+                                        <rect key="frame" x="16" y="19" width="127" height="22"/>
+                                        <fontDescription key="fontDescription" name="Kailasa" family="Kailasa" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lRY-aB-SjQ">
+                                        <rect key="frame" x="10" y="59" width="355" height="1"/>
+                                        <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="1" id="qcQ-RS-gKa"/>
+                                        </constraints>
+                                    </view>
+                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iNp-rO-FDZ">
+                                        <rect key="frame" x="310" y="14.5" width="51" height="31"/>
+                                        <color key="onTintColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <connections>
+                                            <action selector="setDeviceStartTone:" destination="3tY-aG-7Tl" eventType="valueChanged" id="p2H-3T-LfR"/>
+                                        </connections>
+                                    </switch>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="bottom" secondItem="lRY-aB-SjQ" secondAttribute="bottom" id="LDR-sf-L59"/>
+                                    <constraint firstItem="Oq2-y4-5Wb" firstAttribute="leading" secondItem="gd7-qB-vpl" secondAttribute="leading" constant="16" id="Myb-rz-mRf"/>
+                                    <constraint firstItem="iNp-rO-FDZ" firstAttribute="centerY" secondItem="gd7-qB-vpl" secondAttribute="centerY" id="PSH-Lk-L8Y"/>
+                                    <constraint firstItem="Oq2-y4-5Wb" firstAttribute="centerY" secondItem="gd7-qB-vpl" secondAttribute="centerY" id="Qdl-Cx-gp2"/>
+                                    <constraint firstAttribute="height" constant="60" id="ReA-F9-VVK"/>
+                                    <constraint firstAttribute="trailing" secondItem="iNp-rO-FDZ" secondAttribute="trailing" constant="16" id="amN-9j-Bqw"/>
+                                    <constraint firstAttribute="trailing" secondItem="lRY-aB-SjQ" secondAttribute="trailing" constant="10" id="ckv-hZ-JcT"/>
+                                    <constraint firstItem="lRY-aB-SjQ" firstAttribute="leading" secondItem="gd7-qB-vpl" secondAttribute="leading" constant="10" id="onk-HD-bwG"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zbk-c6-EwS">
+                                <rect key="frame" x="0.0" y="60" width="375" height="60"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="End of Request" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vRd-Lm-v2B">
+                                        <rect key="frame" x="16" y="19" width="122" height="22"/>
+                                        <fontDescription key="fontDescription" name="Kailasa" family="Kailasa" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2M2-TE-M94">
+                                        <rect key="frame" x="310" y="14.5" width="51" height="31"/>
+                                        <color key="onTintColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <connections>
+                                            <action selector="setDeviceEndTone:" destination="3tY-aG-7Tl" eventType="valueChanged" id="9Sf-UL-DMk"/>
+                                        </connections>
+                                    </switch>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstItem="2M2-TE-M94" firstAttribute="centerY" secondItem="Zbk-c6-EwS" secondAttribute="centerY" id="3NL-Fw-8O0"/>
+                                    <constraint firstItem="vRd-Lm-v2B" firstAttribute="leading" secondItem="Zbk-c6-EwS" secondAttribute="leading" constant="16" id="B31-lG-zq1"/>
+                                    <constraint firstAttribute="trailing" secondItem="2M2-TE-M94" secondAttribute="trailing" constant="16" id="Ewp-hj-4sT"/>
+                                    <constraint firstItem="vRd-Lm-v2B" firstAttribute="centerY" secondItem="Zbk-c6-EwS" secondAttribute="centerY" id="KX1-HM-aSg"/>
+                                    <constraint firstAttribute="height" constant="60" id="VWQ-fh-lrn"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="gd7-qB-vpl" firstAttribute="leading" secondItem="MNT-b3-x05" secondAttribute="leading" id="EyN-ba-uPv"/>
+                            <constraint firstItem="Zbk-c6-EwS" firstAttribute="trailing" secondItem="MNT-b3-x05" secondAttribute="trailing" id="eS3-fY-DaQ"/>
+                            <constraint firstItem="gd7-qB-vpl" firstAttribute="top" secondItem="MNT-b3-x05" secondAttribute="top" id="ewa-jk-JzN"/>
+                            <constraint firstItem="Zbk-c6-EwS" firstAttribute="top" secondItem="gd7-qB-vpl" secondAttribute="bottom" id="fms-qD-KfL"/>
+                            <constraint firstItem="gd7-qB-vpl" firstAttribute="trailing" secondItem="MNT-b3-x05" secondAttribute="trailing" id="hc3-5r-WXT"/>
+                            <constraint firstItem="Zbk-c6-EwS" firstAttribute="leading" secondItem="MNT-b3-x05" secondAttribute="leading" id="hmi-w0-iOv"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="MNT-b3-x05"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="KNi-XW-YLc"/>
+                    <connections>
+                        <outlet property="endOfRequestSwitch" destination="2M2-TE-M94" id="vFj-3D-sRU"/>
+                        <outlet property="startOfRequestSwitch" destination="iNp-rO-FDZ" id="6DK-PS-n61"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="s7B-em-llf" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="5873" y="-707"/>
+        </scene>
         <!--Device Detail View Controller-->
         <scene sceneID="YV9-Nr-g7u">
             <objects>
@@ -467,23 +1269,23 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="alexa_logo" translatesAutoresizingMaskIntoConstraints="NO" id="hBl-4l-hMI">
-                                <rect key="frame" x="62" y="40" width="251" height="188.5"/>
+                                <rect key="frame" x="62" y="20" width="251" height="188.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="hBl-4l-hMI" secondAttribute="height" multiplier="4:3" id="Ofe-WK-F0R"/>
                                 </constraints>
                             </imageView>
                             <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Vr9-Xd-du9">
-                                <rect key="frame" x="0.0" y="228.5" width="375" height="438.5"/>
+                                <rect key="frame" x="0.0" y="208.5" width="375" height="458.5"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JEu-YH-d0n">
-                                        <rect key="frame" x="16" y="367.5" width="343" height="1"/>
+                                        <rect key="frame" x="16" y="387.5" width="343" height="1"/>
                                         <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="1" id="0ms-hH-LIh"/>
                                         </constraints>
                                     </view>
                                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="W4Y-fK-DbZ">
-                                        <rect key="frame" x="20" y="75" width="335" height="279"/>
+                                        <rect key="frame" x="20" y="75" width="335" height="299"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <string key="text">Alexa, what's the weather today? 
 
@@ -491,7 +1293,7 @@ Alexa, play my Flash Briefing.
 
 Alexa, set a timer for 20 minutes.
 
-Alexa, add Dinner with Mom to my calendar.
+Alexa, add "Dinner with Mom" to my calendar.
 
 Alexa, set an alarm for 6 a.m.</string>
                                         <fontDescription key="fontDescription" name="Bookerly-Italic" family="Bookerly" pointSize="18"/>
@@ -500,7 +1302,7 @@ Alexa, set an alarm for 6 a.m.</string>
                                             <fontDescription key="fontDescription" name="Bookerly-Italic" family="Bookerly" pointSize="28"/>
                                         </variation>
                                     </textView>
-                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" text="Here are some of tha many things you can ask Alexa" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="PXZ-oC-hAg">
+                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" text="Here are some of the many things you can ask Alexa." textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="PXZ-oC-hAg">
                                         <rect key="frame" x="20" y="0.0" width="335" height="65"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
@@ -513,7 +1315,7 @@ Alexa, set an alarm for 6 a.m.</string>
                                         </variation>
                                     </textView>
                                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="To learn more and access additional features, download the Alexa app." textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="mJM-Um-0Xs">
-                                        <rect key="frame" x="14" y="376" width="347" height="55"/>
+                                        <rect key="frame" x="14" y="396" width="347" height="55"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                         <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -541,7 +1343,7 @@ Alexa, set an alarm for 6 a.m.</string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5T3-Xm-ReH">
-                                <rect key="frame" x="0.0" y="228.5" width="375" height="438.5"/>
+                                <rect key="frame" x="0.0" y="208.5" width="375" height="458.5"/>
                                 <subviews>
                                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="W0k-vU-cjz">
                                         <rect key="frame" x="20" y="2" width="335" height="102"/>
@@ -551,6 +1353,7 @@ Alexa, set an alarm for 6 a.m.</string>
                                         </constraints>
                                         <string key="text">Your device includes access to Alexa.
 Connect your Amazon account to access personalized features.</string>
+                                        <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <fontDescription key="fontDescription" name="AmazonEmberDisplay-Light" family="Amazon Ember Display" pointSize="20"/>
                                         <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                         <variation key="heightClass=regular-widthClass=regular">
@@ -558,11 +1361,12 @@ Connect your Amazon account to access personalized features.</string>
                                         </variation>
                                     </textView>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kao-I3-Wri">
-                                        <rect key="frame" x="94" y="288.5" width="187.5" height="50"/>
+                                        <rect key="frame" x="94" y="308.5" width="187.5" height="50"/>
                                         <color key="backgroundColor" red="0.0" green="0.60392156862745094" blue="0.76470588235294112" alpha="1" colorSpace="calibratedRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="50" id="Tog-zg-cGX"/>
                                         </constraints>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <state key="normal" title="Sign in with Amazon">
                                             <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         </state>
@@ -576,10 +1380,11 @@ Connect your Amazon account to access personalized features.</string>
                                         </connections>
                                     </button>
                                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Imy-ld-1d2">
-                                        <rect key="frame" x="20" y="114" width="335" height="149.5"/>
+                                        <rect key="frame" x="20" y="114" width="335" height="169.5"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <string key="text">Alexa allows you to use voice to play music and get news, sports, scores, weather and more-all hands-free.
+                                        <string key="text">Alexa allows you to use your voice to play music and get news, sports, scores, weather and more.
 All you have to do is ask Alexa.</string>
+                                        <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <fontDescription key="fontDescription" name="AmazonEmberDisplay-Light" family="Amazon Ember Display" pointSize="18"/>
                                         <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                         <variation key="heightClass=regular-widthClass=regular">
@@ -619,13 +1424,14 @@ All you have to do is ask Alexa.</string>
                         <viewLayoutGuide key="safeArea" id="0iD-Gg-96z"/>
                     </view>
                     <connections>
+                        <outlet property="learnMoreTextView" destination="mJM-Um-0Xs" id="aaQ-KO-lU0"/>
                         <outlet property="signedInViewContainer" destination="Vr9-Xd-du9" id="fVO-kU-gMA"/>
                         <outlet property="signedOutViewContainer" destination="5T3-Xm-ReH" id="jPz-O4-G3A"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="ZGd-3I-tUr" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="3277.5999999999999" y="-697.60119940029995"/>
+            <point key="canvasLocation" x="6796" y="-724"/>
         </scene>
         <!--Espressif-->
         <scene sceneID="vP2-nv-Q6V">
@@ -633,13 +1439,13 @@ All you have to do is ask Alexa.</string>
                 <navigationController title="Espressif" automaticallyAdjustsScrollViewInsets="NO" id="mgC-Sj-4EB" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="e8O-Ax-H59">
-                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <color key="barTintColor" red="1" green="0.14913141730000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <textAttributes key="titleTextAttributes">
-                            <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                            <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="19"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         </textAttributes>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -660,39 +1466,51 @@ All you have to do is ask Alexa.</string>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="6" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zVb-pI-L7n">
-                                <rect key="frame" x="16" y="52" width="343" height="119.5"/>
-                                <string key="text">To provision your new device, please make sure that your Phone's Bluetooth is turned on and within range of your new device. 
+                                <rect key="frame" x="16" y="32" width="343" height="119.5"/>
+                                <string key="text">To add your new device, please make sure that your phone's Bluetooth is turned on and within range of your new device.
 </string>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <color key="textColor" red="0.61960784310000006" green="0.61960784310000006" blue="0.61960784310000006" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GxQ-uD-I9c">
-                                <rect key="frame" x="56.5" y="517" width="262.5" height="50"/>
-                                <color key="backgroundColor" red="1" green="0.14913141730000001" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="50" id="t9Z-2U-PUH"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <state key="normal" title="Scan again">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
-                                <connections>
-                                    <action selector="rescanBLEDevices:" destination="0bL-h6-MMK" eventType="touchUpInside" id="dhg-XV-iXh"/>
-                                </connections>
-                            </button>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="1Dr-eB-Vxt">
-                                <rect key="frame" x="0.0" y="224.5" width="375" height="200"/>
+                                <rect key="frame" x="0.0" y="210.5" width="375" height="456.5"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="sectionIndexBackgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="bleDeviceCell" id="314-9Q-MBF">
-                                        <rect key="frame" x="0.0" y="28" width="375" height="44"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="bleDeviceCell" rowHeight="70" id="uKN-SD-nId" customClass="BLEDeviceListViewCell" customModule="EspressifProvision" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="28" width="375" height="70"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="314-9Q-MBF" id="NdT-28-atk">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="uKN-SD-nId" id="tED-6B-0WJ">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
                                             <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bluetooth_icon" translatesAutoresizingMaskIntoConstraints="NO" id="fAo-9A-GsW">
+                                                    <rect key="frame" x="16" y="17.5" width="35" height="35"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="35" id="0F2-bJ-ikN"/>
+                                                        <constraint firstAttribute="width" secondItem="fAo-9A-GsW" secondAttribute="height" multiplier="1:1" id="jOs-lu-sjr"/>
+                                                    </constraints>
+                                                </imageView>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3ab-iZ-mrv">
+                                                    <rect key="frame" x="67" y="24.5" width="44" height="21"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                            <constraints>
+                                                <constraint firstItem="fAo-9A-GsW" firstAttribute="centerY" secondItem="tED-6B-0WJ" secondAttribute="centerY" id="GKz-xI-bc6"/>
+                                                <constraint firstItem="3ab-iZ-mrv" firstAttribute="leading" secondItem="fAo-9A-GsW" secondAttribute="trailing" constant="16" id="YPw-ja-4jB"/>
+                                                <constraint firstItem="fAo-9A-GsW" firstAttribute="leading" secondItem="tED-6B-0WJ" secondAttribute="leading" constant="16" id="f4k-BU-RPg"/>
+                                                <constraint firstItem="3ab-iZ-mrv" firstAttribute="centerY" secondItem="tED-6B-0WJ" secondAttribute="centerY" id="ssh-Pb-1Bt"/>
+                                            </constraints>
                                         </tableViewCellContentView>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <connections>
+                                            <outlet property="deviceName" destination="3ab-iZ-mrv" id="bcD-FH-vgd"/>
+                                        </connections>
                                     </tableViewCell>
                                 </prototypes>
                                 <connections>
@@ -701,14 +1519,27 @@ All you have to do is ask Alexa.</string>
                                 </connections>
                             </tableView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Devices" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jtg-u5-obF">
-                                <rect key="frame" x="16" y="187.5" width="309" height="21"/>
+                                <rect key="frame" x="16" y="167.5" width="309" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.61960784310000006" green="0.61960784310000006" blue="0.61960784310000006" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="R6g-KG-DrB">
+                                <rect key="frame" x="330" y="165.5" width="25" height="25"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="25" id="Kpb-Ns-Wdl"/>
+                                    <constraint firstAttribute="height" constant="25" id="TN1-ui-mSJ"/>
+                                </constraints>
+                                <state key="normal" image="refresh_icon"/>
+                                <connections>
+                                    <action selector="rescanBLEDevices:" destination="0bL-h6-MMK" eventType="touchUpInside" id="vbU-K5-sV2"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
+                            <constraint firstItem="R6g-KG-DrB" firstAttribute="centerY" secondItem="Jtg-u5-obF" secondAttribute="centerY" id="2U1-1T-IIV"/>
+                            <constraint firstItem="MJ1-eV-cDT" firstAttribute="trailing" secondItem="R6g-KG-DrB" secondAttribute="trailing" constant="20" id="41G-se-laR"/>
                             <constraint firstItem="Jtg-u5-obF" firstAttribute="top" secondItem="zVb-pI-L7n" secondAttribute="bottom" constant="16" id="6UD-bG-HrR"/>
                             <constraint firstItem="zVb-pI-L7n" firstAttribute="top" secondItem="MJ1-eV-cDT" secondAttribute="top" constant="32" id="7os-zd-zYv"/>
                             <constraint firstItem="Jtg-u5-obF" firstAttribute="leading" secondItem="MJ1-eV-cDT" secondAttribute="leading" constant="16" id="9ul-tu-Je6"/>
@@ -716,12 +1547,9 @@ All you have to do is ask Alexa.</string>
                             <constraint firstItem="zVb-pI-L7n" firstAttribute="centerX" secondItem="MJ1-eV-cDT" secondAttribute="centerX" id="GvZ-bA-q4M"/>
                             <constraint firstItem="1Dr-eB-Vxt" firstAttribute="width" secondItem="7hw-fz-2D4" secondAttribute="width" id="QXt-4Y-QIm"/>
                             <constraint firstItem="MJ1-eV-cDT" firstAttribute="trailing" secondItem="Jtg-u5-obF" secondAttribute="trailing" constant="50" id="TH8-GE-UjX"/>
-                            <constraint firstItem="MJ1-eV-cDT" firstAttribute="bottom" secondItem="GxQ-uD-I9c" secondAttribute="bottom" constant="100" id="TJb-ac-oYW"/>
-                            <constraint firstItem="GxQ-uD-I9c" firstAttribute="width" secondItem="7hw-fz-2D4" secondAttribute="width" multiplier="0.7" id="a6w-Rv-B4Q"/>
-                            <constraint firstItem="GxQ-uD-I9c" firstAttribute="centerX" secondItem="MJ1-eV-cDT" secondAttribute="centerX" id="lZW-qX-YsJ"/>
+                            <constraint firstItem="MJ1-eV-cDT" firstAttribute="bottom" secondItem="1Dr-eB-Vxt" secondAttribute="bottom" id="iC9-hm-Cdy"/>
                             <constraint firstItem="1Dr-eB-Vxt" firstAttribute="centerX" secondItem="MJ1-eV-cDT" secondAttribute="centerX" id="mwj-C4-ejc"/>
-                            <constraint firstItem="1Dr-eB-Vxt" firstAttribute="top" secondItem="Jtg-u5-obF" secondAttribute="bottom" constant="16" id="nP7-CR-qYd"/>
-                            <constraint firstItem="1Dr-eB-Vxt" firstAttribute="height" secondItem="7hw-fz-2D4" secondAttribute="height" multiplier="0.3" id="xfp-R2-qbU"/>
+                            <constraint firstItem="1Dr-eB-Vxt" firstAttribute="top" secondItem="Jtg-u5-obF" secondAttribute="bottom" constant="22" id="nP7-CR-qYd"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="MJ1-eV-cDT"/>
                     </view>
@@ -732,14 +1560,123 @@ All you have to do is ask Alexa.</string>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="5Ev-W2-bX4" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="4119" y="-697"/>
+            <point key="canvasLocation" x="7388" y="-747"/>
+        </scene>
+        <!--Success View Controller-->
+        <scene sceneID="oaR-T7-gzf">
+            <objects>
+                <viewController storyboardIdentifier="successViewController" id="Bme-mi-jWq" customClass="SuccessViewController" customModule="EspressifProvision" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="ecx-aD-f9p">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="alexa_logo" translatesAutoresizingMaskIntoConstraints="NO" id="Jj7-WV-xmS">
+                                <rect key="frame" x="62" y="20" width="251" height="188.5"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" secondItem="Jj7-WV-xmS" secondAttribute="height" multiplier="4:3" id="tVF-z2-NRN"/>
+                                </constraints>
+                            </imageView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cKN-n0-Z4q">
+                                <rect key="frame" x="0.0" y="208.5" width="375" height="458.5"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vJk-U9-e9k">
+                                        <rect key="frame" x="16" y="387.5" width="343" height="1"/>
+                                        <color key="backgroundColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="1" id="NKa-Wq-d55"/>
+                                        </constraints>
+                                    </view>
+                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Xbi-2B-wq6">
+                                        <rect key="frame" x="20" y="75" width="335" height="299"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <string key="text">Alexa, what's the weather today? 
+
+Alexa, play my Flash Briefing.
+
+Alexa, set a timer for 20 minutes.
+
+Alexa, add "Dinner with Mom" to my calendar.
+
+Alexa, set an alarm for 6 a.m.</string>
+                                        <fontDescription key="fontDescription" name="Bookerly-Italic" family="Bookerly" pointSize="18"/>
+                                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                                        <variation key="heightClass=regular-widthClass=regular">
+                                            <fontDescription key="fontDescription" name="Bookerly-Italic" family="Bookerly" pointSize="28"/>
+                                        </variation>
+                                    </textView>
+                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" text="Here are some of the many things you can ask Alexa." textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="g50-Ns-Suf">
+                                        <rect key="frame" x="20" y="0.0" width="335" height="65"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="65" id="DPO-h7-QKd"/>
+                                        </constraints>
+                                        <fontDescription key="fontDescription" name="AmazonEmberDisplay-Light" family="Amazon Ember Display" pointSize="17"/>
+                                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                                        <variation key="heightClass=regular-widthClass=regular">
+                                            <fontDescription key="fontDescription" name="AmazonEmberDisplay-Light" family="Amazon Ember Display" pointSize="25"/>
+                                        </variation>
+                                    </textView>
+                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="To learn more and access additional features, download the Alexa app." textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="G18-s4-Hxc">
+                                        <rect key="frame" x="14" y="396" width="347" height="55"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                        <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                                        <variation key="heightClass=regular-widthClass=regular">
+                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        </variation>
+                                    </textView>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="bottom" secondItem="G18-s4-Hxc" secondAttribute="bottom" constant="7.5" id="0Qx-6E-EQb"/>
+                                    <constraint firstItem="g50-Ns-Suf" firstAttribute="top" secondItem="cKN-n0-Z4q" secondAttribute="top" id="7cM-1x-ubE"/>
+                                    <constraint firstItem="Xbi-2B-wq6" firstAttribute="top" secondItem="g50-Ns-Suf" secondAttribute="bottom" constant="10" id="Cqv-Hb-gGf"/>
+                                    <constraint firstItem="G18-s4-Hxc" firstAttribute="leading" secondItem="cKN-n0-Z4q" secondAttribute="leading" constant="14" id="F4G-BC-SO5"/>
+                                    <constraint firstAttribute="trailing" secondItem="g50-Ns-Suf" secondAttribute="trailing" constant="20" id="MUO-uk-7ab"/>
+                                    <constraint firstItem="vJk-U9-e9k" firstAttribute="top" secondItem="Xbi-2B-wq6" secondAttribute="bottom" constant="13.5" id="PBH-7Z-BkN"/>
+                                    <constraint firstItem="g50-Ns-Suf" firstAttribute="leading" secondItem="cKN-n0-Z4q" secondAttribute="leading" constant="20" id="PjG-91-ACX"/>
+                                    <constraint firstAttribute="trailing" secondItem="Xbi-2B-wq6" secondAttribute="trailing" constant="20" id="StZ-WA-3CC"/>
+                                    <constraint firstAttribute="bottom" secondItem="vJk-U9-e9k" secondAttribute="bottom" constant="70" id="Yeq-N9-QDX"/>
+                                    <constraint firstItem="G18-s4-Hxc" firstAttribute="top" secondItem="vJk-U9-e9k" secondAttribute="bottom" constant="7.5" id="ZX8-u0-ehT"/>
+                                    <constraint firstAttribute="trailing" secondItem="G18-s4-Hxc" secondAttribute="trailing" constant="14" id="a5Y-0z-y50"/>
+                                    <constraint firstItem="vJk-U9-e9k" firstAttribute="leading" secondItem="cKN-n0-Z4q" secondAttribute="leading" constant="16" id="aBy-oE-lYp"/>
+                                    <constraint firstAttribute="trailing" secondItem="vJk-U9-e9k" secondAttribute="trailing" constant="16" id="gWF-xE-wMk"/>
+                                    <constraint firstItem="Xbi-2B-wq6" firstAttribute="leading" secondItem="cKN-n0-Z4q" secondAttribute="leading" constant="20" id="iIy-0R-Mbc"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="cKN-n0-Z4q" firstAttribute="top" secondItem="Jj7-WV-xmS" secondAttribute="bottom" id="3hX-Hb-8rl"/>
+                            <constraint firstItem="cKN-n0-Z4q" firstAttribute="trailing" secondItem="84t-H9-Bra" secondAttribute="trailing" id="MWP-0i-Mui"/>
+                            <constraint firstItem="Jj7-WV-xmS" firstAttribute="top" secondItem="84t-H9-Bra" secondAttribute="top" constant="20" id="O7D-S5-YOL"/>
+                            <constraint firstItem="cKN-n0-Z4q" firstAttribute="bottom" secondItem="84t-H9-Bra" secondAttribute="bottom" id="VrI-ct-Duf"/>
+                            <constraint firstItem="cKN-n0-Z4q" firstAttribute="leading" secondItem="84t-H9-Bra" secondAttribute="leading" id="WqR-VS-NC5"/>
+                            <constraint firstItem="Jj7-WV-xmS" firstAttribute="centerX" secondItem="ecx-aD-f9p" secondAttribute="centerX" id="jDi-PD-ajd"/>
+                            <constraint firstItem="Jj7-WV-xmS" firstAttribute="width" secondItem="ecx-aD-f9p" secondAttribute="width" multiplier="0.67" id="jUB-Oy-We7"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="84t-H9-Bra"/>
+                    </view>
+                    <connections>
+                        <outlet property="learnMoreTextView" destination="G18-s4-Hxc" id="jur-AF-dVv"/>
+                        <segue destination="mgC-Sj-4EB" kind="presentation" identifier="presentFirstVC" modalPresentationStyle="fullScreen" id="oku-eL-FWZ"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Tp3-wf-dD2" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3328.8000000000002" y="26.53673163418291"/>
         </scene>
     </scenes>
     <resources>
         <image name="alexa_logo" width="360" height="170"/>
-        <image name="btnLWA_gold_209x48" width="209" height="48"/>
-        <image name="btnLWA_gold_209x48_pressed" width="209" height="48"/>
+        <image name="app_info_logo" width="320" height="90"/>
+        <image name="bluetooth_icon" width="128" height="128"/>
+        <image name="refresh_icon" width="128" height="128"/>
+        <image name="right_arrow" width="64" height="64"/>
         <image name="wifi_symbol" width="109" height="83"/>
         <image name="wifi_symbol_weak" width="128" height="128"/>
     </resources>
+    <inferredMetricsTieBreakers>
+        <segue reference="oku-eL-FWZ"/>
+    </inferredMetricsTieBreakers>
 </document>
diff --git a/EspressifProvision/EspressifProvision/Info.plist b/EspressifProvision/EspressifProvision/Info.plist
index ebfff1b..563efd8 100644
--- a/EspressifProvision/EspressifProvision/Info.plist
+++ b/EspressifProvision/EspressifProvision/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>APIKey</key>
-	<string>eyJhbGciOiJSU0EtU0hBMjU2IiwidmVyIjoiMSJ9.eyJ2ZXIiOiIzIiwiZW5kcG9pbnRzIjp7ImF1dGh6IjoiaHR0cHM6Ly93d3cuYW1hem9uLmNvbS9hcC9vYSIsInRva2VuRXhjaGFuZ2UiOiJodHRwczovL2FwaS5hbWF6b24uY29tL2F1dGgvbzIvdG9rZW4ifSwiY2xpZW50SWQiOiJhbXpuMS5hcHBsaWNhdGlvbi1vYTItY2xpZW50Ljk0NTA0YjhjZjQ0ZDQ2OTQ4YmJkNmMwYjdlNmViNTljIiwiYXBwRmFtaWx5SWQiOiJhbXpuMS5hcHBsaWNhdGlvbi45ZjA5NDkzYzQxNDI0YjczOGE0YWNmYThkNWVlN2Y3MCIsImJ1bmRsZVNlZWRJZCI6ImNvbS5lc3ByZXNzaWYuaW50cHJvdmJsZWF2cyIsImJ1bmRsZUlkIjoiY29tLmVzcHJlc3NpZi5pbnRwcm92YmxlYXZzIiwiaXNzIjoiQW1hem9uIiwidHlwZSI6IkFQSUtleSIsImFwcFZhcmlhbnRJZCI6ImFtem4xLmFwcGxpY2F0aW9uLWNsaWVudC41ZjRjZTE2MWU1MzQ0Zjk0OWU2YTVmMTA3Yzc5ZDhmNCIsInRydXN0UG9vbCI6bnVsbCwiYXBwSWQiOiJhbXpuMS5hcHBsaWNhdGlvbi1jbGllbnQuNWY0Y2UxNjFlNTM0NGY5NDllNmE1ZjEwN2M3OWQ4ZjQiLCJpZCI6IjA0MGEwNjkyLTc4ODUtMTFlOS1hM2EwLWRiYzNmZDYzMmEyZiIsImlhdCI6IjE1NTgwODQ4MzA1MjUifQ==.HiXv0UKO7zl7wZABuAkXrRhUAwa4f4nu5X2ThcDL/ZUqgRTZpWGyhwvmWKeLVYV81QcjLJaNU1lr3wWGYT9utEWvsDzMZm4eLHtnkg38n8QZZjaCPC8EO+3ExU3mU+Zs5RJHRq0we4lZypM5SCna0qKFZ5BX5D6iCgkn+l/bhHIvc8M3a3EWt6689BLVQNqQer8+wKYhG96/xXz5kH+7YMKcu0hgpp5JIeBSLcx1bOi+ymK3QWhCJPNKV1t98joBAVPI9Z1/0Qa0WW6WJ97yhRZTs7XFm8gyz6vlnUsrfBArLrfb+S2/Rz1U2eTQzzkSC9uF0LNKHGdtUYRQXKNtcw==</string>
+	<string>eyJhbGciOiJSU0EtU0hBMjU2IiwidmVyIjoiMSJ9.eyJ2ZXIiOiIzIiwiZW5kcG9pbnRzIjp7ImF1dGh6IjoiaHR0cHM6Ly93d3cuYW1hem9uLmNvbS9hcC9vYSIsInRva2VuRXhjaGFuZ2UiOiJodHRwczovL2FwaS5hbWF6b24uY29tL2F1dGgvbzIvdG9rZW4ifSwiY2xpZW50SWQiOiJhbXpuMS5hcHBsaWNhdGlvbi1vYTItY2xpZW50LmU4YzA2NTQ1ZDk3NjRhMDViOGI2ZDkxZWVjZmViMjNhIiwiYXBwRmFtaWx5SWQiOiJhbXpuMS5hcHBsaWNhdGlvbi4wNjMyOTliODRiMWM0NzAwYThhODRhNDcwNzc3MmQ0MCIsImJ1bmRsZVNlZWRJZCI6ImNvbS5lc3ByZXNzaWYucHJvdmJsZWF2cyIsImJ1bmRsZUlkIjoiY29tLmVzcHJlc3NpZi5wcm92YmxlYXZzIiwiaXNzIjoiQW1hem9uIiwidHlwZSI6IkFQSUtleSIsImFwcFZhcmlhbnRJZCI6ImFtem4xLmFwcGxpY2F0aW9uLWNsaWVudC4yM2ZiYTMzMWIzZDk0MDM5OTMyMmJiYzUwY2YyNzQ5NSIsInRydXN0UG9vbCI6bnVsbCwiYXBwSWQiOiJhbXpuMS5hcHBsaWNhdGlvbi1jbGllbnQuMjNmYmEzMzFiM2Q5NDAzOTkzMjJiYmM1MGNmMjc0OTUiLCJpZCI6IjJjNjc2ZDk1LTc4ODUtMTFlOS1hNjdiLWMzOGNmMjU3YTgwYSIsImlhdCI6IjE1NTgwODQ4OTgyMzMifQ==.UUg/wDgQHhGwbXIq9ev06zXeODbrdN1wv/hlvSTdN4s7zMLMnC4FJ17Ra1EmlK0FkD6QmoTKWlgBss/ne8WF7dUWgtsPG3KLaZv7MrQwx7skTXn05xdFENiWPPCvmCAWAvgW0lNp9QoxQzsIDS3KwD6k9KI4YhDQp5CtgxgZ/JfBVwsVyJ0XeBYpNnmQpphMU1U9zNh7Npzn66AMmJ0RCbsPL8mkP8na/7mGH5/HqDr+f605F1/tO2qo/WVZ/h0BEZO9y9Wwc4anEcFzbYeqyZU8jpR+Oyl4+tdDGZUB2lrj3L1d+uV4a3572ADNhqb7iOzWH4bSPmsFoDPbgouJRg==</string>
 	<key>BLEAVSConfigUUID</key>
 	<string>ff54</string>
 	<key>BLEConfigUUID</key>
@@ -19,7 +19,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Int-BLE-AVS-Prov</string>
+	<string>ESP Alexa</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -31,26 +31,32 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>CFBundleURLName</key>
-			<string>com.espressif.intprovbleavs</string>
+			<string>com.espressif.provbleavs</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>amzn-com.espressif.intprovbleavs</string>
+				<string>amzn-com.espressif.provbleavs</string>
 			</array>
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>CodeVerifier</key>
 	<string>abcd1234</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>alexa</string>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSBluetoothAlwaysUsageDescription</key>
+	<string>Connect with BLE Compatible devices for Provisioning</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>
 	<string>Connect with BLE Compatible devices for Provisioning</string>
 	<key>ProductId</key>
@@ -69,6 +75,8 @@
 	<array>
 		<string>armv7</string>
 	</array>
+	<key>UIRequiresFullScreen</key>
+	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
@@ -76,10 +84,9 @@
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIUserInterfaceStyle</key>
+	<string>Light</string>
 	<key>WifiBaseUrl</key>
 	<string>192.168.4.1:80</string>
 	<key>WifiNetworkNamePrefix</key>
diff --git a/EspressifProvision/EspressifProvision/Model/AlexaDevice.swift b/EspressifProvision/EspressifProvision/Model/AlexaDevice.swift
index 346ab05..9f27191 100644
--- a/EspressifProvision/EspressifProvision/Model/AlexaDevice.swift
+++ b/EspressifProvision/EspressifProvision/Model/AlexaDevice.swift
@@ -15,9 +15,17 @@ class AlexaDevice: NSObject {
     var softwareVersion: String?
     var friendlyname: String?
     var uuid: String?
+    var deviceName: String?
+    var connectedWifi: String?
+    var fwVersion: String?
+    var mac: String?
+    var serialNumber: String?
+    var startToneEnabled: Bool?
+    var endToneEnabled: Bool?
+    var volume: UInt32?
+    var language: Avs_Locale?
 
     init(hostAddr: String) {
         hostAddress = hostAddr
-        friendlyname = nil
     }
 }
diff --git a/EspressifProvision/EspressifProvision/Utilities/Constants.swift b/EspressifProvision/EspressifProvision/Utilities/Constants.swift
index 1ff7fbe..bbf98bf 100644
--- a/EspressifProvision/EspressifProvision/Utilities/Constants.swift
+++ b/EspressifProvision/EspressifProvision/Utilities/Constants.swift
@@ -11,13 +11,31 @@ import MBProgressHUD
 import UIKit
 
 struct Constants {
+    static let scanCharacteristic = "scan"
+    static let sessionCharacterstic = "session"
+    static let configCharacterstic = "config"
+    static let versionCharacterstic = "ver"
+    static let avsConfigCharacterstic = "avsconfig"
+    static let deviceInfoStoryboardID = "versionInfo"
+
+    // Device version info
+    static let provKey = "prov"
+    static let capabilitiesKey = "cap"
+    static let wifiScanCapability = "wifi_scan"
+    static let noProofCapability = "no_pop"
+
     static let friendlynameKey = "friendlyname"
     static let UUIDKey = "uuid"
 
     // Reuse identifier
     static let deviceListCellReuseIdentifier = "deviceListCell"
     static let deviceDetailVCIndentifier = "deviceDetailVC"
+    static let deviceSettingVCIndentifier = "deviceSettingVC"
+    static let soundSettingVCIdentifier = "soundSettingVC"
+    static let aboutVCIdentifier = "aboutVC"
+    static let languageListVCIdentifier = "languageListVC"
 
+    // Method to show loader on any view
     static func showLoader(message: String, view: UIView) {
         DispatchQueue.main.async {
             let loader = MBProgressHUD.showAdded(to: view, animated: true)
@@ -25,4 +43,11 @@ struct Constants {
             loader.label.text = message
         }
     }
+
+    // Method to hide loader from any view
+    static func hideLoader(view: UIView) {
+        DispatchQueue.main.async {
+            MBProgressHUD.hide(for: view, animated: true)
+        }
+    }
 }
diff --git a/EspressifProvision/EspressifProvision/Utilities/Utility.swift b/EspressifProvision/EspressifProvision/Utilities/Utility.swift
new file mode 100644
index 0000000..e71989c
--- /dev/null
+++ b/EspressifProvision/EspressifProvision/Utilities/Utility.swift
@@ -0,0 +1,55 @@
+//
+//  Utility.swift
+//  EspressifProvision
+//
+//  Created by Vikas Chandra on 18/10/19.
+//  Copyright © 2019 Espressif. All rights reserved.
+//
+
+import CoreBluetooth
+import Foundation
+
+class Utility {
+    static let deviceNamePrefix = Bundle.main.infoDictionary?["BLEDeviceNamePrefix"] as? String ?? "ESP-Alexa-"
+    static let allowPrefixFilter = Bundle.main.infoDictionary?["AllowFilteringByPrefix"] as? Bool ?? false
+    static let baseUrl = Bundle.main.infoDictionary?["WifiBaseUrl"] as? String ?? "192.168.4.1:80"
+
+    var deviceName = ""
+    var configPath = "prov-config"
+    var versionPath = "proto-ver"
+    var scanPath: String?
+    var sessionPath = "prov-session"
+    var avsConfigPath = "avsconfig"
+    var peripheralConfigured = false
+    var sessionCharacteristic: CBCharacteristic!
+    var configUUIDMap: [String: CBUUID] = [:]
+    var deviceVersionInfo: NSDictionary?
+
+    init() {
+        configUUIDMap[configPath] = CBUUID(string: "ff52")
+        configUUIDMap[sessionPath] = CBUUID(string: "ff51")
+    }
+
+    func processDescriptor(descriptor: CBDescriptor) {
+        if let value = descriptor.value as? String {
+            if value.contains(Constants.scanCharacteristic) {
+                scanPath = value
+                configUUIDMap.updateValue(descriptor.characteristic.uuid, forKey: scanPath!)
+            } else if value.contains(Constants.sessionCharacterstic) {
+                sessionPath = value
+                peripheralConfigured = true
+                sessionCharacteristic = descriptor.characteristic
+                configUUIDMap.updateValue(descriptor.characteristic.uuid, forKey: sessionPath)
+            } else if value.contains(Constants.configCharacterstic) {
+                configPath = value
+                configUUIDMap.updateValue(descriptor.characteristic.uuid, forKey: configPath)
+            } else if value.contains(Constants.versionCharacterstic) {
+                versionPath = value
+                configUUIDMap.updateValue(descriptor.characteristic.uuid, forKey: versionPath)
+            } else if value.contains(Constants.avsConfigCharacterstic) {
+                avsConfigPath = value
+                configUUIDMap.updateValue(descriptor.characteristic.uuid, forKey: avsConfigPath)
+            }
+        }
+    }
+}
diff --git a/EspressifProvision/EspressifProvision/ViewController.swift b/EspressifProvision/EspressifProvision/ViewController.swift
index 753e2bb..3673fcf 100644
--- a/EspressifProvision/EspressifProvision/ViewController.swift
+++ b/EspressifProvision/EspressifProvision/ViewController.swift
@@ -23,8 +23,6 @@ import UIKit
 class ViewController: UIViewController {
     // Provisioning
     private let pop = Bundle.main.infoDictionary?["ProofOfPossession"] as! String
-    private let ssid = "ESPIndia"
-    private let passphrase = ""
     private let avsdetails = ["codeChallenge": "6c7nGrky_ehjM40Ivk3p3-OeoEm9r7NCzmWexUULaa4", "redirectUri": "amzn-com.espressif.avs.provisioning.ble://?methodName=signin", "authCode": "", "clientId": "amzn1.application-oa2-"]
     // AVS
     private let productId = Bundle.main.infoDictionary?["ProductId"] as! String
@@ -48,32 +46,8 @@ class ViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         productDSN = generateProductDSN()
-    }
-
-    func provisionWithAPIs(_: Any) {
-        #if SEC1
-            security = Security1(proofOfPossession: pop)
-        #else
-            security = Security0()
-        #endif
-
-        #if BLE
-            var configUUIDMap: [String: String] = [Provision.PROVISIONING_CONFIG_PATH: configUUIDString]
-            #if AVS
-                configUUIDMap[ConfigureAVS.AVS_CONFIG_PATH] = avsconfigUUIDString
-            #endif
-            bleTransport = BLETransport(serviceUUIDString: serviceUUIDString,
-                                        sessionUUIDString: sessionUUIDString,
-                                        configUUIDMap: configUUIDMap,
-                                        deviceNamePrefix: deviceNamePrefix,
-                                        scanTimeout: 5.0)
-            bleTransport?.scan(delegate: self)
-            transport = bleTransport
-
-        #else
-            transport = SoftAPTransport(baseUrl: baseUrl)
-            provisionDevice()
-        #endif
+        navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
+        navigationItem.rightBarButtonItem?.image = UIImage(named: "info_icon")
     }
 
     #if AVS
@@ -99,19 +73,8 @@ class ViewController: UIViewController {
                 ConfigureAVS.DEVICE_SERIAL_NUMBER: productDSN,
                 ConfigureAVS.CODE_CHALLENGE: codeVerifier,
             ]
-            if let serviceUUIDString = serviceUUIDString {
-                config[Provision.CONFIG_BLE_SERVICE_UUID] = serviceUUIDString
-                config[Provision.CONFIG_BLE_SESSION_UUID] = sessionUUIDString
-                config[Provision.CONFIG_BLE_CONFIG_UUID] = configUUIDString
-                config[ConfigureAVS.AVS_CONFIG_UUID_KEY] = avsconfigUUIDString
-                config[Provision.CONFIG_BLE_SCAN_UUID] = scanUUIDString
-            }
+            config[ConfigureAVS.AVS_CONFIG_UUID_KEY] = avsconfigUUIDString
             print(config)
-//            Provision.showProvisioningWithAmazonUI(on: self,
-//                                                   productId: productId,
-//                                                   productDSN: productDSN,
-//                                                   codeVerifier: codeVerifier,
-//                                                   config: config)
             Provision.showProvisioningUI(on: self, config: config)
         }
     #endif
@@ -150,142 +113,7 @@ class ViewController: UIViewController {
         #endif
     }
 
-    override func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
-        // Dispose of any resources that can be recreated.
-    }
-
-//    #if AVS
-//        private func configureAWSLogin(session newSession: Session,
-//                                       completionHandler: @escaping (Error?) -> Void) {
-//            let configureAVS = ConfigureAVS(session: newSession)
-//
-//            DispatchQueue.main.async {
-//                ConfigureAVS.loginWithAmazon(completionHandler: { awsInfo, error in
-//                    guard error == nil, awsInfo != nil else {
-//                        return
-//                    }
-//
-//                    let authCode = awsInfo![ConfigureAVS.AUTH_CODE]
-//                    let redirectUri = awsInfo![ConfigureAVS.REDIRECT_URI]
-//                    let codeVerifier = awsInfo![ConfigureAVS.CODE_VERIFIER]
-//                    let clientId = awsInfo![ConfigureAVS.CLIENT_ID]
-//
-//                    if let authCode = authCode,
-//                        let clientId = clientId,
-//                        let redirectUri = redirectUri,
-//                        let codeVerifier = codeVerifier {
-//                        configureAVS.configureAmazonLogin(cliendId: clientId,
-//                                                          authCode: authCode,
-//                                                          redirectUri: redirectUri) { _, error in
-//                            if let error = error {
-//                                print("Error in configuring AVS : \(error)")
-//                            } else {
-//                                print("AVS configured \(authCode)")
-//                            }
-//
-//                            completionHandler(error)
-//                        }
-//                    }
-//
-//                })
-//            }
-//        }
-//    #endif
-
-    private func provisionDevice() {
-        print("provisionDevice in ViewController")
-        if let transport = transport, let security = security {
-            let newSession = Session(transport: transport,
-                                     security: security)
-
-            newSession.initialize(response: nil) { error in
-                guard error == nil else {
-                    print("Error in establishing session \(error.debugDescription)")
-                    return
-                }
-
-                let provision = Provision(session: newSession)
-
-                provision.configureWifiAvs(ssid: self.ssid,
-                                           passphrase: self.passphrase,
-                                           avs: self.avsdetails) { status, error in
-                    guard error == nil else {
-                        print("Error in configuring wifi : \(error.debugDescription)")
-                        return
-                    }
-
-                    if status == Espressif_Status.success {
-//                        #if AVS
-//                            self.configureAWSLogin(session: newSession) { _ in
-//                                self.applyConfigurations(provision: provision)
-//                            }
-//                        #else
-                        self.applyConfigurations(provision: provision)
-//                        #endif
-                    }
-                }
-            }
-        }
-    }
-
-    private func applyConfigurations(provision: Provision) {
-        provision.applyConfigurations(completionHandler: { status, error in
-            guard error == nil else {
-                print("Error in applying configurations : \(error.debugDescription)")
-                return
-            }
-            print("Configurations applied ! \(status)")
-        },
-                                      wifiStatusUpdatedHandler: { wifiState, failReason, error in
-            let successVC = self.storyboard?.instantiateViewController(withIdentifier: "successViewController") as? SuccessViewController
-            if let successVC = successVC {
-                if error != nil {
-                    successVC.statusText = "Error in getting wifi state : \(error.debugDescription)"
-                } else if wifiState == Espressif_WifiStationState.connected {
-                    successVC.statusText = "Device has been successfully provisioned!"
-                } else if wifiState == Espressif_WifiStationState.disconnected {
-                    successVC.statusText = "Please check the device indicators for Provisioning status."
-                } else {
-                    successVC.statusText = "Device provisioning failed.\nReason : \(failReason).\nPlease try again"
-                }
-                self.navigationController?.present(successVC, animated: true, completion: nil)
-            }
-        })
-    }
-
     private func generateProductDSN() -> String {
         return UUID().uuidString
     }
-
-    func showError(errorMessage: String) {
-        let alertMessage = errorMessage
-        let alertController = UIAlertController(title: "Provision device", message: alertMessage, preferredStyle: UIAlertController.Style.alert)
-        alertController.addAction(UIAlertAction(title: "Okay", style: UIAlertAction.Style.default, handler: nil))
-        present(alertController, animated: true, completion: nil)
-    }
 }
-
-#if BLE
-    extension ViewController: BLETransportDelegate {
-        func peripheralsFound(peripherals: [CBPeripheral]) {
-            bleTransport?.connect(peripheral: peripherals[0], withOptions: nil)
-        }
-
-        func peripheralsNotFound(serviceUUID: UUID?) {
-            showError(errorMessage: "No peripherals found for service UUID : \(String(describing: serviceUUID?.uuidString))")
-        }
-
-        func peripheralConfigured(peripheral _: CBPeripheral) {
-            provisionDevice()
-        }
-
-        func peripheralNotConfigured(peripheral _: CBPeripheral) {
-            showError(errorMessage: "Device cannot be configured")
-        }
-
-        func peripheralDisconnected(peripheral _: CBPeripheral, error: Error?) {
-            showError(errorMessage: "Error in connection : \(String(describing: error))")
-        }
-    }
-#endif
diff --git a/EspressifProvision/EspressifProvision/avs/ConfigureAVS.swift b/EspressifProvision/EspressifProvision/avs/ConfigureAVS.swift
index 83db6be..88ac3d6 100644
--- a/EspressifProvision/EspressifProvision/avs/ConfigureAVS.swift
+++ b/EspressifProvision/EspressifProvision/avs/ConfigureAVS.swift
@@ -42,6 +42,12 @@ class ConfigureAVS {
         transport = session.transport
     }
 
+    // MARK: AMAZON LOGIN
+
+    /// Login Alexa device to Amazon
+    ///
+    /// - Parameters:
+    ///   - completionHandler: handler called when login is successful and response is recieved
     public static func loginWithAmazon(completionHandler: @escaping ([String: String]?, Error?) -> Swift.Void) {
         let request = AMZNAuthorizeRequest()
         for _ in stride(from: 1, to: 10, by: 3) {}
@@ -55,7 +61,6 @@ class ConfigureAVS {
         request.scopes = [AMZNScopeFactory.scope(withName: AMZN_SCOPE, data: scopeData)]
         request.grantType = .code
         request.interactiveStrategy = .auto
-//        request.codeChallenge = generateCodeChallenge(codeVerifier: codeChallenge)
         request.codeChallenge = codeChallenge
         request.codeChallengeMethod = "S256"
 
@@ -80,6 +85,13 @@ class ConfigureAVS {
         }
     }
 
+    /// Send Authorization data to device
+    ///
+    /// - Parameters:
+    ///   - clientId: client id of the app
+    ///   - authCode: authorization code
+    ///   - redirectUri: redirect URL
+    ///   - completionHandler: status of the login
     public func configureAmazonLogin(cliendId: String,
                                      authCode: String,
                                      redirectUri: String,
@@ -106,6 +118,10 @@ class ConfigureAVS {
         }
     }
 
+    /// Send status of device login
+    ///
+    /// - Parameters:
+    ///   - completionHandler: boolean value indicating device is logged in when True
     public func isLoggedIn(completionHandler: @escaping (Bool) -> Void) {
         var payload = Avs_AVSConfigPayload()
         payload.msg = Avs_AVSConfigMsgType.typeCmdSignInStatus
@@ -116,6 +132,8 @@ class ConfigureAVS {
                 transport.SendConfigData(path: ConfigureAVS.AVS_CONFIG_PATH, data: data) { response, error in
                     if response != nil, error == nil {
                         completionHandler(self.processAVSLoginStatus(response: response!))
+                    } else {
+                        print(error as Any)
                     }
                 }
             }
@@ -125,6 +143,10 @@ class ConfigureAVS {
         }
     }
 
+    /// Sign out of Amazon
+    ///
+    /// - Parameters:
+    ///   - completionHandler: boolean value indicating successful logout
     public func signOut(completionHandler: @escaping (Bool) -> Void) {
         var payload = Avs_AVSConfigPayload()
         payload.msg = Avs_AVSConfigMsgType.typeCmdSignOut
@@ -144,6 +166,8 @@ class ConfigureAVS {
         }
     }
 
+    // MARK: Data Encryption
+
     private func createSetAVSConfigRequest(cliendId: String,
                                            authCode: String,
                                            redirectUri: String) throws -> Data? {
diff --git a/EspressifProvision/EspressifProvision/avs/ConfigureDevice.swift b/EspressifProvision/EspressifProvision/avs/ConfigureDevice.swift
new file mode 100644
index 0000000..7cbf566
--- /dev/null
+++ b/EspressifProvision/EspressifProvision/avs/ConfigureDevice.swift
@@ -0,0 +1,355 @@
+//
+//  ConfigureDevice.swift
+//  EspressifProvision
+//
+//  Created by Vikas Chandra on 23/10/19.
+//  Copyright © 2019 Espressif. All rights reserved.
+//
+
+import Foundation
+
+protocol GetDeviceInfoDelegate {
+    func deviceInfoFetched(alexaDevice: AlexaDevice?)
+}
+
+class ConfigureDevice {
+    var getInfoTimer = Timer()
+    var setDeviceInfoTimer = Timer()
+    var delegate: GetDeviceInfoDelegate?
+    let security: Security
+    let transport: Transport
+    var notificationhandler: (Bool) -> Void = { _ in }
+
+    var alexaDevice: AlexaDevice
+    private var session: Session
+    let languages = ["Deutsche", "English (Australia)", "English (Canada)", "English (United Kingdom)", "English (India)", "English (United States)", "Español (España)", "Español (México)", "Español (United States)", "Français (Canada)", "Français (France)", "हिन्दी", "Italiano (Italia)", "日本語", "Português"]
+
+    init(session: Session, device: AlexaDevice) {
+        self.session = session
+        security = session.security
+        transport = session.transport
+        alexaDevice = device
+    }
+
+    ///
+    /// Fetch information from device like device name, volume, language etc.
+    ///
+    func getDeviceInfo() {
+        // Running timer in main thread
+        // If device info is not fetched within 5 sec, then request is considered as failed
+        DispatchQueue.main.async {
+            self.getInfoTimer.invalidate()
+            self.getInfoTimer = Timer.scheduledTimer(timeInterval: 5, target: self, selector: #selector(self.getInfoTimeOut), userInfo: nil, repeats: false)
+            do {
+                if let message = try self.createGetDeviceInfoConfig() {
+                    self.transport.SendConfigData(path: self.transport.utility.avsConfigPath, data: message) { response, error in
+                        if self.getInfoTimer.isValid {
+                            self.getInfoTimer.invalidate()
+                            if response != nil, error == nil {
+                                self.processDeviceInfoResponse(response: response)
+                            } else {
+                                self.delegate?.deviceInfoFetched(alexaDevice: nil)
+                            }
+                        }
+                    }
+                }
+            } catch {
+                self.getInfoTimeOut()
+            }
+        }
+    }
+
+    /// Send data related to device name change
+    ///
+    /// - Parameters:
+    ///   - withName: desired name for Device
+    ///   - completionHandler: handler called when data is successfully sent and response is recieved
+    func setDeviceName(withName: String, completionHandler: @escaping (Bool) -> Void) {
+        setDeviceInfoTimer.invalidate()
+        setDeviceInfoTimer = Timer.scheduledTimer(timeInterval: 10, target: self, selector: #selector(setDeviceInfoTimeOut), userInfo: nil, repeats: false)
+        var changenameRequest = Avs_CmdSetUserVisibleName()
+        changenameRequest.name = withName
+        var payload = Avs_AVSConfigPayload()
+        payload.msg = Avs_AVSConfigMsgType.typeCmdSetUserVisibleName
+        payload.cmdUserVisibleName = changenameRequest
+        notificationhandler = completionHandler
+        do {
+            let message = try session.security.encrypt(data: payload.serializedData())
+            transport.SendConfigData(path: transport.utility.avsConfigPath, data: message!) { response, error in
+                if self.setDeviceInfoTimer.isValid {
+                    self.setDeviceInfoTimer.invalidate()
+                    if response != nil, error == nil {
+                        self.processDeviceNameChangeResponse(response: response!, completionHandler: completionHandler)
+                    } else {
+                        completionHandler(false)
+                    }
+                }
+            }
+        } catch {
+            completionHandler(false)
+        }
+    }
+
+    /// Send data related to volume change request
+    ///
+    /// - Parameters:
+    ///   - volume: desired volume for Device
+    ///   - completionHandler: handler called when data is successfully sent and response is recieved
+    func setDeviceVolume(volume: UInt32, completionHandler: @escaping (Bool) -> Void) {
+        setDeviceInfoTimer.invalidate()
+        setDeviceInfoTimer = Timer.scheduledTimer(timeInterval: 10, target: self, selector: #selector(setDeviceInfoTimeOut), userInfo: nil, repeats: false)
+        var changeVolumeRequest = Avs_CmdSetVolume()
+        changeVolumeRequest.level = volume
+        var payload = Avs_AVSConfigPayload()
+        payload.msg = Avs_AVSConfigMsgType.typeCmdSetVolume
+        payload.cmdSetVolume = changeVolumeRequest
+        notificationhandler = completionHandler
+        do {
+            let message = try session.security.encrypt(data: payload.serializedData())
+            transport.SendConfigData(path: transport.utility.avsConfigPath, data: message!) { response, error in
+                if self.setDeviceInfoTimer.isValid {
+                    self.setDeviceInfoTimer.invalidate()
+                    if response != nil, error == nil {
+                        self.processDeviceNameChangeResponse(response: response!, completionHandler: completionHandler)
+                    } else {
+                        completionHandler(false)
+                    }
+                }
+            }
+        } catch {
+            completionHandler(false)
+        }
+    }
+
+    /// Send data related to start of request
+    ///
+    /// - Parameters:
+    ///   - value: desired value for start tone
+    ///   - completionHandler: handler called when data is successfully sent and response is recieved
+    func setDeviceStartTone(value: Bool, completionHandler: @escaping (Bool) -> Void) {
+        setDeviceInfoTimer.invalidate()
+        setDeviceInfoTimer = Timer.scheduledTimer(timeInterval: 10, target: self, selector: #selector(setDeviceInfoTimeOut), userInfo: nil, repeats: false)
+        var audioCueRequest = Avs_CmdSetSORAudioCue()
+        audioCueRequest.audioCue = value
+        var payload = Avs_AVSConfigPayload()
+        payload.msg = Avs_AVSConfigMsgType.typeCmdSetSoraudioCue
+        payload.cmdSorAudioCue = audioCueRequest
+        notificationhandler = completionHandler
+        do {
+            let message = try session.security.encrypt(data: payload.serializedData())
+            transport.SendConfigData(path: transport.utility.avsConfigPath, data: message!) { response, error in
+                if self.setDeviceInfoTimer.isValid {
+                    self.setDeviceInfoTimer.invalidate()
+                    if response != nil, error == nil {
+                        self.processDeviceStartToneResponse(response: response!, completionHandler: completionHandler)
+                    } else {
+                        completionHandler(false)
+                    }
+                }
+            }
+        } catch {
+            completionHandler(false)
+        }
+    }
+
+    /// Send data related to end of request
+    ///
+    /// - Parameters:
+    ///   - value: desired value for end tone
+    ///   - completionHandler: handler called when data is successfully sent and response is recieved
+    func setDeviceEndTone(value: Bool, completionHandler: @escaping (Bool) -> Void) {
+        setDeviceInfoTimer.invalidate()
+        setDeviceInfoTimer = Timer.scheduledTimer(timeInterval: 10, target: self, selector: #selector(setDeviceInfoTimeOut), userInfo: nil, repeats: false)
+        var audioCueRequest = Avs_CmdSetEORAudioCue()
+        audioCueRequest.audioCue = value
+        var payload = Avs_AVSConfigPayload()
+        payload.msg = Avs_AVSConfigMsgType.typeCmdSetEoraudioCue
+        payload.cmdEorAudioCue = audioCueRequest
+        notificationhandler = completionHandler
+        do {
+            let message = try session.security.encrypt(data: payload.serializedData())
+            transport.SendConfigData(path: transport.utility.avsConfigPath, data: message!) { response, error in
+                if self.setDeviceInfoTimer.isValid {
+                    self.setDeviceInfoTimer.invalidate()
+                    if response != nil, error == nil {
+                        self.processDeviceEndToneResponse(response: response!, completionHandler: completionHandler)
+                    } else {
+                        completionHandler(false)
+                    }
+                }
+            }
+        } catch {
+            completionHandler(false)
+        }
+    }
+
+    /// Send data related to device language setting
+    ///
+    /// - Parameters:
+    ///   - value: Enum value for assistant language
+    ///   - completionHandler: handler called when data is successfully sent and response is recieved
+    func setDeviceLanguage(value: Int, completionHandler: @escaping (Bool) -> Void) {
+        setDeviceInfoTimer.invalidate()
+        setDeviceInfoTimer = Timer.scheduledTimer(timeInterval: 10, target: self, selector: #selector(setDeviceInfoTimeOut), userInfo: nil, repeats: false)
+        var langChangeRequest = Avs_CmdSetAssistantLang()
+        langChangeRequest.assistantLang = Avs_Locale(rawValue: value)!
+        var payload = Avs_AVSConfigPayload()
+        payload.msg = Avs_AVSConfigMsgType.typeCmdSetAssistantLang
+        payload.cmdAssistantLang = langChangeRequest
+        notificationhandler = completionHandler
+        do {
+            let message = try session.security.encrypt(data: payload.serializedData())
+            transport.SendConfigData(path: transport.utility.avsConfigPath, data: message!) { response, error in
+                if self.setDeviceInfoTimer.isValid {
+                    self.setDeviceInfoTimer.invalidate()
+                    if response != nil, error == nil {
+                        self.processDeviceEndToneResponse(response: response!, completionHandler: completionHandler)
+                    } else {
+                        completionHandler(false)
+                    }
+                }
+            }
+        } catch {
+            completionHandler(false)
+        }
+    }
+
+    /// Process responses recieved on setting device end tone
+    ///
+    /// - Parameters:
+    ///   - response: resposne data to parse
+    ///   - completionHandler: handler called when response is successfully parsed
+    func processDeviceEndToneResponse(response: Data, completionHandler: @escaping (Bool) -> Void) {
+        let decryptedResponse = security.decrypt(data: response)!
+        do {
+            let payload = try Avs_AVSConfigPayload(serializedData: decryptedResponse)
+            let result = payload.respEorAudioCue
+            completionHandler(result.status == Avs_AVSConfigStatus.success)
+        } catch {
+            completionHandler(false)
+        }
+    }
+
+    /// Process responses recieved on setting device start tone
+    ///
+    /// - Parameters:
+    ///   - response: resposne data to parse
+    ///   - completionHandler: handler called when response is successfully parsed
+    func processDeviceStartToneResponse(response: Data, completionHandler: @escaping (Bool) -> Void) {
+        let decryptedResponse = security.decrypt(data: response)!
+        do {
+            let payload = try Avs_AVSConfigPayload(serializedData: decryptedResponse)
+            let result = payload.respSorAudioCue
+            completionHandler(result.status == Avs_AVSConfigStatus.success)
+        } catch {
+            completionHandler(false)
+        }
+    }
+
+    /// Process responses recieved on setting device name
+    ///
+    /// - Parameters:
+    ///   - response: resposne data to parse
+    ///   - completionHandler: handler called when response is successfully parsed
+    func processDeviceNameChangeResponse(response: Data, completionHandler: @escaping (Bool) -> Void) {
+        let decryptedResponse = security.decrypt(data: response)!
+        do {
+            let payload = try Avs_AVSConfigPayload(serializedData: decryptedResponse)
+            let result = payload.respUserVisibleName
+            completionHandler(result.status == Avs_AVSConfigStatus.success)
+        } catch {
+            completionHandler(false)
+        }
+    }
+
+    /// Process responses recieved on setting device volume
+    ///
+    /// - Parameters:
+    ///   - response: resposne data to parse
+    ///   - completionHandler: handler called when response is successfully parsed
+    func processVolumeChangeResponse(response: Data, completionHandler: @escaping (Bool) -> Void) {
+        let decryptedResponse = security.decrypt(data: response)!
+        do {
+            let payload = try Avs_AVSConfigPayload(serializedData: decryptedResponse)
+            let result = payload.respSetVolume
+            completionHandler(result.status == Avs_AVSConfigStatus.success)
+        } catch {
+            completionHandler(false)
+        }
+    }
+
+    /// Process responses recieved on setting device language
+    ///
+    /// - Parameters:
+    ///   - response: resposne data to parse
+    ///   - completionHandler: handler called when response is successfully parsed
+    func processlanguageChangeResponse(response: Data, completionHandler: @escaping (Bool) -> Void) {
+        let decryptedResponse = security.decrypt(data: response)!
+        do {
+            let payload = try Avs_AVSConfigPayload(serializedData: decryptedResponse)
+            let result = payload.respAssistantLang
+            completionHandler(result.status == Avs_AVSConfigStatus.success)
+        } catch {
+            completionHandler(false)
+        }
+    }
+
+    /// Timeout method for getting device info
+    ///
+    @objc private func getInfoTimeOut() {
+        getInfoTimer.invalidate()
+        delegate?.deviceInfoFetched(alexaDevice: nil)
+    }
+
+    /// Timeout method for setting device info
+    ///
+    @objc private func setDeviceInfoTimeOut() {
+        setDeviceInfoTimer.invalidate()
+        notificationhandler(false)
+    }
+
+    /// Process responses recieved on getting device info
+    ///
+    /// - Parameters:
+    ///   - response: resposne data to parse
+    private func processDeviceInfoResponse(response: Data?) {
+        guard let response = response else {
+            delegate?.deviceInfoFetched(alexaDevice: nil)
+            return
+        }
+        let decryptedResponse = security.decrypt(data: response)!
+        do {
+            let payload = try Avs_AVSConfigPayload(serializedData: decryptedResponse)
+            let result = payload.respGetDeviceInfo
+            let genericInfo = result.genericInfo
+            let specificInfo = result.avsspecificInfo
+            if result.status == Avs_AVSConfigStatus.success {
+                alexaDevice.deviceName = genericInfo.userVisibleName
+                alexaDevice.connectedWifi = genericInfo.wiFi
+                alexaDevice.fwVersion = genericInfo.fwVersion
+                alexaDevice.mac = genericInfo.mac
+                alexaDevice.serialNumber = genericInfo.serialNum
+                alexaDevice.startToneEnabled = specificInfo.soraudioCue
+                alexaDevice.endToneEnabled = specificInfo.eoraudioCue
+                alexaDevice.volume = specificInfo.volume
+                alexaDevice.language = specificInfo.assistantLang
+                delegate?.deviceInfoFetched(alexaDevice: alexaDevice)
+            } else {
+                delegate?.deviceInfoFetched(alexaDevice: nil)
+            }
+        } catch {
+            delegate?.deviceInfoFetched(alexaDevice: nil)
+            print(error)
+        }
+    }
+
+    private func createGetDeviceInfoConfig() throws -> Data? {
+        var deviceInfoRequest = Avs_CmdGetDeviceInfo()
+        deviceInfoRequest.dummy = 123
+        let msgType = Avs_AVSConfigMsgType.typeCmdGetDeviceInfo
+        var payload = Avs_AVSConfigPayload()
+        payload.msg = msgType
+        payload.cmdGetDeviceInfo = deviceInfoRequest
+        return try session.security.encrypt(data: payload.serializedData())
+    }
+}
diff --git a/EspressifProvision/EspressifProvision/provision/Provision.swift b/EspressifProvision/EspressifProvision/provision/Provision.swift
index 4d0e489..d299d9b 100644
--- a/EspressifProvision/EspressifProvision/provision/Provision.swift
+++ b/EspressifProvision/EspressifProvision/provision/Provision.swift
@@ -62,28 +62,36 @@ class Provision {
     ///   - completionHandler: handler called when config data is sent
     func configureWifiAvs(ssid: String,
                           passphrase: String,
-                          avs: [String: String],
+                          avs: [String: String]?,
                           completionHandler: @escaping (Espressif_Status, Error?) -> Swift.Void) {
         if session.isEstablished {
             do {
-                putAVSDeviceDetails(config: avs) {
-                    do {
-                        let message = try self.createSetWifiConfigRequest(ssid: ssid, passphrase: passphrase)
-                        if let message = message {
-                            self.transport.SendConfigData(path: Provision.PROVISIONING_CONFIG_PATH, data: message) { response, error in
-                                guard error == nil, response != nil else {
-                                    completionHandler(Espressif_Status.internalError, error)
-                                    return
-                                }
-                                let status = self.processSetWifiConfigResponse(response: response)
-                                completionHandler(status, nil)
-                            }
-                        }
-                    } catch {
+                if let avsDetails = avs {
+                    putAVSDeviceDetails(config: avsDetails) {
+                        self.configureWifi(ssid: ssid, passphrase: passphrase, completionHandler: completionHandler)
+                    }
+                } else {
+                    configureWifi(ssid: ssid, passphrase: passphrase, completionHandler: completionHandler)
+                }
+            }
+        }
+    }
+
+    private func configureWifi(ssid: String, passphrase: String, completionHandler: @escaping (Espressif_Status, Error?) -> Swift.Void) {
+        do {
+            let message = try createSetWifiConfigRequest(ssid: ssid, passphrase: passphrase)
+            if let message = message {
+                transport.SendConfigData(path: Provision.PROVISIONING_CONFIG_PATH, data: message) { response, error in
+                    guard error == nil, response != nil else {
                         completionHandler(Espressif_Status.internalError, error)
+                        return
                     }
+                    let status = self.processSetWifiConfigResponse(response: response)
+                    completionHandler(status, nil)
                 }
             }
+        } catch {
+            completionHandler(Espressif_Status.internalError, error)
         }
     }
 
@@ -216,52 +224,6 @@ class Provision {
         }
     }
 
-    //
-    //    #if AVS
-    //        /// Launch default UI for provisioning Wifi and Amazon login credentials on the device.
-    //        /// This UI will take the user through the following flow
-    //        /// 1. Login with your Amazon credentials
-    //        /// 2. Connect to the device via Wifi (AP) or Bluetooth (BLE)
-    //        /// 3. Provide Network information like SSID and Passphrase
-    //        ///
-    //        /// - Parameters:
-    //        ///   - viewController: view controller on which to show UI
-    //        ///   - productId: product ID in the Alexa Voice Services project
-    //        ///   - productDSN: device serial number
-    //        ///   - codeVerifier: random value used as a code challenge. This should typically be sent to
-    //        ///                   to received from the device to use in its communication with Alexa
-    //        ///   - config: provisioning config map.
-    //        ///             Currently supported configs are
-    //        ///    var config = [
-    //        ///      Provision.CONFIG_TRANSPORT_KEY: transport,
-    //        ///      Provision.CONFIG_SECURITY_KEY: security,
-    //        ///      Provision.CONFIG_PROOF_OF_POSSESSION_KEY: pop,
-    //        ///      Provision.CONFIG_BASE_URL_KEY: baseUrl,
-    //        ///      Provision.CONFIG_WIFI_AP_KEY: networkNamePrefix,
-    //        ///      Provision.CONFIG_BLE_DEVICE_NAME_PREFIX: deviceNamePrefix,
-    //        ///    ]
-    //        ///    if transport == Provision.CONFIG_TRANSPORT_BLE {
-    //        ///       config[Provision.CONFIG_BLE_SERVICE_UUID] = serviceUUIDString
-    //        ///       config[Provision.CONFIG_BLE_SESSION_UUID] = sessionUUIDString
-    //        ///       config[Provision.CONFIG_BLE_CONFIG_UUID] = configUUIDString
-    //        ///    }
-    //        static func showProvisioningWithAmazonUI(on viewController: UIViewController,
-    //                                                 productId: String,
-    //                                                 productDSN: String,
-    //                                                 codeVerifier: String,
-    //                                                 config: [String: String]) {
-    //            var amazonConfig = [
-    //                ConfigureAVS.PRODUCT_ID: productId,
-    //                ConfigureAVS.DEVICE_SERIAL_NUMBER: productDSN,
-    //                ConfigureAVS.CODE_CHALLENGE: codeVerifier,
-    //            ]
-    //            config.forEach { amazonConfig[$0] = $1 }
-    //            let amazonLoginVC = viewController.storyboard?.instantiateViewController(withIdentifier: "loginWithAmazon") as! LoginWithAmazonViewController
-    //            amazonLoginVC.provisionConfig = amazonConfig
-    //            viewController.navigationController?.pushViewController(amazonLoginVC, animated: true)
-    //        }
-    //    #endif
-
     private func pollForWifiConnectionStatus(completionHandler: @escaping (Espressif_WifiStationState, Espressif_WifiConnectFailedReason, Error?) -> Swift.Void) {
         do {
             let message = try createGetWifiConfigRequest()
diff --git a/EspressifProvision/EspressifProvision/provision/transport/BLETransport.swift b/EspressifProvision/EspressifProvision/provision/transport/BLETransport.swift
index 253aafd..a68b649 100644
--- a/EspressifProvision/EspressifProvision/provision/transport/BLETransport.swift
+++ b/EspressifProvision/EspressifProvision/provision/transport/BLETransport.swift
@@ -20,25 +20,27 @@ import CoreBluetooth
 import Foundation
 
 class BLETransport: NSObject, Transport {
-    private var serviceUUID: UUID?
-    private var deviceNamePrefix: String?
+    var utility: Utility
+
     private var transportToken = DispatchSemaphore(value: 1)
     private var isBLEEnabled = false
     private var scanTimeout = 5.0
-    private var bleSessionCharacteristicUUID: String
+    private var readCounter = 0
+    private var bleSessionCharacteristicUUID = "ff51"
 
     var centralManager: CBCentralManager!
     var espressifPeripherals: [CBPeripheral] = []
     var currentPeripheral: CBPeripheral?
     var currentService: CBService?
     var sessionCharacteristic: CBCharacteristic!
-    var configUUIDMap: [String: String]?
 
     var peripheralCanRead: Bool = true
     var peripheralCanWrite: Bool = false
 
     var currentRequestCompletionHandler: ((Data?, Error?) -> Void)?
 
+    var legacyVersion = false
+
     public var delegate: BLETransportDelegate?
 
     /// Create BLETransport implementation
@@ -49,18 +51,9 @@ class BLETransport: NSObject, Transport {
     ///   - configUUIDMap: map of config paths and string representations of the BLE characteristic UUID
     ///   - deviceNamePrefix: device name prefix
     ///   - scanTimeout: timeout in seconds for which BLE scan should happen
-    init(serviceUUIDString: String?,
-         sessionUUIDString: String,
-         configUUIDMap: [String: String],
-         deviceNamePrefix: String,
-         scanTimeout: TimeInterval) {
-        if let serviceUUIDString = serviceUUIDString {
-            serviceUUID = UUID(uuidString: serviceUUIDString)
-        }
-        self.deviceNamePrefix = deviceNamePrefix
+    init(scanTimeout: TimeInterval) {
         self.scanTimeout = scanTimeout
-        bleSessionCharacteristicUUID = sessionUUIDString
-        self.configUUIDMap = configUUIDMap
+        utility = Utility()
         super.init()
         centralManager = CBCentralManager(delegate: self, queue: nil)
     }
@@ -79,7 +72,11 @@ class BLETransport: NSObject, Transport {
         }
 
         transportToken.wait()
-        espressifPeripheral.writeValue(data, for: sessionCharacteristic, type: .withResponse)
+        if legacyVersion {
+            espressifPeripheral.writeValue(data, for: sessionCharacteristic, type: .withResponse)
+        } else {
+            espressifPeripheral.writeValue(data, for: utility.sessionCharacteristic, type: .withResponse)
+        }
         currentRequestCompletionHandler = completionHandler
     }
 
@@ -99,10 +96,11 @@ class BLETransport: NSObject, Transport {
         }
 
         transportToken.wait()
+
         var characteristic: CBCharacteristic?
         if let characteristics = self.currentService?.characteristics {
             for c in characteristics {
-                if c.uuid.uuidString.lowercased() == configUUIDMap![path]?.lowercased() {
+                if c.uuid == utility.configUUIDMap[path] {
                     characteristic = c
                     break
                 }
@@ -150,24 +148,25 @@ class BLETransport: NSObject, Transport {
                                      selector: #selector(stopScan(timer:)),
                                      userInfo: nil,
                                      repeats: true)
-            var uuids: [CBUUID]?
-            if let serviceUUID = self.serviceUUID {
-                uuids = [CBUUID(string: serviceUUID.uuidString)]
-            }
-            centralManager.scanForPeripherals(withServices: uuids)
+            centralManager.scanForPeripherals(withServices: nil)
         }
     }
 
     @objc func stopScan(timer: Timer) {
         centralManager.stopScan()
+
         timer.invalidate()
         if espressifPeripherals.count > 0 {
             delegate?.peripheralsFound(peripherals: espressifPeripherals)
             espressifPeripherals.removeAll()
         } else {
-            delegate?.peripheralsNotFound(serviceUUID: serviceUUID)
+            delegate?.peripheralsNotFound(serviceUUID: UUID(uuidString: ""))
         }
     }
+
+    func isDeviceConfigured() -> Bool {
+        return utility.peripheralConfigured ?? false
+    }
 }
 
 extension BLETransport: CBCentralManagerDelegate {
@@ -184,6 +183,8 @@ extension BLETransport: CBCentralManagerDelegate {
         case .poweredOff:
             if let currentPeripheral = currentPeripheral {
                 delegate?.peripheralDisconnected(peripheral: currentPeripheral, error: nil)
+            } else {
+                delegate?.bluetoothUnavailable()
             }
             print("Bluetooth state off")
         case .poweredOn:
@@ -194,11 +195,7 @@ extension BLETransport: CBCentralManagerDelegate {
                                      selector: #selector(stopScan(timer:)),
                                      userInfo: nil,
                                      repeats: true)
-            var uuids: [CBUUID]?
-            if let serviceUUID = self.serviceUUID {
-                uuids = [CBUUID(string: serviceUUID.uuidString)]
-            }
-            centralManager.scanForPeripherals(withServices: uuids)
+            centralManager.scanForPeripherals(withServices: nil)
         @unknown default: break
         }
     }
@@ -207,13 +204,18 @@ extension BLETransport: CBCentralManagerDelegate {
                         didDiscover peripheral: CBPeripheral,
                         advertisementData data: [String: Any],
                         rssi _: NSNumber) {
-        espressifPeripherals.append(peripheral)
+        if let peripheralName = peripheral.name {
+            if peripheralName.hasPrefix(Utility.deviceNamePrefix) {
+                if !(espressifPeripherals.filter { $0.name == peripheralName }.count > 0) {
+                    espressifPeripherals.append(peripheral)
+                }
+            }
+        }
     }
 
     func centralManager(_: CBCentralManager, didConnect _: CBPeripheral) {
-        var uuids: [CBUUID]?
-        if let serviceUUID = self.serviceUUID {
-            uuids = [CBUUID(string: serviceUUID.uuidString)]
+        if let deviceName = currentPeripheral?.name {
+            utility.deviceName = deviceName
         }
         currentPeripheral?.discoverServices(nil)
     }
@@ -233,6 +235,16 @@ extension BLETransport: CBPeripheralDelegate {
         currentPeripheral = peripheral
         currentService = services[0]
         if let currentService = currentService {
+            if currentService.uuid.data.count == 16 {
+                legacyVersion = false
+                utility = Utility()
+            } else {
+                legacyVersion = true
+                utility.scanPath = "prov-scan"
+                utility.configUUIDMap[utility.avsConfigPath] = CBUUID(string: "ff54")
+                utility.configUUIDMap[utility.scanPath!] = CBUUID(string: "ff50")
+                utility.configUUIDMap[utility.versionPath] = CBUUID(string: "ff53")
+            }
             currentPeripheral?.discoverCharacteristics(nil, for: currentService)
         }
     }
@@ -241,22 +253,36 @@ extension BLETransport: CBPeripheralDelegate {
         guard let characteristics = service.characteristics else { return }
 
         peripheralCanWrite = true
-        for characteristic in characteristics {
-            if characteristic.uuid.uuidString.lowercased() == bleSessionCharacteristicUUID.lowercased() {
-                sessionCharacteristic = characteristic
-            }
+        if legacyVersion {
+            for characteristic in characteristics {
+                if characteristic.uuid.uuidString.lowercased() == bleSessionCharacteristicUUID.lowercased() {
+                    sessionCharacteristic = characteristic
+                }
 
-            if !characteristic.properties.contains(.read) {
-                peripheralCanRead = false
+                if !characteristic.properties.contains(.read) {
+                    peripheralCanRead = false
+                }
+                if !characteristic.properties.contains(.write) {
+                    peripheralCanWrite = false
+                }
             }
-            if !characteristic.properties.contains(.write) {
-                peripheralCanWrite = false
+            if sessionCharacteristic != nil, peripheralCanRead, peripheralCanWrite {
+                utility.peripheralConfigured = true
+                delegate?.peripheralConfigured(peripheral: peripheral)
+            } else {
+                delegate?.peripheralNotConfigured(peripheral: peripheral)
             }
-        }
-        if sessionCharacteristic != nil, peripheralCanRead, peripheralCanWrite {
-            delegate?.peripheralConfigured(peripheral: peripheral)
         } else {
-            delegate?.peripheralNotConfigured(peripheral: peripheral)
+            readCounter = characteristics.count
+            for characteristic in characteristics {
+                if !characteristic.properties.contains(.read) {
+                    peripheralCanRead = false
+                }
+                if !characteristic.properties.contains(.write) {
+                    peripheralCanWrite = false
+                }
+                currentPeripheral?.discoverDescriptors(for: characteristic)
+            }
         }
     }
 
@@ -283,6 +309,22 @@ extension BLETransport: CBPeripheralDelegate {
         }
         transportToken.signal()
     }
+
+    func peripheral(_: CBPeripheral, didDiscoverDescriptorsFor characteristic: CBCharacteristic, error _: Error?) {
+        for descriptor in characteristic.descriptors! {
+            currentPeripheral?.readValue(for: descriptor)
+        }
+    }
+
+    func peripheral(_: CBPeripheral, didUpdateValueFor descriptor: CBDescriptor, error _: Error?) {
+        utility.processDescriptor(descriptor: descriptor)
+        readCounter -= 1
+        if readCounter < 1 {
+            if utility.peripheralConfigured {
+                delegate?.peripheralConfigured(peripheral: currentPeripheral!)
+            }
+        }
+    }
 }
 
 /// Delegate which will receive events relating to BLE device scanning
@@ -317,4 +359,8 @@ protocol BLETransportDelegate {
     ///   - peripheral: peripheral device
     ///   - error: error
     func peripheralDisconnected(peripheral: CBPeripheral, error: Error?)
+
+    /// Device Bluetooth is Off
+    ///
+    func bluetoothUnavailable()
 }
diff --git a/EspressifProvision/EspressifProvision/provision/transport/SoftAPTransport.swift b/EspressifProvision/EspressifProvision/provision/transport/SoftAPTransport.swift
index f5215fd..48af008 100644
--- a/EspressifProvision/EspressifProvision/provision/transport/SoftAPTransport.swift
+++ b/EspressifProvision/EspressifProvision/provision/transport/SoftAPTransport.swift
@@ -19,13 +19,21 @@
 import Foundation
 
 struct SoftAPTransport: Transport {
+    var utility: Utility
+
     var baseUrl: String
 
+    func isDeviceConfigured() -> Bool {
+        return true
+    }
+
     /// Create HTTP implementation of Transport protocol
     ///
     /// - Parameter baseUrl: base URL for the HTTP endpoints
     init(baseUrl: String) {
         self.baseUrl = baseUrl
+        utility = Utility()
+        utility.scanPath = "prov-scan"
     }
 
     private func SendHTTPData(path: String, data: Data, completionHandler: @escaping (Data?, Error?) -> Swift.Void) {
@@ -71,4 +79,6 @@ struct SoftAPTransport: Transport {
     func SendConfigData(path: String, data: Data, completionHandler: @escaping (Data?, Error?) -> Swift.Void) {
         SendHTTPData(path: path, data: data, completionHandler: completionHandler)
     }
+
+    func disconnect() {}
 }
diff --git a/EspressifProvision/EspressifProvision/provision/transport/Transport.swift b/EspressifProvision/EspressifProvision/provision/transport/Transport.swift
index 2c0bcb3..7f90013 100644
--- a/EspressifProvision/EspressifProvision/provision/transport/Transport.swift
+++ b/EspressifProvision/EspressifProvision/provision/transport/Transport.swift
@@ -29,6 +29,7 @@ enum TransportError: Error {
  * transport layer to send messages to the Device.
  */
 protocol Transport {
+    var utility: Utility { get }
     /// Send message data relating to session establishment.
     ///
     /// - Parameters:
@@ -43,4 +44,10 @@ protocol Transport {
     ///   - data: config data to be sent
     ///   - completionHandler: handler called when data is successfully sent and response is recieved
     func SendConfigData(path: String, data: Data, completionHandler: @escaping (Data?, Error?) -> Swift.Void)
+
+    func isDeviceConfigured() -> Bool
+
+    /// Disconnect current preipheral device
+    ///
+    func disconnect()
 }
diff --git a/EspressifProvision/EspressifProvision/provision/wifi/ScanWifiList.swift b/EspressifProvision/EspressifProvision/provision/wifi/ScanWifiList.swift
index 9bd082b..a78af1b 100644
--- a/EspressifProvision/EspressifProvision/provision/wifi/ScanWifiList.swift
+++ b/EspressifProvision/EspressifProvision/provision/wifi/ScanWifiList.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 protocol ScanWifiListProtocol {
-    func wifiScanFinished(wifiList: [String: Int32]?, error: Error?)
+    func wifiScanFinished(wifiList: [String: Espressif_WiFiScanResult]?, error: Error?)
 }
 
 enum CustomError: Error {
@@ -20,6 +20,7 @@ enum CustomError: Error {
 class ScanWifiList {
     private let transport: Transport
     private let security: Security
+    private var scanResult: [String: Espressif_WiFiScanResult] = [:]
 
     var delegate: ScanWifiListProtocol?
 
@@ -31,8 +32,8 @@ class ScanWifiList {
     func startWifiScan() {
         do {
             let payloadData = try createStartScanRequest()
-            if let data = payloadData {
-                transport.SendConfigData(path: Provision.PROVISIONING_SCAN_PATH, data: data) { response, error in
+            if let data = payloadData, let scanPath = transport.utility.scanPath {
+                transport.SendConfigData(path: scanPath, data: data) { response, error in
                     guard error == nil, response != nil else {
                         self.delegate?.wifiScanFinished(wifiList: nil, error: error)
                         return
@@ -60,8 +61,8 @@ class ScanWifiList {
     private func getWiFiScanStatus() {
         do {
             let payloadData = try createWifiScanConfigRequest()
-            if let data = payloadData {
-                transport.SendConfigData(path: Provision.PROVISIONING_SCAN_PATH, data: data) { response, error in
+            if let data = payloadData, let scanPath = transport.utility.scanPath {
+                transport.SendConfigData(path: scanPath, data: data) { response, error in
                     guard error == nil, response != nil else {
                         self.delegate?.wifiScanFinished(wifiList: nil, error: error)
                         return
@@ -95,16 +96,25 @@ class ScanWifiList {
         return resultCount
     }
 
-    func getScannedWiFiListResponse(count: UInt32) {
+    func getScannedWiFiListResponse(count: UInt32, startIndex: UInt32 = 0) {
         do {
-            let payloadData = try createWifiListConfigRequest(count: count)
-            if let data = payloadData {
-                transport.SendConfigData(path: Provision.PROVISIONING_SCAN_PATH, data: data) { response, error in
+            var lastFetch = false
+            var fetchCount: UInt32 = 4
+            if startIndex + 4 >= count {
+                fetchCount = count - startIndex
+                lastFetch = true
+            }
+            let payloadData = try createWifiListConfigRequest(startIndex: startIndex, count: fetchCount)
+            if let data = payloadData, let scanPath = transport.utility.scanPath {
+                transport.SendConfigData(path: scanPath, data: data) { response, error in
                     guard error == nil, response != nil else {
                         self.delegate?.wifiScanFinished(wifiList: nil, error: error)
                         return
                     }
-                    self.getScannedWifiSSIDs(response: response!)
+                    self.getScannedWifiSSIDs(response: response!, fetchFinish: lastFetch)
+                    if startIndex + fetchCount < count {
+                        self.getScannedWiFiListResponse(count: count, startIndex: startIndex + 4)
+                    }
                 }
             } else {
                 delegate?.wifiScanFinished(wifiList: nil, error: CustomError.emptyConfigData)
@@ -114,24 +124,25 @@ class ScanWifiList {
         }
     }
 
-    private func getScannedWifiSSIDs(response: Data) {
+    private func getScannedWifiSSIDs(response: Data, fetchFinish: Bool) {
         do {
             if let decryptedResponse = try security.decrypt(data: response) {
                 let payload = try Espressif_WiFiScanPayload(serializedData: decryptedResponse)
                 let responseList = payload.respScanResult
-                var result: [String: Int32] = [:]
                 for index in 0 ... responseList.entries.count - 1 {
                     let ssid = String(decoding: responseList.entries[index].ssid, as: UTF8.self)
                     let rssi = responseList.entries[index].rssi
-                    if let val = result[ssid] {
-                        if rssi > val {
-                            result[ssid] = rssi
+                    if let val = scanResult[ssid] {
+                        if rssi > val.rssi {
+                            scanResult[ssid] = val
                         }
                     } else {
-                        result[ssid] = rssi
+                        scanResult[ssid] = responseList.entries[index]
                     }
                 }
-                delegate?.wifiScanFinished(wifiList: result, error: nil)
+                if fetchFinish {
+                    delegate?.wifiScanFinished(wifiList: scanResult, error: nil)
+                }
             }
         } catch {
             delegate?.wifiScanFinished(wifiList: nil, error: error)
@@ -160,9 +171,9 @@ class ScanWifiList {
         return try security.encrypt(data: payload.serializedData())
     }
 
-    private func createWifiListConfigRequest(count: UInt32) throws -> Data? {
+    private func createWifiListConfigRequest(startIndex: UInt32, count: UInt32) throws -> Data? {
         var configRequest = Espressif_CmdScanResult()
-        configRequest.startIndex = 0
+        configRequest.startIndex = startIndex
         configRequest.count = count
         var payload = Espressif_WiFiScanPayload()
         payload.msg = Espressif_WiFiScanMsgType.typeCmdScanResult
diff --git a/EspressifProvision/EspressifProvision/provision/wifi/WifiListTableViewCell.swift b/EspressifProvision/EspressifProvision/provision/wifi/WifiListTableViewCell.swift
index 79653bd..944daf4 100644
--- a/EspressifProvision/EspressifProvision/provision/wifi/WifiListTableViewCell.swift
+++ b/EspressifProvision/EspressifProvision/provision/wifi/WifiListTableViewCell.swift
@@ -12,4 +12,5 @@ import UIKit
 class WifiListTableViewCell: UITableViewCell {
     @IBOutlet var ssidLabel: UILabel!
     @IBOutlet var signalImageView: UIImageView!
+    @IBOutlet var authenticationImageView: UIImageView!
 }
diff --git a/EspressifProvision/EspressifProvision/ui/AppInfoViewController.swift b/EspressifProvision/EspressifProvision/ui/AppInfoViewController.swift
new file mode 100644
index 0000000..946eed3
--- /dev/null
+++ b/EspressifProvision/EspressifProvision/ui/AppInfoViewController.swift
@@ -0,0 +1,32 @@
+//
+//  AppInfoViewController.swift
+//  EspressifProvision
+//
+//  Created by Vikas Chandra on 06/12/19.
+//  Copyright © 2019 Espressif. All rights reserved.
+//
+
+import UIKit
+
+class AppInfoViewController: UIViewController {
+    // App version info
+    @IBOutlet var appVersionLabel: UILabel!
+    let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? ""
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
+        appVersionLabel.text = "App Version: \(appVersion)"
+    }
+
+    /*
+     // MARK: - Navigation
+
+     // In a storyboard-based application, you will often want to do a little preparation before navigation
+     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+         // Get the new view controller using segue.destination.
+         // Pass the selected object to the new view controller.
+     }
+     */
+}
diff --git a/EspressifProvision/EspressifProvision/ui/BLEDeviceListViewCell.swift b/EspressifProvision/EspressifProvision/ui/BLEDeviceListViewCell.swift
new file mode 100644
index 0000000..43ef638
--- /dev/null
+++ b/EspressifProvision/EspressifProvision/ui/BLEDeviceListViewCell.swift
@@ -0,0 +1,14 @@
+//
+//  BLEDeviceListViewCell.swift
+//  EspressifProvision
+//
+//  Created by Vikas Chandra on 10/07/19.
+//  Copyright © 2019 Espressif. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+class BLEDeviceListViewCell: UITableViewCell {
+    @IBOutlet var deviceName: UILabel!
+}
diff --git a/EspressifProvision/EspressifProvision/ui/BLELandingViewController.swift b/EspressifProvision/EspressifProvision/ui/BLELandingViewController.swift
index 5bbba8a..27d3538 100644
--- a/EspressifProvision/EspressifProvision/ui/BLELandingViewController.swift
+++ b/EspressifProvision/EspressifProvision/ui/BLELandingViewController.swift
@@ -15,66 +15,74 @@
 //  BLELandingViewController.swift
 //  EspressifProvision
 //
-
 import CoreBluetooth
 import Foundation
+import MBProgressHUD
 import UIKit
 
+protocol BLEStatusProtocol {
+    func peripheralDisconnected()
+}
+
 class BLELandingViewController: UIViewController, UITableViewDelegate, UITableViewDataSource {
     var provisionConfig: [String: String] = [:]
     var bleTransport: BLETransport?
     var peripherals: [CBPeripheral]?
     var activityView: UIActivityIndicatorView?
     var grayView: UIView?
+    var delegate: BLEStatusProtocol?
+    var bleConnectTimer = Timer()
+    var bleDeviceConnected = false
 
     @IBOutlet var tableview: UITableView!
 
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        if let serviceUuid = provisionConfig[Provision.CONFIG_BLE_SERVICE_UUID],
-            let deviceNamePrefix = provisionConfig[Provision.CONFIG_BLE_DEVICE_NAME_PREFIX],
-            let sessionUuid = provisionConfig[Provision.CONFIG_BLE_SESSION_UUID],
-            let configUuid = provisionConfig[Provision.CONFIG_BLE_CONFIG_UUID] {
-            var configUUIDMap: [String: String] = [Provision.PROVISIONING_CONFIG_PATH: configUuid, Provision.PROVISIONING_SCAN_PATH: provisionConfig[Provision.CONFIG_BLE_SCAN_UUID]!]
-            #if AVS
-                let avsconfigUuid = provisionConfig[ConfigureAVS.AVS_CONFIG_UUID_KEY]
-                configUUIDMap[ConfigureAVS.AVS_CONFIG_PATH] = avsconfigUuid
-            #endif
-
-            bleTransport = BLETransport(serviceUUIDString: serviceUuid,
-                                        sessionUUIDString: sessionUuid,
-                                        configUUIDMap: configUUIDMap,
-                                        deviceNamePrefix: deviceNamePrefix,
-                                        scanTimeout: 5.0)
-            bleTransport?.scan(delegate: self)
-            showBusy(isBusy: true)
-        }
+        navigationItem.title = "Connect"
+        navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
+
+        // Scan for bluetooth devices
+        bleTransport = BLETransport(scanTimeout: 5.0)
+        bleTransport?.scan(delegate: self)
+        showBusy(isBusy: true, message: "Searching")
+
+        tableview.tableFooterView = UIView()
+        tableview.backgroundColor = UIColor.white
     }
 
     @IBAction func rescanBLEDevices(_: Any) {
+        bleTransport?.disconnect()
         peripherals?.removeAll()
         tableview.reloadData()
         bleTransport?.scan(delegate: self)
-        showBusy(isBusy: true)
+        showBusy(isBusy: true, message: "Searching")
     }
 
+    ///
+    /// Go to loging page when bluetooth device is successfully configured
+    ///
     func bleDeviceConfigured() {
         showBusy(isBusy: false)
-        let provisionVC = storyboard?.instantiateViewController(withIdentifier: "loginWithAmazon") as! LoginWithAmazonViewController
-        provisionVC.transport = bleTransport
-
-        provisionVC.provisionConfig = provisionConfig
-        navigationController?.pushViewController(provisionVC, animated: true)
+        let loginAVS = storyboard?.instantiateViewController(withIdentifier: "loginWithAmazon") as! LoginWithAmazonViewController
+        loginAVS.provisionConfig = provisionConfig
+        loginAVS.transport = bleTransport
+        navigationController?.pushViewController(loginAVS, animated: true)
     }
 
-    func bleDeviceNotConfigured() {
+    ///
+    /// Show alert if ble device is not configured
+    ///
+    func bleDeviceNotConfigured(title: String, message: String) {
+        bleDeviceConnected = true
         showBusy(isBusy: false)
-        let alertController = UIAlertController(title: "Configure BLE device", message: "Could not configure the selected bluetooth device", preferredStyle: UIAlertController.Style.alert)
-        alertController.addAction(UIAlertAction(title: "Okay", style: UIAlertAction.Style.default, handler: nil))
+        let alertController = UIAlertController(title: title, message: message, preferredStyle: UIAlertController.Style.alert)
+        alertController.addAction(UIAlertAction(title: "Ok", style: UIAlertAction.Style.default, handler: nil))
         present(alertController, animated: true, completion: nil)
     }
 
+    // MARK: // TableView Methods
+
     func tableView(_: UITableView, numberOfRowsInSection _: Int) -> Int {
         guard let peripherals = self.peripherals else {
             return 0
@@ -82,11 +90,10 @@ class BLELandingViewController: UIViewController, UITableViewDelegate, UITableVi
         return peripherals.count
     }
 
-    func tableView(_: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = UITableViewCell(style: .default, reuseIdentifier: "bleDeviceCell")
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: "bleDeviceCell", for: indexPath) as! BLEDeviceListViewCell
         if let peripheral: CBPeripheral = self.peripherals?[indexPath.row] {
-            cell.textLabel?.text = peripheral.name
-            cell.imageView?.image = UIImage(named: "bluetooth_icon")
+            cell.deviceName.text = peripheral.name
         }
 
         return cell
@@ -99,27 +106,31 @@ class BLELandingViewController: UIViewController, UITableViewDelegate, UITableVi
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
         if let peripheral = self.peripherals?[indexPath.row] {
+            showBusy(isBusy: true)
             bleTransport?.connect(peripheral: peripheral, withOptions: nil)
-            print(peripheral)
+            bleDeviceConnected = false
+            bleConnectTimer.invalidate()
+            bleConnectTimer = Timer.scheduledTimer(timeInterval: 20, target: self, selector: #selector(bleConnectionTimeout), userInfo: nil, repeats: false)
         }
-
-        showBusy(isBusy: true)
     }
 
-    private func showBusy(isBusy: Bool) {
-        if isBusy {
-            grayView = UIView(frame: UIScreen.main.bounds)
-            grayView?.backgroundColor = UIColor(white: 0.5, alpha: 0.5)
-            view.addSubview(grayView!)
-
-            activityView = UIActivityIndicatorView(style: .gray)
-            activityView?.center = view.center
-            activityView?.startAnimating()
+    private func showBusy(isBusy: Bool, message: String = "") {
+        DispatchQueue.main.async {
+            if isBusy {
+                let loader = MBProgressHUD.showAdded(to: self.view, animated: true)
+                loader.mode = MBProgressHUDMode.indeterminate
+                loader.label.text = message
+            } else {
+                MBProgressHUD.hide(for: self.view, animated: true)
+            }
+        }
+    }
 
-            view.addSubview(activityView!)
-        } else {
-            grayView?.removeFromSuperview()
-            activityView?.removeFromSuperview()
+    @objc func bleConnectionTimeout() {
+        if !bleDeviceConnected {
+            bleTransport?.disconnect()
+            bleConnectTimer.invalidate()
+            bleDeviceNotConfigured(title: "Error!", message: "Communication failed. Device may not be supported. ")
         }
     }
 }
@@ -136,17 +147,44 @@ extension BLELandingViewController: BLETransportDelegate {
     }
 
     func peripheralConfigured(peripheral _: CBPeripheral) {
+        bleDeviceConnected = true
         bleDeviceConfigured()
     }
 
     func peripheralNotConfigured(peripheral _: CBPeripheral) {
-        bleDeviceNotConfigured()
+        bleDeviceNotConfigured(title: "Configure BLE device", message: "Could not configure the selected bluetooth device")
     }
 
     func peripheralDisconnected(peripheral: CBPeripheral, error _: Error?) {
-        let alertMessage = "Peripheral device disconnected"
-        let alertController = UIAlertController(title: "Provision device", message: alertMessage, preferredStyle: UIAlertController.Style.alert)
-        alertController.addAction(UIAlertAction(title: "Okay", style: UIAlertAction.Style.default, handler: nil))
-        present(alertController, animated: true, completion: nil)
+        showBusy(isBusy: false)
+
+        if delegate == nil {
+            let alertMessage = "Peripheral device disconnected"
+            let alertController = UIAlertController(title: "Provision device", message: alertMessage, preferredStyle: UIAlertController.Style.alert)
+            alertController.addAction(UIAlertAction(title: "Ok", style: UIAlertAction.Style.default, handler: nil))
+            present(alertController, animated: true, completion: nil)
+        } else {
+            delegate?.peripheralDisconnected()
+        }
+    }
+
+    func bluetoothUnavailable() {
+        DispatchQueue.main.async {
+            let alertMessage = "Turn on your Phone's Bluetooth to allow search for discoverable device's"
+            let alertController = UIAlertController(title: "Error", message: alertMessage, preferredStyle: UIAlertController.Style.alert)
+            alertController.addAction(UIAlertAction(title: "Ok", style: UIAlertAction.Style.default, handler: nil))
+            self.present(alertController, animated: true, completion: nil)
+            MBProgressHUD.hide(for: self.view, animated: true)
+        }
+    }
+}
+
+// MARK: UITextFieldDelegate
+
+extension BLELandingViewController: UITextFieldDelegate {
+    func textFieldShouldReturn(_: UITextField) -> Bool {
+        view.endEditing(true)
+        rescanBLEDevices(self)
+        return false
     }
 }
diff --git a/EspressifProvision/EspressifProvision/ui/LoginWithAmazonViewController.swift b/EspressifProvision/EspressifProvision/ui/LoginWithAmazonViewController.swift
index 10201bf..1c045a0 100644
--- a/EspressifProvision/EspressifProvision/ui/LoginWithAmazonViewController.swift
+++ b/EspressifProvision/EspressifProvision/ui/LoginWithAmazonViewController.swift
@@ -22,43 +22,39 @@ import UIKit
 class LoginWithAmazonViewController: UIViewController {
     var provisionConfig: [String: String] = [:]
     var transport: Transport?
-    var secu: Security?
-    var newSession: Session?
-    var bleTransport: BLETransport?
+    var security: Security?
+    var session: Session?
     var configureAvs: ConfigureAVS?
     var waiter: Bool?
     var deviceDetails: [String] = ["", "", ""]
+    var deviceName: String?
+    var capabilities: [String]?
 
     override func viewDidLoad() {
         super.viewDidLoad()
         // Do any additional setup after loading the view, typically from a nib.
+        navigationItem.title = deviceName ?? ""
+
+        // Add skip button
+        let rightBarButton = UIBarButtonItem(title: "Skip", style: .plain, target: self, action: #selector(skipAction))
+        navigationItem.rightBarButtonItem = rightBarButton
+        navigationItem.rightBarButtonItem?.tintColor = UIColor.white
+        navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
+
+        // Initiate session to pass data with device
+        Constants.showLoader(message: "", view: view)
+        initialiseSession()
+    }
+
+    @objc func skipAction() {
+        navigateToProvisionVC(result: nil)
     }
 
     @IBAction func onAmazonLoginClicked(_: Any) {
-        let bleConfigUuid = provisionConfig[Provision.CONFIG_BLE_CONFIG_UUID]
-        var configUUIDMap: [String: String] = [Provision.PROVISIONING_CONFIG_PATH: bleConfigUuid!]
-        let avsconfigUuid = provisionConfig[ConfigureAVS.AVS_CONFIG_UUID_KEY]
-        configUUIDMap[ConfigureAVS.AVS_CONFIG_PATH] = avsconfigUuid
-
-        bleTransport = BLETransport(
-            serviceUUIDString: provisionConfig[Provision.CONFIG_BLE_SERVICE_UUID],
-            sessionUUIDString: provisionConfig[Provision.CONFIG_BLE_SESSION_UUID]!,
-
-            configUUIDMap: configUUIDMap,
-            deviceNamePrefix: provisionConfig[Provision.CONFIG_BLE_DEVICE_NAME_PREFIX]!,
-            scanTimeout: 5.0
-        )
-
-        let securityVersion = provisionConfig[Provision.CONFIG_SECURITY_KEY]
-        let pop = provisionConfig[Provision.CONFIG_PROOF_OF_POSSESSION_KEY]
-        if securityVersion == Provision.CONFIG_SECURITY_SECURITY1 {
-            secu = Security1(proofOfPossession: pop!)
-        } else {
-            secu = Security0()
-        }
+        Constants.showLoader(message: "Signing in", view: view)
 
         do {
-            getDeviceDetails(tras: bleTransport!, secu: secu as! Security1) { _ in
+            getDeviceDetails(tras: transport!, secu: security as! Security1) { _ in
                 self.callLWA()
             }
         }
@@ -67,59 +63,97 @@ class LoginWithAmazonViewController: UIViewController {
     private func getDeviceDetails(tras _: Transport,
                                   secu _: Security1,
                                   completionHandler: @escaping (String) -> Swift.Void) {
-        let newSession = Session(transport: transport!,
-                                 security: secu!)
+        let prov = Provision(session: session!)
+        deviceDetails = prov.getAVSDeviceDetails(completionHandler: { _, error in
+            guard error == nil else {
+                print(error!)
 
-        newSession.initialize(response: nil) { error in
+                return
+            }
+
+            completionHandler("nil")
+        })
+        return
+    }
+
+    private func initialiseSession() {
+        DispatchQueue.main.async {
+            let input = UIAlertController(title: "Proof of Possession", message: nil, preferredStyle: .alert)
+
+            input.addTextField { textField in
+                textField.text = "abcd1234"
+            }
+            input.addAction(UIAlertAction(title: "Cancel", style: .destructive, handler: { _ in
+                self.transport?.disconnect()
+                self.navigationController?.popViewController(animated: true)
+            }))
+            input.addAction(UIAlertAction(title: "Done", style: .default, handler: { [weak input] _ in
+                let textField = input?.textFields![0]
+                self.provisionConfig[Provision.CONFIG_PROOF_OF_POSSESSION_KEY] = textField?.text ?? ""
+                self.security = Security1(proofOfPossession: self.provisionConfig[Provision.CONFIG_PROOF_OF_POSSESSION_KEY]!)
+                Constants.hideLoader(view: self.view)
+                self.initSession()
+            }))
+            self.present(input, animated: true, completion: nil)
+        }
+    }
+
+    func initSession() {
+        Constants.showLoader(message: "Initiating Session", view: view)
+        session = Session(transport: transport!,
+                          security: security!)
+        session!.initialize(response: nil) { error in
+            DispatchQueue.main.async {
+                Constants.hideLoader(view: self.view)
+            }
             guard error == nil else {
                 print("Error in establishing session \(error.debugDescription)")
+                self.showStatusScreen()
                 return
             }
-            if newSession.isEstablished {
-                var prov: Provision
-                prov = Provision(session: newSession)
-                self.deviceDetails = prov.getAVSDeviceDetails(completionHandler: { _, error in
-                    guard error == nil else {
-                        print(error!)
-
-                        return
-                    }
-
-                    completionHandler("nil")
-                    //                    self.callLWA()
-                })
+        }
+    }
+
+    func showStatusScreen() {
+        DispatchQueue.main.async {
+            let statusVC = self.storyboard?.instantiateViewController(withIdentifier: "successViewController") as! StatusViewController
+            statusVC.statusText = "Error establishing session.\n Check if Proof of Possession(POP) is correct!"
+            self.navigationController?.present(statusVC, animated: true, completion: nil)
+        }
+    }
+
+    private func navigateToProvisionVC(result: [String: String]?) {
+        var config = provisionConfig
+        if let results = result {
+            results.forEach { config[$0] = $1 }
+        }
+        DispatchQueue.main.async {
+            let transportVersion = config[Provision.CONFIG_TRANSPORT_KEY]
+            if let transportVersion = transportVersion, transportVersion == Provision.CONFIG_TRANSPORT_BLE {
+                let provisionVC = self.storyboard?.instantiateViewController(withIdentifier: "provision") as! ProvisionViewController
+                provisionVC.provisionConfig = config
+                provisionVC.avsDetails = result
+                provisionVC.transport = self.transport
+                provisionVC.security = self.security!
+                provisionVC.session = self.session!
+                self.navigationController?.pushViewController(provisionVC, animated: true)
+            } else {
+                let provisionLandingVC = self.storyboard?.instantiateViewController(withIdentifier: "provisionLanding") as! ProvisionLandingViewController
+                provisionLandingVC.provisionConfig = config
+                self.navigationController?.pushViewController(provisionLandingVC, animated: true)
             }
         }
-        return
     }
 
     public func callLWA() {
         DispatchQueue.main.async {
             ConfigureAVS.loginWithAmazon { results, error in
+                Constants.hideLoader(view: self.view)
                 if error != nil {
                     print(error.debugDescription)
                 } else if let results = results {
-                    // Write AVS details to device
-//                print(results)
-//                self.putAVSDetails(results: results)
                     self.waiter = true
-                    var config = self.provisionConfig
-                    results.forEach { config[$0] = $1 }
-                    DispatchQueue.main.async {
-                        let transportVersion = config[Provision.CONFIG_TRANSPORT_KEY]
-                        if let transportVersion = transportVersion, transportVersion == Provision.CONFIG_TRANSPORT_BLE {
-                            let provisionVC = self.storyboard?.instantiateViewController(withIdentifier: "provision") as! ProvisionViewController
-                            provisionVC.provisionConfig = config
-                            provisionVC.avsDetails = results
-                            provisionVC.transport = self.transport
-                            provisionVC.security = self.secu
-                            self.navigationController?.pushViewController(provisionVC, animated: true)
-                        } else {
-                            let provisionLandingVC = self.storyboard?.instantiateViewController(withIdentifier: "provisionLanding") as! ProvisionLandingViewController
-                            provisionLandingVC.provisionConfig = config
-                            self.navigationController?.pushViewController(provisionLandingVC, animated: true)
-                        }
-                    }
+                    self.navigateToProvisionVC(result: results)
                 }
             }
         }
diff --git a/EspressifProvision/EspressifProvision/ui/ManageDevice/AboutViewController.swift b/EspressifProvision/EspressifProvision/ui/ManageDevice/AboutViewController.swift
new file mode 100644
index 0000000..b0b1054
--- /dev/null
+++ b/EspressifProvision/EspressifProvision/ui/ManageDevice/AboutViewController.swift
@@ -0,0 +1,32 @@
+//
+//  AboutViewController.swift
+//  EspressifProvision
+//
+//  Created by Vikas Chandra on 19/11/19.
+//  Copyright © 2019 Espressif. All rights reserved.
+//
+
+import UIKit
+
+class AboutViewController: UIViewController {
+    @IBOutlet var deviceNameLabel: UILabel!
+    @IBOutlet var wifiLabel: UILabel!
+    @IBOutlet var ipAddressLabel: UILabel!
+    @IBOutlet var macLabel: UILabel!
+    @IBOutlet var serialNumberLabel: UILabel!
+    @IBOutlet var firmwareVersionLabel: UILabel!
+
+    var device: AlexaDevice!
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+        deviceNameLabel.text = device.deviceName ?? ""
+        wifiLabel.text = device.connectedWifi ?? ""
+        ipAddressLabel.text = device.hostAddress ?? ""
+        macLabel.text = device.mac ?? ""
+        serialNumberLabel.text = device.serialNumber ?? ""
+        firmwareVersionLabel.text = device.fwVersion ?? ""
+    }
+}
diff --git a/EspressifProvision/EspressifProvision/ui/ManageDevice/DeviceDetailViewController.swift b/EspressifProvision/EspressifProvision/ui/ManageDevice/DeviceDetailViewController.swift
index a9a6065..0f36321 100644
--- a/EspressifProvision/EspressifProvision/ui/ManageDevice/DeviceDetailViewController.swift
+++ b/EspressifProvision/EspressifProvision/ui/ManageDevice/DeviceDetailViewController.swift
@@ -14,13 +14,13 @@ class DeviceDetailViewController: UIViewController {
     var loginStatus = false
     var device: AlexaDevice?
     var avsConfig: ConfigureAVS?
+    var session: Session!
     @IBOutlet var signedInViewContainer: UIView!
     @IBOutlet var signedOutViewContainer: UIView!
+    @IBOutlet var learnMoreTextView: UITextView!
 
     override func viewDidLoad() {
         let label = UILabel(frame: CGRect(x: 10, y: 0, width: 50, height: 40))
-//        label.backgroundColor = .red
-//        label.font = UIFont.boldSystemFont(ofSize: 14)
 
         label.text = device?.friendlyname
         label.numberOfLines = 2
@@ -28,7 +28,26 @@ class DeviceDetailViewController: UIViewController {
         label.sizeToFit()
         label.textAlignment = .center
 
-        navigationItem.titleView = label
+        navigationItem.title = device?.friendlyname
+
+        let attributedString = NSMutableAttributedString(string: "To learn more and access additional features, download the Alexa App")
+        let url = URL(string: "alexa://")!
+        var redirectURL = url
+        if !UIApplication.shared.canOpenURL(url) {
+            redirectURL = URL(string: "https://apps.apple.com/in/app/amazon-alexa/id944011620")!
+        }
+
+        attributedString.setAttributes([.link: redirectURL], range: NSRange(location: attributedString.length - 9, length: 9))
+        learnMoreTextView.attributedText = attributedString
+        learnMoreTextView.isUserInteractionEnabled = true
+        learnMoreTextView.isEditable = false
+
+        // Set how links should appear: blue and underlined
+        learnMoreTextView.linkTextAttributes = [
+            .foregroundColor: UIColor.blue,
+            .underlineStyle: NSUnderlineStyle.single.rawValue,
+        ]
+        learnMoreTextView.textAlignment = .center
     }
 
     override func viewWillAppear(_: Bool) {
@@ -38,43 +57,33 @@ class DeviceDetailViewController: UIViewController {
 
     @IBAction func signInAmazon(_: Any) {
         Constants.showLoader(message: "Signing In", view: view)
-        let transport = SoftAPTransport(baseUrl: device!.hostAddress! + ":80")
-        let security = Security0()
-        let session = Session(transport: transport, security: security)
-        session.initialize(response: nil) { error in
-            guard error == nil else {
-                print("Error in establishing session \(error.debugDescription)")
-                MBProgressHUD.hide(for: self.view, animated: true)
-                return
-            }
-            if session.isEstablished {
-                let prov = Provision(session: session)
-                _ = prov.getAVSDeviceDetails(completionHandler: { _, error in
-                    guard error == nil else {
-                        print(error!)
-                        DispatchQueue.main.async {
-                            MBProgressHUD.hide(for: self.view, animated: true)
-                        }
-                        return
-                    }
+        if session.isEstablished {
+            let prov = Provision(session: session)
+            _ = prov.getAVSDeviceDetails(completionHandler: { _, error in
+                guard error == nil else {
+                    print(error!)
                     DispatchQueue.main.async {
-                        ConfigureAVS.loginWithAmazon(completionHandler: { avsDetails, error in
-                            if error == nil {
-                                prov.putAVSDeviceDetails(config: avsDetails!, completionHandler: {
-                                    DispatchQueue.main.async {
-                                        self.loginStatus = true
-                                        self.updateUIView()
-                                    }
-                                })
-                            }
-                            MBProgressHUD.hide(for: self.view, animated: true)
-                        })
+                        MBProgressHUD.hide(for: self.view, animated: true)
                     }
-                })
-            } else {
+                    return
+                }
                 DispatchQueue.main.async {
-                    MBProgressHUD.hide(for: self.view, animated: true)
+                    ConfigureAVS.loginWithAmazon(completionHandler: { avsDetails, error in
+                        if error == nil {
+                            prov.putAVSDeviceDetails(config: avsDetails!, completionHandler: {
+                                DispatchQueue.main.async {
+                                    self.loginStatus = true
+                                    self.updateUIView()
+                                }
+                            })
+                        }
+                        MBProgressHUD.hide(for: self.view, animated: true)
+                    })
                 }
+            })
+        } else {
+            DispatchQueue.main.async {
+                MBProgressHUD.hide(for: self.view, animated: true)
             }
         }
     }
@@ -97,6 +106,7 @@ class DeviceDetailViewController: UIViewController {
     func updateUIView() {
         if loginStatus {
             navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Sign Out", style: .plain, target: self, action: #selector(signOut))
+            navigationItem.rightBarButtonItem?.tintColor = UIColor.white
             signedInViewContainer.isHidden = false
             signedOutViewContainer.isHidden = true
         } else {
diff --git a/EspressifProvision/EspressifProvision/ui/ManageDevice/DeviceSettingViewController.swift b/EspressifProvision/EspressifProvision/ui/ManageDevice/DeviceSettingViewController.swift
new file mode 100644
index 0000000..35f0dfa
--- /dev/null
+++ b/EspressifProvision/EspressifProvision/ui/ManageDevice/DeviceSettingViewController.swift
@@ -0,0 +1,139 @@
+//
+//  DeviceSettingViewController.swift
+//  EspressifProvision
+//
+//  Created by Vikas Chandra on 12/11/19.
+//  Copyright © 2019 Espressif. All rights reserved.
+//
+
+import PickerView
+import UIKit
+
+class DeviceSettingViewController: UIViewController {
+    @IBOutlet var deviceNameLabel: UILabel!
+    @IBOutlet var languageLabel: UILabel!
+    @IBOutlet var volumeSlider: UISlider!
+    @IBOutlet var volumeLabel: UILabel!
+    @IBOutlet var pickerView: UIPickerView!
+
+    var configureDevice: ConfigureDevice!
+    var session: Session!
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+
+        deviceNameLabel.text = configureDevice.alexaDevice.deviceName ?? ""
+        volumeSlider.value = Float(configureDevice.alexaDevice.volume ?? 0)
+        volumeLabel.text = "\(configureDevice.alexaDevice.volume ?? 0)"
+        languageLabel.text = configureDevice.languages[configureDevice.alexaDevice.language?.rawValue ?? 0]
+    }
+
+    func showDeviceDetails(device: AlexaDevice, avsConfig: ConfigureAVS, loginStatus: Bool = false) {
+        DispatchQueue.main.async {
+            let deviceDetailVC = self.storyboard?.instantiateViewController(withIdentifier: Constants.deviceDetailVCIndentifier) as! DeviceDetailViewController
+            deviceDetailVC.avsConfig = avsConfig
+            deviceDetailVC.loginStatus = loginStatus
+            deviceDetailVC.session = self.session
+            deviceDetailVC.device = device
+            self.navigationController?.pushViewController(deviceDetailVC, animated: true)
+        }
+    }
+
+    private func addHeightConstraint(textField: UITextField) {
+        let heightConstraint = NSLayoutConstraint(item: textField, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .notAnAttribute, multiplier: 1, constant: 30)
+        textField.addConstraint(heightConstraint)
+        textField.font = UIFont(name: textField.font!.fontName, size: 18)
+    }
+
+    // MARK: IBAction Methods
+
+    @IBAction func setDeviceName(_: Any) {
+        let input = UIAlertController(title: "Device name", message: nil, preferredStyle: .alert)
+
+        input.addTextField { textField in
+            textField.text = self.configureDevice.alexaDevice.deviceName ?? ""
+            textField.delegate = self
+            self.addHeightConstraint(textField: textField)
+        }
+        input.addAction(UIAlertAction(title: "Cancel", style: .destructive, handler: { _ in
+
+        }))
+        input.addAction(UIAlertAction(title: "Done", style: .default, handler: { [weak input] _ in
+            let textField = input?.textFields![0]
+            if let name = textField?.text {
+                if name != self.configureDevice.alexaDevice.deviceName, name != "" {
+                    Constants.showLoader(message: "Setting device name", view: self.view)
+                    self.configureDevice.setDeviceName(withName: name) { result in
+                        DispatchQueue.main.async {
+                            Constants.hideLoader(view: self.view)
+                            if result {
+                                self.deviceNameLabel.text = name
+                                self.configureDevice.alexaDevice.deviceName = name
+                            }
+                        }
+                    }
+                }
+            }
+        }))
+        present(input, animated: true, completion: nil)
+    }
+
+    @IBAction func setDeviceVolume(_ sender: UISlider) {
+        Constants.showLoader(message: "Setting device volume", view: view)
+        let volume = UInt32(sender.value)
+        configureDevice.setDeviceVolume(volume: volume) { result in
+            DispatchQueue.main.async {
+                Constants.hideLoader(view: self.view)
+                if result {
+                    self.volumeLabel.text = "\(volume)"
+                    self.configureDevice.alexaDevice.volume = volume
+                }
+                self.volumeSlider.value = Float(self.configureDevice.alexaDevice.volume ?? 0)
+            }
+        }
+    }
+
+    @IBAction func setSoundClicked(_: Any) {
+        let soundSettingVC = storyboard?.instantiateViewController(withIdentifier: Constants.soundSettingVCIdentifier) as! SoundSettingViewController
+        soundSettingVC.configureDevice = configureDevice
+        navigationController?.pushViewController(soundSettingVC, animated: true)
+    }
+
+    @IBAction func setLanguageClicked(_: Any) {
+        let languageListVC = storyboard?.instantiateViewController(withIdentifier: Constants.languageListVCIdentifier) as! LanguageListTableViewController
+        languageListVC.configureDevice = configureDevice
+        navigationController?.pushViewController(languageListVC, animated: true)
+    }
+
+    @IBAction func aboutBtnClicked(_: Any) {
+        let aboutVC = storyboard?.instantiateViewController(withIdentifier: Constants.aboutVCIdentifier) as! AboutViewController
+        aboutVC.device = configureDevice.alexaDevice
+        navigationController?.pushViewController(aboutVC, animated: true)
+    }
+
+    @IBAction func manageAccountClicked(_: Any) {
+        let avsConfig = ConfigureAVS(session: session)
+        avsConfig.isLoggedIn(completionHandler: { status in
+            self.showDeviceDetails(device: self.configureDevice.alexaDevice, avsConfig: avsConfig, loginStatus: status)
+        })
+    }
+}
+
+// MARK: UITextFieldDelegate
+
+/*
+ Over riding UITextField method in order to restrict the textfield to 22 characters only.
+ */
+extension DeviceSettingViewController: UITextFieldDelegate {
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        let maxLength = 22
+        let currentString: NSString = textField.text! as NSString
+        let newString: NSString =
+            currentString.replacingCharacters(in: range, with: string) as NSString
+        return newString.length <= maxLength
+    }
+}
diff --git a/EspressifProvision/EspressifProvision/ui/ManageDevice/LanguageListTableViewController.swift b/EspressifProvision/EspressifProvision/ui/ManageDevice/LanguageListTableViewController.swift
new file mode 100644
index 0000000..3ae5151
--- /dev/null
+++ b/EspressifProvision/EspressifProvision/ui/ManageDevice/LanguageListTableViewController.swift
@@ -0,0 +1,66 @@
+//
+//  LanguageListTableViewController.swift
+//  EspressifProvision
+//
+//  Created by Vikas Chandra on 20/11/19.
+//  Copyright © 2019 Espressif. All rights reserved.
+//
+
+import UIKit
+
+class LanguageListTableViewController: UITableViewController {
+    var configureDevice: ConfigureDevice!
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+    }
+
+    // MARK: - Table view data source
+
+    override func numberOfSections(in _: UITableView) -> Int {
+        // #warning Incomplete implementation, return the number of sections
+        return 1
+    }
+
+    override func tableView(_: UITableView, numberOfRowsInSection _: Int) -> Int {
+        // #warning Incomplete implementation, return the number of rows
+        return configureDevice.languages.count
+    }
+
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: "languageListCell", for: indexPath)
+        cell.textLabel?.text = configureDevice.languages[indexPath.row]
+        if configureDevice.alexaDevice.language?.rawValue == indexPath.row {
+            cell.accessoryType = .checkmark
+        } else {
+            cell.accessoryType = .none
+        }
+
+        return cell
+    }
+
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        tableView.deselectRow(at: indexPath, animated: true)
+        if indexPath.row != configureDevice.alexaDevice.language?.rawValue {
+            Constants.showLoader(message: "Setting language", view: view)
+            configureDevice.setDeviceLanguage(value: indexPath.row) { result in
+                DispatchQueue.main.async {
+                    Constants.hideLoader(view: self.view)
+                    if result {
+                        tableView.cellForRow(at: IndexPath(row: self.configureDevice.alexaDevice.language?.rawValue ?? 0, section: 0))?.accessoryType = .none
+                        self.configureDevice.alexaDevice.language = Avs_Locale(rawValue: indexPath.row)
+                        tableView.cellForRow(at: indexPath)?.accessoryType = .checkmark
+                    }
+                }
+            }
+        }
+    }
+
+    override func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) {
+        tableView.cellForRow(at: indexPath)?.accessoryType = .none
+    }
+
+    override func tableView(_: UITableView, heightForRowAt _: IndexPath) -> CGFloat {
+        return 60.0
+    }
+}
diff --git a/EspressifProvision/EspressifProvision/ui/ManageDevice/ScannedLocalDevicesVC.swift b/EspressifProvision/EspressifProvision/ui/ManageDevice/ScannedLocalDevicesVC.swift
index db4cd16..8418717 100644
--- a/EspressifProvision/EspressifProvision/ui/ManageDevice/ScannedLocalDevicesVC.swift
+++ b/EspressifProvision/EspressifProvision/ui/ManageDevice/ScannedLocalDevicesVC.swift
@@ -18,36 +18,45 @@ class ScannedLocalDevicesVC: UIViewController {
     var retry = 3
     var searchTarget = "urn:schemas-espressif-com:service:Alexa:1"
     var alexaDevices: [AlexaDevice] = []
+    var configureDevice: ConfigureDevice!
+    var session: Session!
 
     override func viewDidLoad() {
+        // Clearing navigation bar back button text
+        navigationItem.title = "Devices"
+        navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
+
+        // Assigning delegates
         ssdpDiscovery.delegate = self
         tableView.tableFooterView = UIView()
         tableView.isHidden = true
+
+        // Start SSDP discovery for local devices
         Constants.showLoader(message: "Scanning devices", view: view)
         searchLocalDevices()
     }
 
+    /*
+     Method to refresh local devices list
+     */
     @IBAction func scanDevicesAgain(_: Any) {
         retry = 3
         Constants.showLoader(message: "Scanning devices", view: view)
         searchLocalDevices()
     }
 
+    /*
+     Search for local devices using ssdp class
+     */
     @objc func searchLocalDevices() {
         ssdpDiscovery.discoverService(forDuration: timeInterval, searchTarget: searchTarget)
     }
 
-    func parseResponse(header: String) -> [String: String] {
-        var dictionary: [String: String] = [:]
-        for item in header.components(separatedBy: "::") {
-            let value = item.components(separatedBy: ":")
-            dictionary.updateValue(value[1], forKey: value[0])
-        }
-        return dictionary
-    }
-
+    /*
+     Check if search for devices should be retried based on number of devices returned
+     */
     @objc func checkNeedForReDiscovery() {
-        if retry != 0 {
+        if retry > 0 {
             if alexaDevices.filter({ $0.friendlyname == nil }).count > 0 {
                 retry -= 1
                 searchLocalDevices()
@@ -66,17 +75,33 @@ class ScannedLocalDevicesVC: UIViewController {
         }
     }
 
+    func parseResponse(header: String) -> [String: String] {
+        var dictionary: [String: String] = [:]
+        for item in header.components(separatedBy: "::") {
+            let value = item.components(separatedBy: ":")
+            dictionary.updateValue(value[1], forKey: value[0])
+        }
+        return dictionary
+    }
+
+    /*
+     On click of any device, device info will fetched. This will present us with a new screen where all the details of the device will
+     be displayed
+     */
     func showDeviceDetails(device: AlexaDevice, avsConfig: ConfigureAVS, loginStatus: Bool = false) {
         DispatchQueue.main.async {
             let deviceDetailVC = self.storyboard?.instantiateViewController(withIdentifier: Constants.deviceDetailVCIndentifier) as! DeviceDetailViewController
             deviceDetailVC.avsConfig = avsConfig
             deviceDetailVC.loginStatus = loginStatus
             deviceDetailVC.device = device
+            deviceDetailVC.session = self.session
             self.navigationController?.pushViewController(deviceDetailVC, animated: true)
         }
     }
 }
 
+// MARK: SSDPDiscoveryDelegate
+
 extension ScannedLocalDevicesVC: SSDPDiscoveryDelegate {
     func ssdpDiscovery(_: SSDPDiscovery, didDiscoverService service: SSDPService) {
         let dictionary = parseResponse(header: service.uniqueServiceName ?? "")
@@ -100,6 +125,7 @@ extension ScannedLocalDevicesVC: SSDPDiscoveryDelegate {
     }
 
     func ssdpDiscovery(_: SSDPDiscovery, didFinishWithError error: Error) {
+        retry = -1
         print(error)
     }
 
@@ -110,33 +136,39 @@ extension ScannedLocalDevicesVC: SSDPDiscoveryDelegate {
     }
 }
 
+// MARK: UITableViewDelegate
+
 extension ScannedLocalDevicesVC: UITableViewDelegate {
     func tableView(_: UITableView, heightForRowAt _: IndexPath) -> CGFloat {
         return 60.0
     }
 
     func tableView(_: UITableView, didSelectRowAt indexPath: IndexPath) {
+        Constants.showLoader(message: "Getting device info", view: view)
         let alexaDevice = alexaDevices[indexPath.row]
         let transport = SoftAPTransport(baseUrl: alexaDevice.hostAddress! + ":80")
         let security = Security0()
-        let session = Session(transport: transport, security: security)
+        session = Session(transport: transport, security: security)
         session.initialize(response: nil) { error in
             guard error == nil else {
+                Constants.hideLoader(view: self.view)
                 print("Error in establishing session \(error.debugDescription)")
                 return
             }
-            let avsConfig = ConfigureAVS(session: session)
-            avsConfig.isLoggedIn(completionHandler: { status in
-                self.showDeviceDetails(device: alexaDevice, avsConfig: avsConfig, loginStatus: status)
-            })
+            self.configureDevice = ConfigureDevice(session: self.session, device: alexaDevice)
+            self.configureDevice.delegate = self
+            self.configureDevice.getDeviceInfo()
         }
+        tableView.deselectRow(at: indexPath, animated: true)
     }
 }
 
+// MARK: UITableViewDataSource
+
 extension ScannedLocalDevicesVC: UITableViewDataSource {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: Constants.deviceListCellReuseIdentifier, for: indexPath) as! DeviceListTableViewCell
-        cell.deviceNameLabel.text = "\(alexaDevices[indexPath.row].friendlyname ?? "") | \(alexaDevices[indexPath.row].hostAddress ?? "")"
+        let cell = tableView.dequeueReusableCell(withIdentifier: Constants.deviceListCellReuseIdentifier, for: indexPath) as! BLEDeviceListViewCell
+        cell.deviceName.text = alexaDevices[indexPath.row].friendlyname ?? ""
         return cell
     }
 
@@ -144,3 +176,24 @@ extension ScannedLocalDevicesVC: UITableViewDataSource {
         return alexaDevices.count
     }
 }
+
+// MARK: GetDeviceInfoDelegate
+
+extension ScannedLocalDevicesVC: GetDeviceInfoDelegate {
+    func deviceInfoFetched(alexaDevice: AlexaDevice?) {
+        DispatchQueue.main.async {
+            Constants.hideLoader(view: self.view)
+            if alexaDevice != nil {
+                let deviceSettingVC = self.storyboard?.instantiateViewController(withIdentifier: Constants.deviceSettingVCIndentifier) as! DeviceSettingViewController
+                deviceSettingVC.configureDevice = self.configureDevice
+                deviceSettingVC.session = self.session
+                self.navigationController?.pushViewController(deviceSettingVC, animated: true)
+            } else {
+                let avsConfig = ConfigureAVS(session: self.session)
+                avsConfig.isLoggedIn(completionHandler: { status in
+                    self.showDeviceDetails(device: self.configureDevice.alexaDevice, avsConfig: avsConfig, loginStatus: status)
+                })
+            }
+        }
+    }
+}
diff --git a/EspressifProvision/EspressifProvision/ui/ManageDevice/SoundSettingViewController.swift b/EspressifProvision/EspressifProvision/ui/ManageDevice/SoundSettingViewController.swift
new file mode 100644
index 0000000..0879a6c
--- /dev/null
+++ b/EspressifProvision/EspressifProvision/ui/ManageDevice/SoundSettingViewController.swift
@@ -0,0 +1,58 @@
+//
+//  SoundSettingViewController.swift
+//  EspressifProvision
+//
+//  Created by Vikas Chandra on 18/11/19.
+//  Copyright © 2019 Espressif. All rights reserved.
+//
+
+import UIKit
+
+class SoundSettingViewController: UIViewController {
+    var configureDevice: ConfigureDevice!
+
+    @IBOutlet var endOfRequestSwitch: UISwitch!
+    @IBOutlet var startOfRequestSwitch: UISwitch!
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        startOfRequestSwitch.setOn(configureDevice.alexaDevice.startToneEnabled ?? false, animated: false)
+        endOfRequestSwitch.setOn(configureDevice.alexaDevice.endToneEnabled ?? false, animated: false)
+    }
+
+    @IBAction func setDeviceStartTone(_ sender: UISwitch) {
+        DispatchQueue.main.async {
+            Constants.showLoader(message: "Applying configuration", view: self.view)
+        }
+        configureDevice.setDeviceStartTone(value: sender.isOn) { result in
+            DispatchQueue.main.async {
+                Constants.hideLoader(view: self.view)
+                if result {
+                    self.configureDevice.alexaDevice.startToneEnabled = sender.isOn
+                } else {
+                    sender.setOn(!sender.isOn, animated: true)
+                }
+            }
+        }
+    }
+
+    @IBAction func setDeviceEndTone(_ sender: UISwitch) {
+        DispatchQueue.main.async {
+            Constants.showLoader(message: "Applying configuration", view: self.view)
+        }
+        configureDevice.setDeviceEndTone(value: sender.isOn) { result in
+            DispatchQueue.main.async {
+                Constants.hideLoader(view: self.view)
+                if result {
+                    self.configureDevice.alexaDevice.endToneEnabled = sender.isOn
+                } else {
+                    sender.setOn(!sender.isOn, animated: true)
+                }
+            }
+        }
+    }
+}
diff --git a/EspressifProvision/EspressifProvision/ui/ProvisionViewController.swift b/EspressifProvision/EspressifProvision/ui/ProvisionViewController.swift
index cb04c62..b4c86a3 100644
--- a/EspressifProvision/EspressifProvision/ui/ProvisionViewController.swift
+++ b/EspressifProvision/EspressifProvision/ui/ProvisionViewController.swift
@@ -33,22 +33,47 @@ class ProvisionViewController: UIViewController {
     var bleTransport: BLETransport?
     var activityView: UIActivityIndicatorView?
     var grayView: UIView?
-    var avsDetails: [String: String]?
     var provision: Provision!
     var ssidList: [String] = []
-    var wifiDetailList: [String: Int32] = [:]
+    var avsDetails: [String: String]?
+    var wifiDetailList: [String: Espressif_WiFiScanResult] = [:]
+    var versionInfo: String?
+    var session: Session?
+    var capabilities: [String]?
+    var alertTextField: UITextField?
+    var showPasswordImageView: UIImageView!
+    var forceAuthentication = false
+    @IBOutlet var headerView: UIView!
 
     override func viewDidLoad() {
         super.viewDidLoad()
+
         // Do any additional setup after loading the view, typically from a nib.
+        navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
+        showPasswordImageView = UIImageView(frame: CGRect(x: 0, y: 0, width: 20, height: 20))
+        let tap = UITapGestureRecognizer(target: self, action: #selector(showPassword))
+        tap.numberOfTapsRequired = 1
+        showPasswordImageView.isUserInteractionEnabled = true
+        showPasswordImageView.addGestureRecognizer(tap)
+        showPasswordImageView.contentMode = .scaleAspectFit
+
+        configurePassphraseTextField()
+
         passphraseTextfield.addTarget(self, action: #selector(passphraseEntered), for: .editingDidEndOnExit)
         ssidTextfield.addTarget(self, action: #selector(ssidEntered), for: .editingDidEndOnExit)
         provisionButton.isUserInteractionEnabled = false
         if let bleTransport = transport as? BLETransport {
             print("Inside PVC", bleTransport.currentPeripheral!)
         }
+
         tableView.tableFooterView = UIView()
-        scanDeviceForWiFiList()
+
+        navigationItem.backBarButtonItem?.title = ""
+
+        if transport == nil {
+            transport = SoftAPTransport(baseUrl: Utility.baseUrl)
+        }
+        getDeviceVersionInfo()
     }
 
     private func showBusy(isBusy: Bool) {
@@ -71,81 +96,97 @@ class ProvisionViewController: UIViewController {
     }
 
     private func provisionDevice(ssid: String, passphrase: String) {
-        showBusy(isBusy: true)
+        showLoader(message: "Device connecting to Wi-Fi")
 
-        let pop = provisionConfig[Provision.CONFIG_PROOF_OF_POSSESSION_KEY]
         let baseUrl = provisionConfig[Provision.CONFIG_BASE_URL_KEY]
         let transportVersion = provisionConfig[Provision.CONFIG_TRANSPORT_KEY]
-        let securityVersion = provisionConfig[Provision.CONFIG_SECURITY_KEY]
-        let bleDeviceNamePrefix = provisionConfig[Provision.CONFIG_BLE_DEVICE_NAME_PREFIX]
-        let bleServiceUuid = provisionConfig[Provision.CONFIG_BLE_SERVICE_UUID]
-        let bleSessionUuid = provisionConfig[Provision.CONFIG_BLE_SESSION_UUID]
-        let bleConfigUuid = provisionConfig[Provision.CONFIG_BLE_CONFIG_UUID]
-
-        if securityVersion == Provision.CONFIG_SECURITY_SECURITY1 {
-            security = Security1(proofOfPossession: pop!)
-        } else {
-            security = Security0()
-        }
-
         if transport != nil {
             // transport is BLETransport set from BLELandingVC
             if let bleTransport = transport as? BLETransport {
                 bleTransport.delegate = self
             }
 
-            initialiseSessionAndConfigure(transport: transport!,
-                                          security: security!, ssid: ssid, passPhrase: passphrase)
+            initialiseSessionAndConfigure(ssid: ssid, passPhrase: passphrase)
         } else if transportVersion == Provision.CONFIG_TRANSPORT_WIFI {
             transport = SoftAPTransport(baseUrl: baseUrl!)
-            initialiseSessionAndConfigure(transport: transport!,
-                                          security: security!, ssid: ssid, passPhrase: passphrase)
+            initialiseSessionAndConfigure(ssid: ssid, passPhrase: passphrase)
         } else if transport == nil {
-            let configUUIDMap: [String: String] = [Provision.PROVISIONING_CONFIG_PATH: bleConfigUuid!]
-
-            bleTransport = BLETransport(serviceUUIDString: bleServiceUuid!,
-                                        sessionUUIDString: bleSessionUuid!,
-                                        configUUIDMap: configUUIDMap,
-                                        deviceNamePrefix: bleDeviceNamePrefix!,
-                                        scanTimeout: 5.0)
+            bleTransport = BLETransport(scanTimeout: 2.0)
             bleTransport?.scan(delegate: self)
             transport = bleTransport
         }
     }
 
     func scanDeviceForWiFiList() {
-        showLoader(message: "Scanning for Wifi")
-        let newSession = Session(transport: transport!, security: security!)
-        let scanWifiManager: ScanWifiList = ScanWifiList(session: newSession)
-        scanWifiManager.delegate = self
-        scanWifiManager.startWifiScan()
+        if session!.isEstablished {
+            DispatchQueue.main.async {
+                self.showLoader(message: "Scanning for Wi-Fi")
+                let scanWifiManager: ScanWifiList = ScanWifiList(session: self.session!)
+                scanWifiManager.delegate = self
+                scanWifiManager.startWifiScan()
+            }
+        }
     }
 
-    func initialiseSessionAndConfigure(transport: Transport,
-                                       security: Security, ssid: String, passPhrase: String) {
-        let newSession = Session(transport: transport,
-                                 security: security)
+    @IBAction func rescanWiFiList(_: Any) {
+        scanDeviceForWiFiList()
+    }
 
-        newSession.initialize(response: nil) { error in
+    func initialiseSessionAndConfigure(ssid: String, passPhrase: String) {
+        if transport!.isDeviceConfigured() {
+            if session!.isEstablished {
+                let provision = Provision(session: session!)
+
+                provision.configureWifiAvs(ssid: ssid,
+                                           passphrase: passPhrase,
+                                           avs: avsDetails) { status, error in
+                    guard error == nil else {
+                        print("Error in configuring wifi : \(error.debugDescription)")
+                        return
+                    }
+                    if status == Espressif_Status.success {
+                        self.applyConfigurations(provision: provision)
+                    }
+                }
+            } else {
+                print("Session is not established")
+            }
+        } else {
+            showError(errorMessage: "Peripheral device could not be configured.")
+        }
+    }
+
+    func getDeviceVersionInfo() {
+        forceAuthentication = false
+        showLoader(message: "Connecting Device")
+        transport?.SendConfigData(path: (transport?.utility.versionPath)!, data: Data("V0.2".utf8), completionHandler: { response, error in
+            DispatchQueue.main.async {
+                MBProgressHUD.hide(for: self.view, animated: true)
+            }
             guard error == nil else {
-                print("Error in establishing session \(error.debugDescription)")
+                print("Error reading device version info")
+                self.showConnectionFailure()
                 return
             }
-
-            let provision = Provision(session: newSession)
-
-            provision.configureWifiAvs(ssid: ssid,
-                                       passphrase: passPhrase,
-                                       avs: self.avsDetails!) { status, error in
-                guard error == nil else {
-                    print("Error in configuring wifi : \(error.debugDescription)")
-                    return
+            do {
+                if let result = try JSONSerialization.jsonObject(with: response!, options: .mutableContainers) as? NSDictionary {
+                    self.transport?.utility.deviceVersionInfo = result
+                    if let prov = result[Constants.provKey] as? NSDictionary, let capabilities = prov[Constants.capabilitiesKey] as? [String] {
+                        self.capabilities = capabilities
+                        self.scanDeviceForWiFiList()
+                    }
                 }
-                if status == Espressif_Status.success {
-                    self.applyConfigurations(provision: provision)
+            } catch {
+                let responseString = String(decoding: response!, as: UTF8.self)
+                if responseString.lowercased() == "success" {
+                    self.forceAuthentication = false
+                } else {
+                    self.forceAuthentication = true
                 }
+                self.scanDeviceForWiFiList()
+                print(error)
             }
-        }
+        })
     }
 
     @objc func passphraseEntered() {
@@ -188,39 +229,27 @@ class ProvisionViewController: UIViewController {
                                       wifiStatusUpdatedHandler: { wifiState, failReason, error in
             DispatchQueue.main.async {
                 self.showBusy(isBusy: false)
-                let successVC = self.storyboard?.instantiateViewController(withIdentifier: "successViewController") as? SuccessViewController
-                if let successVC = successVC {
-                    if error != nil {
-                        successVC.statusText = "Error in getting wifi state : \(error.debugDescription)"
-                    } else if wifiState == Espressif_WifiStationState.connected {
-                        successVC.statusText = "Device has been successfully provisioned!"
-                    } else if wifiState == Espressif_WifiStationState.disconnected {
-                        successVC.statusText = "Please check the device indicators for Provisioning status."
-                    } else {
-                        successVC.statusText = "Device provisioning failed.\nReason : \(failReason).\nPlease try again"
-                    }
-                    self.navigationController?.present(successVC, animated: true, completion: nil)
-                    self.provisionButton.isUserInteractionEnabled = true
+                let statusVC = self.storyboard?.instantiateViewController(withIdentifier: "statusViewController") as! StatusViewController
+                if error != nil {
+                    statusVC.statusText = "Error in getting wifi state : \(error.debugDescription)"
+                    self.navigationController?.present(statusVC, animated: true, completion: nil)
+                } else if wifiState == Espressif_WifiStationState.connected {
+                    let successVC = self.storyboard?.instantiateViewController(withIdentifier: "successViewController") as! SuccessViewController
+                    self.navigationController?.show(successVC, sender: nil)
+                } else if wifiState == Espressif_WifiStationState.disconnected {
+                    statusVC.statusText = "Please check the device indicators for Provisioning status."
+                    self.navigationController?.present(statusVC, animated: true, completion: nil)
+                } else {
+                    statusVC.statusText = "Device provisioning failed.\nReason : \(failReason).\nPlease try again"
+                    self.navigationController?.present(statusVC, animated: true, completion: nil)
                 }
+                self.provisionButton.isUserInteractionEnabled = true
             }
         })
     }
 
-    func showError(errorMessage: String) {
-        let alertMessage = errorMessage
-        let alertController = UIAlertController(title: "Provision device", message: alertMessage, preferredStyle: UIAlertController.Style.alert)
-        alertController.addAction(UIAlertAction(title: "Okay", style: UIAlertAction.Style.default, handler: nil))
-        present(alertController, animated: true, completion: nil)
-    }
-
-    func showLoader(message: String) {
-        let loader = MBProgressHUD.showAdded(to: view, animated: true)
-        loader.mode = MBProgressHUDMode.indeterminate
-        loader.label.text = message
-    }
-
     func setWifiIconImageFor(cell: WifiListTableViewCell, ssid: String) {
-        let rssi = wifiDetailList[ssid] ?? -70
+        let rssi = wifiDetailList[ssid]?.rssi ?? -70
         if rssi > Int32(-50) {
             cell.signalImageView.image = UIImage(named: "wifi_symbol_strong")
         } else if rssi > Int32(-60) {
@@ -230,9 +259,130 @@ class ProvisionViewController: UIViewController {
         } else {
             cell.signalImageView?.image = UIImage(named: "wifi_symbol_weak")
         }
+        if wifiDetailList[ssid]?.auth != Espressif_WifiAuthMode.open {
+            cell.authenticationImageView.image = UIImage(named: "wifi_security")
+            cell.authenticationImageView.isHidden = false
+        } else {
+            cell.authenticationImageView.isHidden = true
+        }
+    }
+
+    func showTextFieldUI() {
+        DispatchQueue.main.async {
+            self.tableView.isHidden = true
+            self.ssidTextfield.isHidden = false
+            self.passphraseTextfield.isHidden = false
+            self.provisionButton.isHidden = false
+            self.headerView.isHidden = true
+        }
+    }
+
+    private func joinOtherNetwork() {
+        let input = UIAlertController(title: "", message: nil, preferredStyle: .alert)
+
+        input.addTextField { textField in
+            textField.placeholder = "Network Name"
+            self.addHeightConstraint(textField: textField)
+        }
+
+        input.addTextField { textField in
+            self.configurePasswordTextfield(textField: textField)
+            self.addHeightConstraint(textField: textField)
+        }
+        input.addAction(UIAlertAction(title: "Cancel", style: .destructive, handler: { _ in
+        }))
+        input.addAction(UIAlertAction(title: "Connect", style: .default, handler: { [weak input] _ in
+            let ssidTextField = input?.textFields![0]
+            let passphrase = input?.textFields![1]
+
+            if let ssid = ssidTextField?.text, ssid.count > 0 {
+                self.provisionDevice(ssid: ssid, passphrase: passphrase?.text ?? "")
+            }
+        }))
+        DispatchQueue.main.async {
+            self.present(input, animated: true, completion: nil)
+        }
+    }
+
+    func showStatusScreen() {
+        DispatchQueue.main.async {
+            let statusVC = self.storyboard?.instantiateViewController(withIdentifier: "successViewController") as! StatusViewController
+            statusVC.statusText = "Error establishing session.\n Check if Proof of Possession(POP) is correct!"
+            self.navigationController?.present(statusVC, animated: true, completion: nil)
+        }
+    }
+
+    @objc func showPassword() {
+        if let secureEntry = self.alertTextField?.isSecureTextEntry {
+            alertTextField?.togglePasswordVisibility()
+            if secureEntry {
+                showPasswordImageView.image = UIImage(named: "hide_password")
+            } else {
+                showPasswordImageView.image = UIImage(named: "show_password")
+            }
+        }
+    }
+
+    private func addHeightConstraint(textField: UITextField) {
+        let heightConstraint = NSLayoutConstraint(item: textField, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .notAnAttribute, multiplier: 1, constant: 30)
+        textField.addConstraint(heightConstraint)
+        textField.font = UIFont(name: textField.font!.fontName, size: 18)
+    }
+
+    private func configurePasswordTextfield(textField: UITextField) {
+        alertTextField = textField
+        textField.placeholder = "Password"
+        textField.isSecureTextEntry = true
+        showPasswordImageView.image = UIImage(named: "show_password")
+        let rightView = UIView(frame: CGRect(x: 0, y: 0, width: showPasswordImageView.frame.width + 10, height: showPasswordImageView.frame.height))
+        rightView.addSubview(showPasswordImageView)
+        textField.rightView = rightView
+        textField.rightViewMode = .always
+    }
+
+    private func configurePassphraseTextField() {
+        alertTextField = passphraseTextfield
+        passphraseTextfield.placeholder = "Password"
+        passphraseTextfield.isSecureTextEntry = true
+        showPasswordImageView.image = UIImage(named: "show_password")
+        let rightView = UIView(frame: CGRect(x: 0, y: 0, width: showPasswordImageView.frame.width + 10, height: showPasswordImageView.frame.height))
+        rightView.addSubview(showPasswordImageView)
+        passphraseTextfield.rightView = rightView
+        passphraseTextfield.rightViewMode = .always
+    }
+
+    // MARK: Activity Indicators
+
+    private func showConnectionFailure() {
+        DispatchQueue.main.async {
+            let alert = UIAlertController(title: "Failure", message: "Connection to device failed.\n Please make sure you are connected to the Wi-Fi network of device.", preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: "Ok", style: .destructive, handler: { _ in
+                self.navigationController?.popViewController(animated: true)
+            }))
+            self.present(alert, animated: true, completion: nil)
+        }
+    }
+
+    func showError(errorMessage: String) {
+        let alertMessage = errorMessage
+        let alertController = UIAlertController(title: "Provision device", message: alertMessage, preferredStyle: UIAlertController.Style.alert)
+        alertController.addAction(UIAlertAction(title: "Ok", style: UIAlertAction.Style.default, handler: nil))
+        present(alertController, animated: true, completion: nil)
+    }
+
+    func showLoader(message: String) {
+        DispatchQueue.main.async {
+            let loader = MBProgressHUD.showAdded(to: self.view, animated: true)
+            loader.mode = MBProgressHUDMode.indeterminate
+            loader.label.text = message
+            loader.backgroundView.blurEffectStyle = .dark
+            loader.bezelView.backgroundColor = UIColor.white
+        }
     }
 }
 
+// MARK: BLETransportDelegate
+
 extension ProvisionViewController: BLETransportDelegate {
     func peripheralsFound(peripherals: [CBPeripheral]) {
         bleTransport?.connect(peripheral: peripherals[0], withOptions: nil)
@@ -248,14 +398,15 @@ extension ProvisionViewController: BLETransportDelegate {
         showError(errorMessage: "Peripheral device could not be configured.")
     }
 
-    func peripheralDisconnected(peripheral _: CBPeripheral, error: Error?) {
-        print(error?.localizedDescription ?? "")
-        showError(errorMessage: "Peripheral device disconnected")
-    }
+    func peripheralDisconnected(peripheral: CBPeripheral, error _: Error?) {}
+
+    func bluetoothUnavailable() {}
 }
 
+// MARK: ScanWifiListProtocol
+
 extension ProvisionViewController: ScanWifiListProtocol {
-    func wifiScanFinished(wifiList: [String: Int32]?, error _: Error?) {
+    func wifiScanFinished(wifiList: [String: Espressif_WiFiScanResult]?, error: Error?) {
         if wifiList?.count != 0, wifiList != nil {
             wifiDetailList = wifiList!
             ssidList = Array(wifiList!.keys)
@@ -263,13 +414,13 @@ extension ProvisionViewController: ScanWifiListProtocol {
                 self.tableView.isHidden = false
                 self.ssidTextfield.isHidden = true
                 self.passphraseTextfield.isHidden = true
+                self.headerView.isHidden = false
                 self.tableView.reloadData()
             }
         } else {
-            DispatchQueue.main.async {
-                self.tableView.isHidden = true
-                self.ssidTextfield.isHidden = false
-                self.passphraseTextfield.isHidden = false
+            showTextFieldUI()
+            if error != nil {
+                print("Unable to fetch wifi list :\(String(describing: error))")
             }
         }
         DispatchQueue.main.async {
@@ -278,33 +429,40 @@ extension ProvisionViewController: ScanWifiListProtocol {
     }
 }
 
+// MARK: UITableViewDelegate
+
 extension ProvisionViewController: UITableViewDelegate {
     func tableView(_: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
+        if indexPath.row >= ssidList.count {
+            joinOtherNetwork()
+        } else {
+            let ssid = ssidList[indexPath.row]
 
-        let ssid = ssidList[indexPath.row]
-
-        let input = UIAlertController(title: ssid, message: nil, preferredStyle: .alert)
+            if wifiDetailList[ssid]?.auth != Espressif_WifiAuthMode.open || forceAuthentication {
+                let input = UIAlertController(title: ssid, message: nil, preferredStyle: .alert)
 
-        input.addTextField { textField in
-            textField.placeholder = "Password"
-            textField.isSecureTextEntry = true
-        }
+                input.addTextField { textField in
+                    self.configurePasswordTextfield(textField: textField)
+                    self.addHeightConstraint(textField: textField)
+                }
+                input.addAction(UIAlertAction(title: "Cancel", style: .destructive, handler: { _ in
 
-        input.addAction(UIAlertAction(title: "Done", style: .default, handler: { [weak input] _ in
-            let textField = input?.textFields![0]
-            guard let passphrase = textField?.text else {
-                return
-            }
-            if passphrase.count > 0 {
-                self.provisionDevice(ssid: ssid, passphrase: passphrase)
+                }))
+                input.addAction(UIAlertAction(title: "Provision", style: .default, handler: { [weak input] _ in
+                    let textField = input?.textFields![0]
+                    guard let passphrase = textField?.text else {
+                        return
+                    }
+                    if passphrase.count > 0 || self.forceAuthentication {
+                        self.provisionDevice(ssid: ssid, passphrase: passphrase)
+                    }
+                }))
+                present(input, animated: true, completion: nil)
+            } else {
+                provisionDevice(ssid: ssid, passphrase: "")
             }
-        }))
-        input.addAction(UIAlertAction(title: "Cancel", style: .destructive, handler: { _ in
-
-        }))
-
-        present(input, animated: true, completion: nil)
+        }
     }
 
     func tableView(_: UITableView, heightForRowAt _: IndexPath) -> CGFloat {
@@ -312,15 +470,59 @@ extension ProvisionViewController: UITableViewDelegate {
     }
 }
 
+// MARK: UITableViewDataSource
+
 extension ProvisionViewController: UITableViewDataSource {
     func tableView(_: UITableView, numberOfRowsInSection _: Int) -> Int {
-        return ssidList.count
+        return ssidList.count + 1
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "wifiListCell", for: indexPath) as! WifiListTableViewCell
-        cell.ssidLabel.text = ssidList[indexPath.row]
-        setWifiIconImageFor(cell: cell, ssid: ssidList[indexPath.row])
+        if indexPath.row >= ssidList.count {
+            cell.ssidLabel.text = "Join Other Network"
+            cell.signalImageView.image = UIImage(named: "add_icon")
+        } else {
+            cell.ssidLabel.text = ssidList[indexPath.row]
+            setWifiIconImageFor(cell: cell, ssid: ssidList[indexPath.row])
+        }
         return cell
     }
 }
+
+// MARK: BLEStatusProtocol
+
+extension ProvisionViewController: BLEStatusProtocol {
+    func peripheralDisconnected() {
+        MBProgressHUD.hide(for: view, animated: true)
+        if !(session?.isEstablished ?? false) {
+            showStatusScreen()
+        }
+    }
+}
+
+// MARK: UITextField Extension
+
+extension UITextField {
+    func togglePasswordVisibility() {
+        isSecureTextEntry = !isSecureTextEntry
+
+        if let existingText = text, isSecureTextEntry {
+            /* When toggling to secure text, all text will be purged if the user
+             continues typing unless we intervene. This is prevented by first
+             deleting the existing text and then recovering the original text. */
+            deleteBackward()
+
+            if let textRange = textRange(from: beginningOfDocument, to: endOfDocument) {
+                replace(textRange, withText: existingText)
+            }
+        }
+
+        /* Reset the selected text range since the cursor can end up in the wrong
+         position after a toggle because the text might vary in width */
+        if let existingSelectedTextRange = selectedTextRange {
+            selectedTextRange = nil
+            selectedTextRange = existingSelectedTextRange
+        }
+    }
+}
diff --git a/EspressifProvision/EspressifProvision/ui/StatusViewController.swift b/EspressifProvision/EspressifProvision/ui/StatusViewController.swift
new file mode 100644
index 0000000..b05396d
--- /dev/null
+++ b/EspressifProvision/EspressifProvision/ui/StatusViewController.swift
@@ -0,0 +1,20 @@
+//
+//  DoneViewController.swift
+//  EspressifProvision
+//
+//  Created by Vikas Chandra on 16/07/19.
+//  Copyright © 2019 Espressif. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+class StatusViewController: UIViewController {
+    var statusText: String?
+
+    @IBOutlet var successLabel: UILabel!
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+    }
+}
diff --git a/EspressifProvision/EspressifProvision/ui/SuccessViewController.swift b/EspressifProvision/EspressifProvision/ui/SuccessViewController.swift
index 33672fd..9242775 100644
--- a/EspressifProvision/EspressifProvision/ui/SuccessViewController.swift
+++ b/EspressifProvision/EspressifProvision/ui/SuccessViewController.swift
@@ -20,15 +20,45 @@ import Foundation
 import UIKit
 
 class SuccessViewController: UIViewController {
-    var statusText: String?
-
-    @IBOutlet var successLabel: UILabel!
+    @IBOutlet var learnMoreTextView: UITextView!
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        if let statusText = statusText {
-            successLabel.text = statusText
-        }
         // Do any additional setup after loading the view, typically from a nib.
+        let attributedString = NSMutableAttributedString(string: "To learn more and access additional features, download the Alexa App")
+        let url = URL(string: "alexa://")!
+        var redirectURL = url
+        if !UIApplication.shared.canOpenURL(url) {
+            redirectURL = URL(string: "https://apps.apple.com/in/app/amazon-alexa/id944011620")!
+        }
+
+        attributedString.setAttributes([.link: redirectURL], range: NSRange(location: attributedString.length - 9, length: 9))
+
+        learnMoreTextView.attributedText = attributedString
+        learnMoreTextView.isUserInteractionEnabled = true
+        learnMoreTextView.isEditable = false
+
+        // Set how links should appear: blue and underlined
+        learnMoreTextView.linkTextAttributes = [
+            .foregroundColor: UIColor.blue,
+            .underlineStyle: NSUnderlineStyle.single.rawValue,
+        ]
+        learnMoreTextView.textAlignment = .center
+
+        let righButtonItem = UIBarButtonItem(title: "Done", style: .done, target: self, action: #selector(presentVC))
+
+        navigationItem.rightBarButtonItem = righButtonItem
+        navigationItem.rightBarButtonItem?.tintColor = UIColor.white
+
+        navigationItem.setHidesBackButton(true, animated: true)
+
+        navigationItem.title = "Things to try"
+    }
+
+    ///
+    /// Go to intial View Controller.
+    ///
+    @objc func presentVC() {
+        performSegue(withIdentifier: "presentFirstVC", sender: nil)
     }
 }
diff --git a/EspressifProvision/Podfile b/EspressifProvision/Podfile
index 5f4a006..7a0e638 100644
--- a/EspressifProvision/Podfile
+++ b/EspressifProvision/Podfile
@@ -11,6 +11,7 @@ abstract_target 'EspressifProvisionAll' do
   pod 'Curve25519', '~> 1.1.0'
   pod 'MBProgressHUD', '~> 1.1.0'
   pod 'BlueSocket'
+  pod "PickerView"
   
   target 'EspressifProvision'
   target 'EspressifProvisionTests' do
diff --git a/proto/avsconfig.proto b/proto/avsconfig.proto
index ea53343..3cc910f 100644
--- a/proto/avsconfig.proto
+++ b/proto/avsconfig.proto
@@ -13,7 +13,8 @@ enum AVSConfigStatus {
 message CmdGetDetails {
     uint32 Dummy = 1;
 }
-message RespGetDetails{
+
+message RespGetDetails {
     AVSConfigStatus Status = 1;
     string Version = 2;
     string CodeChallenge = 3;
@@ -27,7 +28,7 @@ message CmdSetConfig {
     string RedirectURI = 3;
 }
 
-message RespSetConfig{
+message RespSetConfig {
     AVSConfigStatus Status = 1;
     uint32 Dummy = 2;
 }
@@ -48,15 +49,110 @@ message RespSignOut {
     AVSConfigStatus Status = 1;
 }
 
+enum Locale {
+    de_DE = 0;
+    en_AU = 1;
+    en_CA = 2;
+    en_GB = 3;
+    en_IN = 4;
+    en_US = 5;
+    es_ES = 6;
+    es_MX = 7;
+    es_US = 8;
+    fr_CA = 9;
+    fr_FR = 10;
+    hi_IN = 11;
+    it_IT = 12;
+    ja_JP = 13;
+    pt_BR = 14;
+}
+
+message CmdSetAssistantLang {
+    Locale AssistantLang = 1;
+}
+
+message RespSetAssistantLang {
+    AVSConfigStatus Status = 1;
+}
+
+message CmdSetSORAudioCue {
+    bool AudioCue = 1;
+}
+
+message CmdSetEORAudioCue {
+    bool AudioCue = 1;
+}
+
+message RespSetSORAudioCue {
+    AVSConfigStatus Status = 1;
+}
+
+message RespSetEORAudioCue {
+    AVSConfigStatus Status = 1;
+}
+
+message CmdSetUserVisibleName {
+    string Name = 1;
+}
+
+message RespSetUserVisibleName {
+    AVSConfigStatus Status = 1;
+}
+
+message CmdGetDeviceInfo {
+    uint32 Dummy = 1;
+}
+
+message CmdSetVolume {
+    uint32 Level = 1;
+}
+
+message RespSetVolume {
+    AVSConfigStatus Status = 1;
+}
+
+message AVSGenericDeviceInfo {
+    string FwVersion = 1;
+    string MAC = 2;
+    string SerialNum = 3;
+    string UserVisibleName = 4;
+    string WiFi = 5;
+}
+
+message AVSSpecificDeviceInfo {
+    Locale AssistantLang = 1;
+    bool SORAudioCue = 2;
+    bool EORAudioCue = 3;
+    uint32 Volume = 4;
+}
+
+message RespGetDeviceInfo {
+    AVSConfigStatus Status = 1;
+    AVSGenericDeviceInfo GenericInfo = 2;
+    AVSSpecificDeviceInfo AVSSpecificInfo = 3;
+}
+
 enum AVSConfigMsgType {
     TypeCmdGetDetails = 0;
     TypeRespGetDetails = 1;
     TypeCmdSetConfig = 2;
-    TypeRespSetConfig =3;
+    TypeRespSetConfig = 3;
     TypeCmdSignInStatus = 4;
     TypeRespSignInStatus = 5;
     TypeCmdSignOut = 6;
     TypeRespSignOut = 7;
+    TypeCmdGetDeviceInfo = 8;
+    TypeRespGetDeviceInfo = 9;
+    TypeCmdSetSORAudioCue = 10;
+    TypeRespSetSORAudioCue = 12;
+    TypeCmdSetEORAudioCue = 13;
+    TypeRespSetEORAudioCue = 14;
+    TypeCmdSetAssistantLang = 15;
+    TypeRespSetAssistantLang = 16;
+    TypeCmdSetUserVisibleName = 17;
+    TypeRespSetUserVisibleName = 18;
+    TypeCmdSetVolume = 19;
+    TypeRespSetVolume = 20;
 }
 
 message AVSConfigPayload {
@@ -66,9 +162,21 @@ message AVSConfigPayload {
         RespGetDetails resp_get_details = 11;
         CmdSetConfig cmd_set_config = 12;
         RespSetConfig resp_set_config = 13;
-	CmdSignInStatus cmd_signin_status = 14;
-	RespSignInStatus resp_signin_status = 15;
-	CmdSignOut cmd_sign_out = 16;
-	RespSignOut resp_sign_out = 17;
+        CmdSignInStatus cmd_signin_status = 14;
+        RespSignInStatus resp_signin_status = 15;
+        CmdSignOut cmd_sign_out = 16;
+        RespSignOut resp_sign_out = 17;
+        CmdGetDeviceInfo cmd_get_device_info = 18;
+        RespGetDeviceInfo resp_get_device_info = 19;
+        CmdSetAssistantLang cmd_assistant_lang = 20;
+        RespSetAssistantLang resp_assistant_lang = 21;
+        CmdSetSORAudioCue cmd_sor_audio_cue = 22;
+        RespSetSORAudioCue resp_sor_audio_cue = 23;
+        CmdSetEORAudioCue cmd_eor_audio_cue = 24;
+        RespSetEORAudioCue resp_eor_audio_cue = 25;
+        CmdSetUserVisibleName cmd_user_visible_name = 26;
+        RespSetUserVisibleName resp_user_visible_name = 27;
+        CmdSetVolume cmd_set_volume = 28;
+        RespSetVolume resp_set_volume = 29;
     }
-}
\ No newline at end of file
+}
diff --git a/proto/wifi_scan.proto b/proto/wifi_scan.proto
index 3a61131..d42b1a0 100644
--- a/proto/wifi_scan.proto
+++ b/proto/wifi_scan.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
 package espressif;
 
 import "constants.proto";
+import "wifi_constants.proto";
 
 message CmdScanStart {
     bool blocking = 1;
@@ -30,6 +31,8 @@ message WiFiScanResult {
     bytes ssid = 1;
     uint32 channel = 2;
     int32 rssi = 3;
+    bytes bssid = 4;
+    WifiAuthMode auth = 5;
 }
 
 message RespScanResult {
@@ -57,4 +60,3 @@ message WiFiScanPayload {
         RespScanResult resp_scan_result = 15;
     }
 }
-