diff --git a/docs/helios64/hardware.md b/docs/helios64/hardware.md
index 8981126..f2e1734 100644
--- a/docs/helios64/hardware.md
+++ b/docs/helios64/hardware.md
@@ -16,34 +16,34 @@ This block diagram is cited from the RK3399 website documentation. [1](http://op
| Name | Peripheral Type | Connector Type | Details |
|-----|---------------|--------------|-------|
-| J1 | [USB 3.0](/helios64/usb/#usb-on-helios64) | USB 3.0 Type-A | USB 3.0 Port 3 |
-| J2 | [M.2 SATA](/helios64/sata/) | M.2 Key-B | M.2 Slot for SATA SSD
or USB 2.0 Device |
+| J1 | [USB 3.0](/helios64/usb/) | USB 3.0 Type-A | USB 3.0 Port 3 |
+| J2 | [M.2](/helios64/m2/) | M.2 Key-B | M.2 Slot for SATA SSD
or USB 2.0 Device |
| J3 | [SATA](/helios64/sata/) | SATA 3.0 | Port 0 (SATA1) |
| J4 | [SATA](/helios64/sata/) | SATA 3.0 | Port 1 (SATA2) |
| J5 | [SATA](/helios64/sata/) | SATA 3.0 | Port 2 (SATA3) |
| J6 | [SATA](/helios64/sata/) | SATA 3.0 | Port 3 (SATA4) |
| J8 | [SATA](/helios64/sata/) | SATA 3.0 | Port 4 (SATA5) |
-| J7 | HDD Power | 8 Pin Mini-Fit Jr | HDD Power 5V + 12V
(supports 5x HDD) |
-| J9 | [UPS Battery](/helios64/battery/#li-ion-battery) | 6 Pin Mini-Fit Jr | UPS Battery Power |
+| J7 | [HDD Power](/helios64/sata/#hdd-power) | 8 Pin Mini-Fit Jr | HDD Power 5V + 12V
(supports 5x HDD) |
+| J9 | [UPS Battery](/helios64/ups/) | 6 Pin Mini-Fit Jr | UPS Battery Power |
| J10 | ATX PSU | 4 Pin Mini-Fit Jr | DC input 12V |
| J11 | [LAN1](/helios64/ethernet/) | RJ45 | Gigabit Ethernet |
| J12 | [LAN2](/helios64/ethernet/) | RJ45 | 2.5 Gigabit Ethernet |
-| J13 | [USB 3.0 (x2)](/helios64/usb/#usb-on-helios64) | Dual USB 3.0 Type-A | USB 3.0 Port 1 and 2 |
+| J13 | [USB 3.0 (x2)](/helios64/usb/) | Dual USB 3.0 Type-A | USB 3.0 Port 1 and 2 |
| J14 | microSD | Push-Push card connector | Support SDHC and SDXC |
-| J15| [USB Type-C](/helios64/usb/#usb-type-c-functionality-on-helios64) | USB Type-C Connector | Supports following:
- DisplayPort Mode
- DAS Mode
- Host Mode
- Serial Console |
-| J16| DC-IN | Kycon 4-Pin Mini-DIN | DC input 12V |
-| P1 | [I2C](/helios64/i2c/#i2c-at-p1-header) | 4x1 Pin Header | I2C Bus |
+| J15| [USB Type-C](/helios64/usb/#type-c-functionality-on-helios64) | USB Type-C Connector | Supports following:
- DisplayPort Mode
- DAS Mode
- Host Mode
- Serial Console |
+| J16| AC Adapter | Kycon 4-Pin Mini-DIN | DC input 12V |
+| P1 | [I2C](/helios64/i2c/) | 4x1 Pin Header | I2C Bus |
| P2 | [UEXT](/helios64/uext/) | 2x5 Pin Header | Universal EXTension
(I2C, SPI and UART)|
| P3 | [Front Panel](/helios64/front-panel/) | 12x2 Pin Header | Front Panel Extension |
| P4 | Buzzer | 2x1 Pin Header | Buzzer Alarm Speaker |
| P5 | [GPIO](/helios64/gpio/) | 7x2 Pin Header | User Configurable GPIO |
-| P6 | [PWM Fan](/helios64/fan/) | 4x1 Pin Header | Fan 1 with PWM support |
-| P7 | [PWM Fan](/helios64/fan/) | 4x1 Pin Header | Fan 2 with PWM support |
+| P6 | [PWM Fan](/helios64/pwm/) | 4x1 Pin Header | Fan 1 with PWM support |
+| P7 | [PWM Fan](/helios64/pwm/) | 4x1 Pin Header | Fan 2 with PWM support |
| P8 | [SATA Ctrl. Programming](/helios64/jumper/#sata-controller-flash-p8) | 2x1 Pin Header | SATA Controller Flash Enable |
| P9 | [eFuse Programming](/helios64/jumper/#efuse-power-enable-p9) | 2x1 Pin Header | eFuse Power Supply Enable |
| P10 | [eMMC Flash Disable](/helios64/jumper/#boot-mode-p10-p11) | 2x1 Pin Header | Disable eMMC |
| P11 | [SPI Flash Disable](/helios64/jumper/#boot-mode-p10-p11) | 2x1 Pin Header | Disable SPI Flash |
-| P12 | [Battery Configuration](/helios64/ups/) | 2x1 Pin Header | *unpopulated* |
+| P12 | Battery Configuration | 2x1 Pin Header | *unpopulated* |
| P13 | [USB Console/Recovery Mode](/helios64/jumper/#usb-consolerecovery-mode-p13) | 2x1 Pin Male Header | USB-C HS Mode |
| P14 | [ATX Priority Jumper](/helios64/jumper/#dc-in-priority-p14-p15) | 2x1 Pin Male Header | ATX Supply Priority |
| P15 | [ACDC Priority Jumper](/helios64/jumper/#dc-in-priority-p14-p15) | 2x1 Pin Male Header | AC Adapter Supply Priority |
diff --git a/docs/helios64/img/install/armbian-config.png b/docs/helios64/img/install/armbian-config.png
deleted file mode 100644
index 3b0409f..0000000
Binary files a/docs/helios64/img/install/armbian-config.png and /dev/null differ
diff --git a/docs/helios64/img/install/armbian-config_ip-static.png b/docs/helios64/img/install/armbian-config_ip-static.png
deleted file mode 100644
index b009fda..0000000
Binary files a/docs/helios64/img/install/armbian-config_ip-static.png and /dev/null differ
diff --git a/docs/helios64/img/install/armbian-config_ip.png b/docs/helios64/img/install/armbian-config_ip.png
deleted file mode 100644
index 55d32d9..0000000
Binary files a/docs/helios64/img/install/armbian-config_ip.png and /dev/null differ
diff --git a/docs/helios64/img/install/armbian-config_network.png b/docs/helios64/img/install/armbian-config_network.png
deleted file mode 100644
index 739cc7e..0000000
Binary files a/docs/helios64/img/install/armbian-config_network.png and /dev/null differ
diff --git a/docs/helios64/img/install/connections.png b/docs/helios64/img/install/connections.png
deleted file mode 100644
index ebdd1e3..0000000
Binary files a/docs/helios64/img/install/connections.png and /dev/null differ
diff --git a/docs/helios64/img/install/console_cable.png b/docs/helios64/img/install/console_cable.png
deleted file mode 100644
index e62b34e..0000000
Binary files a/docs/helios64/img/install/console_cable.png and /dev/null differ
diff --git a/docs/helios64/img/install/etcher_flash.png b/docs/helios64/img/install/etcher_flash.png
deleted file mode 100644
index 6056036..0000000
Binary files a/docs/helios64/img/install/etcher_flash.png and /dev/null differ
diff --git a/docs/helios64/img/install/first_login.png b/docs/helios64/img/install/first_login.png
deleted file mode 100644
index 5974f0b..0000000
Binary files a/docs/helios64/img/install/first_login.png and /dev/null differ
diff --git a/docs/helios64/img/install/io-port-connected.jpg b/docs/helios64/img/install/io-port-connected.jpg
deleted file mode 100644
index fdd916a..0000000
Binary files a/docs/helios64/img/install/io-port-connected.jpg and /dev/null differ
diff --git a/docs/helios64/img/install/network_cable.jpg b/docs/helios64/img/install/network_cable.jpg
deleted file mode 100644
index 3d14684..0000000
Binary files a/docs/helios64/img/install/network_cable.jpg and /dev/null differ
diff --git a/docs/helios64/img/install/network_config.png b/docs/helios64/img/install/network_config.png
deleted file mode 100644
index 887bd49..0000000
Binary files a/docs/helios64/img/install/network_config.png and /dev/null differ
diff --git a/docs/helios64/img/install/picocom.png b/docs/helios64/img/install/picocom.png
deleted file mode 100644
index 44bf164..0000000
Binary files a/docs/helios64/img/install/picocom.png and /dev/null differ
diff --git a/docs/helios64/img/install/putty_config.png b/docs/helios64/img/install/putty_config.png
deleted file mode 100644
index 376b02d..0000000
Binary files a/docs/helios64/img/install/putty_config.png and /dev/null differ
diff --git a/docs/helios64/img/install/putty_connect.png b/docs/helios64/img/install/putty_connect.png
deleted file mode 100644
index a522a7e..0000000
Binary files a/docs/helios64/img/install/putty_connect.png and /dev/null differ
diff --git a/docs/helios64/img/install/putty_ssh.png b/docs/helios64/img/install/putty_ssh.png
deleted file mode 100644
index 7e89862..0000000
Binary files a/docs/helios64/img/install/putty_ssh.png and /dev/null differ
diff --git a/docs/helios64/img/install/recommended_sdcard.jpg b/docs/helios64/img/install/recommended_sdcard.jpg
deleted file mode 100644
index 6b9486c..0000000
Binary files a/docs/helios64/img/install/recommended_sdcard.jpg and /dev/null differ
diff --git a/docs/helios64/img/install/softy.png b/docs/helios64/img/install/softy.png
deleted file mode 100644
index 8953d9e..0000000
Binary files a/docs/helios64/img/install/softy.png and /dev/null differ
diff --git a/docs/helios64/img/install/ssh_login.png b/docs/helios64/img/install/ssh_login.png
deleted file mode 100644
index 1228c63..0000000
Binary files a/docs/helios64/img/install/ssh_login.png and /dev/null differ
diff --git a/docs/helios64/img/install/usb-c-2.jpg b/docs/helios64/img/install/usb-c-2.jpg
deleted file mode 100644
index 0cfbb42..0000000
Binary files a/docs/helios64/img/install/usb-c-2.jpg and /dev/null differ
diff --git a/docs/helios64/img/install/usb-c.jpg b/docs/helios64/img/install/usb-c.jpg
deleted file mode 100644
index c878ecd..0000000
Binary files a/docs/helios64/img/install/usb-c.jpg and /dev/null differ
diff --git a/docs/helios64/ups.md b/docs/helios64/ups.md
index c5b78d3..da23904 100644
--- a/docs/helios64/ups.md
+++ b/docs/helios64/ups.md
@@ -1,3 +1,5 @@
+# UPS (Uninterruptible Power Supply)
+
Helios64 provides a built-in UPS feature to protect your data from unexpected power loss. The feature requires an additional Li-Ion Battery to be connected to header J9 .

@@ -42,4 +44,4 @@ Battery charge is fully managed by hardware, no software required. Charging func
| Off | Charge complete |
| Blinking | Fault / Battery Absent |
-**Note:** The estimated time to fully charge the battery is around 8 Hours.
+**Note:** The estimated time to fully charge the empty battery is around 4 hours.
diff --git a/mkdocs.yml b/mkdocs.yml
index 0986ed6..fc66c92 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -85,7 +85,7 @@ nav:
- SATA : 'helios64/sata.md'
- SPI : 'helios64/spi.md'
- UEXT : 'helios64/uext.md'
- - UPS Battery : 'helios64/ups.md'
+ - UPS : 'helios64/ups.md'
- USB : 'helios64/usb.md'
- Helios4:
- Introduction: 'helios4/intro.md'