diff --git a/docs/first_steps.md b/docs/first_steps.md
index 86238fd7..3cf704ba 100644
--- a/docs/first_steps.md
+++ b/docs/first_steps.md
@@ -2,20 +2,17 @@
 
 ## First power on
 
-!!! warning
-    - V2 DIY owners: Please follow this [first](https://github.com/pikvm/pikvm)<br>
-    - V3 HAT *or* pre-assembled users: Please follow this [first](https://docs.pikvm.org/v3/)<br>
-    - For both to work and display a video, your target system needs to be configured for the following:<br>
-        1920x1080p50Hz (In some rare instances, try 30hz)<br>
-        1600x1200p60Hz<br>
-        1280x720p60Hz<br>
-        
+!!! note
+    Before this guide:
 
+    * V4 device: please follow this [first](v4.md)
+    * V3 HAT/Pre-Assembled: follow [this](v3.md)
+    * V0-V2 DIY: follow [this](https://github.com/pikvm/pikvm)
 
 ??? example "Optional setting up Wi-Fi"
     !!! warning "Please read the following caveats" 
         1. There is nothing more reliable than wired Ethernet, so it's better to use the **cable**. But who are we to stop you... :)
-        2. Adding FIRSTBOOT=1 or FIRSTBOOT-1 will erase the msd partition, if used afterwords as a means of switching wifi networks, do not include this option. Instead, use different supplicant files for each wifi SSID, mv files to the supplicant dir as needed and reboot.
+        2. Adding FIRSTBOOT=1 or FIRSTBOOT=1 will erase the msd partition, if used afterwords as a means of switching wifi networks, do not include this option. Instead, use different supplicant files for each wifi SSID, mv files to the supplicant dir as needed and reboot.
         3. `pikvm.txt` will be removed once its been used. You will need to recreate it again if you did not provide the correct info
 
     If you want to connect PiKVM to a Wi-Fi network, you need to tell the device ESSID and password before first boot.
diff --git a/docs/v3.md b/docs/v3.md
index 86c7541d..872b50d8 100644
--- a/docs/v3.md
+++ b/docs/v3.md
@@ -92,6 +92,11 @@ If you have a kit without a metal case, you can use our free 3D printing case dr
 12. Explore the features of PiKVM using the site's table of contents and have fun!
 
 
+## Video modes
+
+PiKVM V3 supports maximum resolution 1920x1080@50Hz, 60Hz will not work. You can use any other resolution less than the specified one, for example: 1600x1200@60Hz, 1280x720@60Hz, etc. If you have problems with the video, follow [this guide](edid.md).
+
+
 ## ATX connection
 
 [See here](atx_board.md).
diff --git a/docs/v4.md b/docs/v4.md
index 06276b80..73a81695 100644
--- a/docs/v4.md
+++ b/docs/v4.md
@@ -53,10 +53,10 @@
 7. Explore the features of PiKVM using the site's table of contents and have fun!
 
 
-## 1920x1200 video mode
+## Video modes
 
 Both PiKVM V4 Mini and Plus devices support a resolution 1920x1200, however, for compatibility reasons, the default configuration uses 1920x1080.
-To enable 1920x1200, follow [this manual](edid.md).
+To enable 1920x1200, follow [this guide](edid.md).
 
 
 ## ATX connection
diff --git a/docs/wifi.md b/docs/wifi.md
index efbf2bdd..7970c741 100644
--- a/docs/wifi.md
+++ b/docs/wifi.md
@@ -1,17 +1,18 @@
 # Setting up Wi-Fi
 
+!!! tip
+    There is nothing more reliable than wired Ethernet, so it's better to use it. Wi-Fi with the steel case (on V3) results in poor performance. But who are we to stop you... :)
+
 The following describes how to setup a Wi-Fi connection on the default pikvm builds based on Arch Linux.
 The process might vary for other Linux distros. We recommend to do this while having a display and keyboard
 connected directly to the Raspberry Pi as you will loose network connectivity once you connect to a Wi-Fi.
 Alternatively you can connect to the PiKVM via SSH. The built-in Web Terminal (available through the browser) should also work.
 
-!!! note "Setting up WifiI for the first time (Easy wifi access)"
-    Please review [First Steps](first_steps.md) wifi section if you are setting up the following: (Mandatory) Zero(2)W or going from ethernet to wifi on any other PiKVM model (Optional).
+!!! note "Setting up Wi-Fi in the boot config (semi-auto)"
+    Check out *Optional setting up Wi-Fi* in the [First Steps](first_steps.md) guide. This is mandatory if you're using Zero 2 W board.
+    It will work in most other cases, especially if you have physical access to the memory card.
 
-!!! warning
-    There is nothing more reliable than wired Ethernet, so it's better to use it. Wi-Fi with the steel case (on V3) results in poor performance. But who are we to stop you... :)
-
-!!! note "[ADVANCED USERS ONLY] Moving Wi-Fi settings for OS older than 2021.10.19"
+??? note "Moving Wi-Fi settings for OS older than 2021.10.19"
     Starting from 2021.10.19, the old way to configure Wi-Fi using `netctl` is deprecated.
     Instead, it is proposed to use a more native path with `systemd-networkd`, which is already used to configure Ethernet.
     Follow the guide and then delete the old netctl profile:
@@ -24,7 +25,7 @@ Alternatively you can connect to the PiKVM via SSH. The built-in Web Terminal (a
     ```
 
 
-## Step by step - Advanced users ONLY section
+## Setting up Wi-Fi manually
 
 1. Make filesystem writable using `rw` command.