diff --git a/modules/bar/Battery.qml b/modules/bar/Battery.qml
index b3a22aa..c63ca19 100644
--- a/modules/bar/Battery.qml
+++ b/modules/bar/Battery.qml
@@ -1,63 +1,71 @@
-import Quickshell
 import Quickshell.Services.UPower
 import QtQuick
-import Quickshell.Widgets
 import "../../reusables/"
-import "../../"
 import "../../settings/"
+import "../../"
 
 Loader {
     id: batLoader
     active: UPower.displayDevice.isLaptopBattery
+    anchors.verticalCenter: parent.verticalCenter
 
-    sourceComponent: Item {
-        id: root
+    sourceComponent: Rectangle {
+        id: container
+        radius: implicitHeight / 2
+        color: Colors.color0
+        anchors.verticalCenter: parent.verticalCenter
+        implicitWidth: root.implicitWidth + 20
+        implicitHeight: Settings.config.barHeight - 10
+        Item {
+                anchors.centerIn: parent
+            id: root
 
-        property bool frame1: UPower.displayDevice.percentage <= 0.16
-        property bool frame2: UPower.displayDevice.percentage < 0.32
-        property bool frame3: UPower.displayDevice.percentage < 0.48
-        property bool frame4: UPower.displayDevice.percentage < 0.74
-        property bool frame5: UPower.displayDevice.percentage < 0.90
-        property bool frame6: UPower.displayDevice.percentage <= 1
+            property bool frame1: UPower.displayDevice.percentage <= 0.16
+            property bool frame2: UPower.displayDevice.percentage < 0.32
+            property bool frame3: UPower.displayDevice.percentage < 0.48
+            property bool frame4: UPower.displayDevice.percentage < 0.74
+            property bool frame5: UPower.displayDevice.percentage < 0.90
+            property bool frame6: UPower.displayDevice.percentage <= 1
 
-        function getBatteryIcon() {
-            if (UPower.displayDevice.state == UPowerDeviceState.Charging) {
-                return "battery_android_frame_bolt";
+            function getBatteryIcon() {
+                if (UPower.displayDevice.state == UPowerDeviceState.Charging) {
+                    return "battery_android_frame_bolt";
+                }
+                if (frame1) {
+                    return "battery_android_frame_1";
+                }
+                if (frame2) {
+                    return "battery_android_frame_2";
+                }
+                if (frame3) {
+                    return "battery_android_frame_3";
+                }
+                if (frame4) {
+                    return "battery_android_frame_4";
+                }
+                if (frame5) {
+                    return "battery_android_frame_5";
+                }
+                if (frame6) {
+                    return "battery_android_frame_full";
+                }
             }
-            if (frame1) {
-                return "battery_android_frame_1";
-            }
-            if (frame2) {
-                return "battery_android_frame_2";
-            }
-            if (frame3) {
-                return "battery_android_frame_3";
-            }
-            if (frame4) {
-                return "battery_android_frame_4";
-            }
-            if (frame5) {
-                return "battery_android_frame_5";
-            }
-            if (frame6) {
-                return "battery_android_frame_full";
-            }
-        }
 
-        implicitWidth: batRow.width
-        implicitHeight: Settings.config.barHeight
+            implicitWidth: batRow.width
+            implicitHeight: Settings.config.barHeight
 
-        Row {
-            id: batRow
-            anchors.verticalCenter: parent.verticalCenter
-            spacing: 5
-            CustomText {
-                id: batText
-                text: Math.round(UPower.displayDevice.percentage * 100) + "%"
-            }
-            CustomIcon {
-                id: batIcon
-                text: root.getBatteryIcon()
+            Row {
+                id: batRow
+                anchors.verticalCenter: parent.verticalCenter
+                spacing: 5
+                CustomText {
+                    id: batText
+                    text: Math.round(UPower.displayDevice.percentage * 100) + "%"
+                }
+                CustomIcon {
+                    id: batIcon
+                    text: root.getBatteryIcon()
+                }
             }
         }
     }
diff --git a/modules/bar/Title.qml b/modules/bar/Title.qml
index 7beb776..ca39764 100644
--- a/modules/bar/Title.qml
+++ b/modules/bar/Title.qml
@@ -9,17 +9,17 @@ Rectangle {
     radius: implicitHeight / 2
     color: Colors.color0
     anchors.verticalCenter: parent.verticalCenter
-    implicitWidth:  root.implicitWidth
+    implicitWidth: root.implicitWidth
     implicitHeight: Settings.config.barHeight - 10
     Item {
         id: root
         readonly property var activeWindow: ToplevelManager.activeToplevel
-        implicitWidth:titleText.implicitWidth + 20
+        implicitWidth: titleText.implicitWidth + 20
         implicitHeight: Settings.config.barHeight
         CustomText {
-          anchors.horizontalCenter: parent.horizontalCenter
             id: titleText
-            text: root.activeWindow.activated ? root.activeWindow.appId : "Desktop"
+            anchors.horizontalCenter: parent.horizontalCenter
+            text: root.activeWindow ? root.activeWindow.activated ? root.activeWindow.appId : "Desktop" : "fail"
             elide: Text.ElideRight
         }
     }