diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/DetailForm.java b/src/main/java/com/luoboduner/moo/info/ui/form/DetailForm.java
index 1e00aa6..10e2f44 100644
--- a/src/main/java/com/luoboduner/moo/info/ui/form/DetailForm.java
+++ b/src/main/java/com/luoboduner/moo/info/ui/form/DetailForm.java
@@ -9,6 +9,7 @@ import com.luoboduner.moo.info.App;
 import com.luoboduner.moo.info.ui.Style;
 import com.luoboduner.moo.info.util.ScrollUtil;
 import lombok.Getter;
+import oshi.hardware.Baseboard;
 import oshi.hardware.ComputerSystem;
 import oshi.hardware.HardwareAbstractionLayer;
 import oshi.software.os.OperatingSystem;
@@ -76,21 +77,86 @@ public class DetailForm {
         ScrollUtil.smoothPane(detailForm.scrollPane);
 
         Style.emphaticTitleFont(detailForm.getOsLabel());
+        Style.emphaticTitleFont(detailForm.getComputerLabel());
+        Style.emphaticTitleFont(detailForm.getBaseBoardLabel());
+        Style.emphaticTitleFont(detailForm.getCpuLabel());
+        Style.emphaticTitleFont(detailForm.getMemoryLabel());
+        Style.emphaticTitleFont(detailForm.getStorageLabel());
+        Style.emphaticTitleFont(detailForm.getGraphicsCardLabel());
+        Style.emphaticTitleFont(detailForm.getDisplayLabel());
+        Style.emphaticTitleFont(detailForm.getSoundCardLabel());
+        Style.emphaticTitleFont(detailForm.getNetworkLabel());
         Style.emphaticTitleFont(detailForm.getPowerSourceLabel());
+        Style.emphaticTitleFont(detailForm.getSensorsLabel());
 
+        detailForm.getOsTextPane().setContentType("text/html; charset=utf-8");
+        detailForm.getComputerTextPane().setContentType("text/html; charset=utf-8");
+        detailForm.getBaseBoardTextPane().setContentType("text/html; charset=utf-8");
+        detailForm.getCpuTextPane().setContentType("text/html; charset=utf-8");
+        detailForm.getMemoryTextPane().setContentType("text/html; charset=utf-8");
+        detailForm.getStorageTextPane().setContentType("text/html; charset=utf-8");
+        detailForm.getGraphicsCardTextPane().setContentType("text/html; charset=utf-8");
+        detailForm.getDisplayTextPane().setContentType("text/html; charset=utf-8");
+        detailForm.getSoundCardTextPane().setContentType("text/html; charset=utf-8");
+        detailForm.getNetworkTextPane().setContentType("text/html; charset=utf-8");
         detailForm.getPowerSourceTextPane().setContentType("text/html; charset=utf-8");
+        detailForm.getSensorsTextPane().setContentType("text/html; charset=utf-8");
     }
 
     private static void initInfo() {
         DetailForm detailForm = getInstance();
 
-        OperatingSystem operatingSystem = App.si.getOperatingSystem();
         HardwareAbstractionLayer hardware = App.si.getHardware();
         ComputerSystem computerSystem = hardware.getComputerSystem();
 
+        detailForm.getOsTextPane().setText(getOsInfo());
+        detailForm.getComputerTextPane().setText(getComputerInfo());
         detailForm.getPowerSourceTextPane().setText(PowerSourceForm.getPowerInfoText(hardware.getPowerSources()));
     }
 
+    private static String getOsInfo() {
+        StringBuilder builder = new StringBuilder();
+        OperatingSystem operatingSystem = App.si.getOperatingSystem();
+
+        builder.append("<b>Manufacturer: </b>").append(operatingSystem.getManufacturer());
+        builder.append("<br/><b>Family: </b>").append(operatingSystem.getFamily());
+        builder.append("<br/><b>Version: </b>").append(operatingSystem.getVersionInfo());
+        builder.append("<br/><b>Bitness: </b>").append(operatingSystem.getBitness());
+        builder.append("<br/><b>Max File Descriptors: </b>").append(operatingSystem.getFileSystem().getMaxFileDescriptors());
+        builder.append("<br/><b>Open File Descriptors: </b>").append(operatingSystem.getFileSystem().getOpenFileDescriptors());
+        builder.append("<br/><b>Thread Count: </b>").append(operatingSystem.getThreadCount());
+        builder.append("<br/><b>Process Count: </b>").append(operatingSystem.getProcessCount());
+        builder.append("<br/><b>System Boot Time: </b>").append(operatingSystem.getSystemBootTime());
+        builder.append("<br/><b>System Uptime: </b>").append(operatingSystem.getSystemUptime());
+
+        return builder.toString();
+    }
+
+    private static String getComputerInfo() {
+        StringBuilder builder = new StringBuilder();
+        ComputerSystem computerSystem = App.si.getHardware().getComputerSystem();
+
+        builder.append("<b>Manufacturer: </b>").append(computerSystem.getManufacturer());
+        builder.append("<br/><b>Model: </b>").append(computerSystem.getModel());
+        builder.append("<br/><b>Serial Number: </b>").append(computerSystem.getSerialNumber());
+        builder.append("<br/><b>Hardware UUID: </b>").append(computerSystem.getHardwareUUID());
+        builder.append("<br/><b>Firmware Manufacturer: </b>").append(computerSystem.getFirmware().getManufacturer());
+        builder.append("<br/><b>Firmware Name: </b>").append(computerSystem.getFirmware().getName());
+        builder.append("<br/><b>Firmware Description: </b>").append(computerSystem.getFirmware().getDescription());
+        builder.append("<br/><b>Firmware Version: </b>").append(computerSystem.getFirmware().getVersion());
+        builder.append("<br/><b>Firmware Release Date: </b>").append(computerSystem.getFirmware().getReleaseDate());
+
+        return builder.toString();
+    }
+
+    private static String getBaseBoardInfo() {
+        StringBuilder builder = new StringBuilder();
+        Baseboard baseboard = App.si.getHardware().getComputerSystem().getBaseboard();
+
+
+        return builder.toString();
+    }
+
     {
 // GUI initializer generated by IntelliJ IDEA GUI Designer
 // >>> IMPORTANT!! <<<
diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/MainWindow.form b/src/main/java/com/luoboduner/moo/info/ui/form/MainWindow.form
index a8283fa..1a6744a 100644
--- a/src/main/java/com/luoboduner/moo/info/ui/form/MainWindow.form
+++ b/src/main/java/com/luoboduner/moo/info/ui/form/MainWindow.form
@@ -58,7 +58,7 @@
           <grid id="7119f" binding="diskPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
-              <tabbedpane title="Disk"/>
+              <tabbedpane title="Storage"/>
             </constraints>
             <properties/>
             <border type="none"/>
diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/MainWindow.java b/src/main/java/com/luoboduner/moo/info/ui/form/MainWindow.java
index 9b84c70..98e1ac7 100644
--- a/src/main/java/com/luoboduner/moo/info/ui/form/MainWindow.java
+++ b/src/main/java/com/luoboduner/moo/info/ui/form/MainWindow.java
@@ -91,7 +91,7 @@ public class MainWindow {
         tabbedPane.addTab("CPU", cpuPanel);
         diskPanel = new JPanel();
         diskPanel.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1));
-        tabbedPane.addTab("Disk", diskPanel);
+        tabbedPane.addTab("Storage", diskPanel);
         networkPanel = new JPanel();
         networkPanel.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1));
         tabbedPane.addTab("Network", networkPanel);