diff --git a/custom_cards/custom_card_heat_pump/Heat_pump.PNG b/custom_cards/custom_card_heat_pump/Heat_pump.PNG
deleted file mode 100644
index 72395f644..000000000
Binary files a/custom_cards/custom_card_heat_pump/Heat_pump.PNG and /dev/null differ
diff --git a/custom_cards/custom_card_heat_pump/custom_card_heat_pump.yaml b/custom_cards/custom_card_heat_pump/custom_card_heat_pump.yaml
index b3097b1ba..32d1f9f48 100644
--- a/custom_cards/custom_card_heat_pump/custom_card_heat_pump.yaml
+++ b/custom_cards/custom_card_heat_pump/custom_card_heat_pump.yaml
@@ -102,14 +102,14 @@ custom_card_heat_pump:
                 action: "perform-action"
                 perform_action: "climate.set_temperature"
                 target:
-                  entity_id: "[[[ return entity.entity_id ]]]"
+                  entity_id: "[[[ return entity.entity_id; ]]]"
                 data:
-                  temperature: "[[[ return entity.attributes.temperature - entity.attributes.target_temp_step ]]]"
+                  temperature: "[[[ return (entity.attributes.temperature - entity.attributes.target_temp_step); ]]]"
           item2:
             card:
               type: "custom:button-card"
-              entity: "[[[ return entity.entity_id ]]]"
-              name: "[[[ return entity.attributes.temperature + '°C' ]]]"
+              entity: "[[[ return entity.entity_id; ]]]"
+              name: "[[[ return (entity.attributes.temperature + '°C'); ]]]"
               styles:
                 card:
                   - box-shadow: "none"
@@ -124,9 +124,9 @@ custom_card_heat_pump:
                 action: "perform-action"
                 perform_action: "climate.set_temperature"
                 target:
-                  entity_id: "[[[ return entity.entity_id ]]]"
+                  entity_id: "[[[ return entity.entity_id; ]]]"
                 data:
-                  temperature: "[[[ return entity.attributes.temperature + entity.attributes.target_temp_step ]]]"
+                  temperature: "[[[ return (entity.attributes.temperature + entity.attributes.target_temp_step); ]]]"
     item3:
       card:
         type: "horizontal-stack"
@@ -138,7 +138,7 @@ custom_card_heat_pump:
               action: "perform-action"
               perform_action: "climate.set_hvac_mode"
               target:
-                entity_id: "[[[ return entity.entity_id ]]]"
+                entity_id: "[[[ return entity.entity_id; ]]]"
               data:
                 hvac_mode: "off"
           - type: "custom:button-card"
@@ -148,7 +148,7 @@ custom_card_heat_pump:
               action: "perform-action"
               perform_action: "climate.set_hvac_mode"
               target:
-                entity_id: "[[[ return entity.entity_id ]]]"
+                entity_id: "[[[ return entity.entity_id; ]]]"
               data:
                 hvac_mode: "heat"
             styles:
@@ -177,7 +177,7 @@ custom_card_heat_pump:
               action: "perform-action"
               perform_action: "climate.set_hvac_mode"
               target:
-                entity_id: "[[[ return entity.entity_id ]]]"
+                entity_id: "[[[ return entity.entity_id; ]]]"
               data:
                 hvac_mode: "cool"
             styles:
@@ -206,7 +206,7 @@ custom_card_heat_pump:
               action: "perform-action"
               perform_action: "climate.set_hvac_mode"
               target:
-                entity_id: "[[[ return entity.entity_id ]]]"
+                entity_id: "[[[ return entity.entity_id; ]]]"
               data:
                 hvac_mode: "heat_cool"
             styles:
@@ -235,7 +235,7 @@ custom_card_heat_pump:
               action: "perform-action"
               perform_action: "climate.set_hvac_mode"
               target:
-                entity_id: "[[[ return entity.entity_id ]]]"
+                entity_id: "[[[ return entity.entity_id; ]]]"
               data:
                 hvac_mode: "dry"
             styles:
@@ -264,7 +264,7 @@ custom_card_heat_pump:
               action: "perform-action"
               perform_action: "climate.set_hvac_mode"
               target:
-                entity_id: "[[[ return entity.entity_id ]]]"
+                entity_id: "[[[ return entity.entity_id; ]]]"
               data:
                 hvac_mode: "fan_only"
             styles:
diff --git a/custom_cards/custom_card_heat_pump/heat_pump.gif b/custom_cards/custom_card_heat_pump/heat_pump.gif
deleted file mode 100644
index dc8e233dc..000000000
Binary files a/custom_cards/custom_card_heat_pump/heat_pump.gif and /dev/null differ
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-ios-tapbar/minimalist-ios-tapbar.yaml b/custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-ios-tapbar/minimalist-ios-tapbar.yaml
index f49ac513d..d90c2f4a2 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-ios-tapbar/minimalist-ios-tapbar.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-ios-tapbar/minimalist-ios-tapbar.yaml
@@ -39,13 +39,6 @@ minimalist-ios-tapbar:
         a.menu-link[target="_blank"], ha-button-menu, ha-menu-button, [main-title] {
           display: none !important;
         }
-      div#view{
-        transform: initial;
-        padding: 0 !important;
-        margin: 0 !important;
-        width: 100%;
-        padding-bottom: var(--header-height) !important;
-      }
       .header {
         top: auto !important;
         bottom: 0px !important;
@@ -58,7 +51,12 @@ minimalist-ios-tapbar:
         background: var( --ha-card-background, var(--card-background-color) );
       }
       #view {
+        transform: initial;
+        padding: 0 !important;
+        margin: 0 !important;
+        width: 100%;
         padding-top: calc(-1 * var(--header-height)) !important;
+        padding-bottom: var(--header-height) !important;
       }
       ha-tabs {
         --paper-tabs-selection-bar-color: var(--header-tab-indicator-color) !important;
diff --git a/custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-mobile-tapbar/minimalist-mobile-tapbar.yaml b/custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-mobile-tapbar/minimalist-mobile-tapbar.yaml
index 615368a27..61b596686 100644
--- a/custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-mobile-tapbar/minimalist-mobile-tapbar.yaml
+++ b/custom_components/ui_lovelace_minimalist/lovelace/themefiles/minimalist-mobile-tapbar/minimalist-mobile-tapbar.yaml
@@ -33,13 +33,6 @@ minimalist-mobile-tapbar:
         width: 97%;
       }
     .: |
-      div#view{
-        transform: initial;
-        padding: 0 !important;
-        margin: 0 !important;
-        width: 100%;
-        padding-bottom: var(--header-height) !important;
-      }
       .header {
         top: auto !important;
         bottom: 0px !important;
@@ -51,7 +44,12 @@ minimalist-mobile-tapbar:
         padding-bottom: env(safe-area-inset-bottom) !important;
       }
       #view {
+        transform: initial;
+        padding: 0 !important;
+        margin: 0 !important;
+        width: 100%;
         padding-top: calc(-1 * var(--header-height)) !important;
+        padding-bottom: var(--header-height) !important;
       }
       ha-tabs {
         --paper-tabs-selection-bar-color: var(--header-tab-indicator-color);