diff --git a/manuals/connect_to_wireless.md b/manuals/connect_to_wireless.md
index 5268a16..4f04975 100644
--- a/manuals/connect_to_wireless.md
+++ b/manuals/connect_to_wireless.md
@@ -1,8 +1,9 @@
 # OpenTrickler Wireless
+
 The OpenTrickler uses the Pico W on board green LED to indicate the wireless status if you don't have the mini 12864 display attached.
 
- - Solid: The OpenTrickler is connected to the home network. 
- - Slow flashing (1Hz): The OpenTrickler is operated at Access Point (AP) mode with default SSID and the password. You need to configure the wireless settings to connect the OpenTrickler to your home network. 
+- Solid: The OpenTrickler is connected to the home network. 
+- Slow flashing (1Hz): The OpenTrickler is operated at Access Point (AP) mode with default SSID and the password. You need to configure the wireless settings to connect the OpenTrickler to your home network. 
 
 If you have the mini 12864 screen attached, you can use the screen to query the current network status by navigating t *Wireless -> WiFi Info* page.
 
@@ -15,14 +16,26 @@ Alternatively, if you see the page below then the OpenTrickler is already connec
 ![sta_mode_view](../resources/connect_to_wireless/sta_mode_view.png)
 
 ## Connect to Wireless
+
 To connect the OpenTrickler to your home network, you will need a laptop with wireless accessibility. **For now the smart phone and iPads are not supported.**
 
 1. Look for the OpenTrickler from the list of SSIDs. Each OpenTrickler will generate the random 4 digit suffix based on its unique id. 
-![look_for_ssid](../resources/connect_to_wireless/look_for_ssid.png)
+   ![look_for_ssid](../resources/connect_to_wireless/look_for_ssid.png)
+
 2. Select the OpenTrickelr's SSID. Your computer will prompt for the password. By default the password is **opentrickler**.
-![enter_password](../resources/connect_to_wireless/enter_password.png)
-3. Once connected, you should be assigned with IP address of *192.168.4.16*. To access the OpenTrickler configuration page, you need to visit [http://192.168.4.1](192.168.4.1). It may  take about 10-20 seconds to load the resource if this is the first time for you visiting the OpenTrickler configurator. To set the wireless settings, you can navigate to *Settings -> Wireless* and provide the SSID, password and the type of credentials, as shown in the screenshot below. Remember to select *Use WiFi* to Yes, then press **Apply Wireless Settings**.
-![configure_wireless](../resources/connect_to_wireless/configure_wireless.png)
-4. The last step is to save the configuration to the on-board EEPROM so the OpenTrickler will attempt to connect to your home network with the new settings. Navigate to *Settings -> System Control* then select *Save to EEPROM* to Yes, *Reboot* to Yes. By pressing **Apply System Control** the OpenTrickler will reboot. 
-![save_to_eeprom](../resources/connect_to_wireless/save_to_eeprom.png)
-5. You can check the LED status to verify your change. 
\ No newline at end of file
+   ![enter_password](../resources/connect_to_wireless/enter_password.png)
+
+3. Once connected, you should be assigned with IP address of *192.168.4.16*. To access the OpenTrickler configuration page, you need to visit [http://192.168.4.1](192.168.4.1). You will be prompted to enter your WiFi credentials. You need to enter below information:
+    ![configure_wireless](../resources/connect_to_wireless/setup_wizard.png)
+   
+   - SSID: The wireless network name.
+   
+   - Password: Your wireless network password.
+   
+   - WiFi Authentication Method: Usually you need to select `WPA2-MIXED`. 
+   
+   - Enable WiFi: Select `YES`
+
+4. Press **Complete & Reboot** button to save the WiFi credentials and apply the new wireless configurations. 
+
+5. You can check the LED status to verify your change. 
diff --git a/resources/connect_to_wireless/configure_wireless.png b/resources/connect_to_wireless/configure_wireless.png
deleted file mode 100644
index c4f643d..0000000
Binary files a/resources/connect_to_wireless/configure_wireless.png and /dev/null differ
diff --git a/resources/connect_to_wireless/save_to_eeprom.png b/resources/connect_to_wireless/save_to_eeprom.png
deleted file mode 100644
index 9826834..0000000
Binary files a/resources/connect_to_wireless/save_to_eeprom.png and /dev/null differ
diff --git a/resources/connect_to_wireless/setup_wizard.png b/resources/connect_to_wireless/setup_wizard.png
new file mode 100644
index 0000000..150ecfb
Binary files /dev/null and b/resources/connect_to_wireless/setup_wizard.png differ