diff --git a/waybar/modules.json b/waybar/modules.json
index 28c433a..78e87a7 100644
--- a/waybar/modules.json
+++ b/waybar/modules.json
@@ -183,19 +183,22 @@
 
     // CPU
     "cpu": {
-        "format": "/ C {usage}% "
+        "format": "/ C {usage}% ",
+        "on-click": "alacritty -e htop"
     },
 
     // Memory
     "memory": {
-        "format": "/ M {}% "
+        "format": "/ M {}i% ",
+        "on-click": "alacritty -e htop"
     },
 
     // Harddisc space used
     "disk": {
         "interval": 30,
         "format": "   {percentage_used}% ",
-        "path": "/"
+        "path": "/",
+        "on-click": "alacritty -e htop"
     }, 
     
     // Network
diff --git a/waybar/style.css b/waybar/style.css
index 06580f2..f2e3c91 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -160,7 +160,7 @@ window#waybar.empty #window {
 }
 
 #custom-wallpaper {
-    margin-right:22px;
+    margin-right:23px;
 }
 
 /* -----------------------------------------------------