diff --git a/apps/nspanel-lovelace-ui/luibackend/config.py b/apps/nspanel-lovelace-ui/luibackend/config.py
index 166dbacb..08782d97 100644
--- a/apps/nspanel-lovelace-ui/luibackend/config.py
+++ b/apps/nspanel-lovelace-ui/luibackend/config.py
@@ -101,6 +101,7 @@ class LuiBackendConfig(object):
             'dateAdditionalTemplate': "",
             'timeAdditionalTemplate': "",
             'dateFormat': "%A, %d. %B %Y",
+            'homeButton': False,
             'cards': [{
                 'type': 'cardEntities',
                 'entities': [{
diff --git a/apps/nspanel-lovelace-ui/luibackend/controller.py b/apps/nspanel-lovelace-ui/luibackend/controller.py
index 998b9252..e2901d35 100644
--- a/apps/nspanel-lovelace-ui/luibackend/controller.py
+++ b/apps/nspanel-lovelace-ui/luibackend/controller.py
@@ -228,7 +228,14 @@ class LuiController(object):
             else:
                 self._current_card = self._config.getCard(0)
             self._pages_gen.render_card(self._current_card)
-
+        if button_type == "bHome":
+            if self._previous_cards:
+                self._current_card = self._previous_cards[0]
+                self._previous_cards.clear()
+            else:
+                self._current_card = self._config.getCard(0)
+            self._pages_gen.render_card(self._current_card)
+            
         if button_type == "bNext":
             card = self._config.getCard(self._current_card.pos+1)
             self._current_card = card
diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py
index 12e484ea..e101ed09 100644
--- a/apps/nspanel-lovelace-ui/luibackend/pages.py
+++ b/apps/nspanel-lovelace-ui/luibackend/pages.py
@@ -620,12 +620,17 @@ class LuiPagesGen(object):
     def render_card(self, card, send_page_type=True):    
         apis.ha_api.log(f"Started rendering of page {card.pos} with type {card.cardType}")
         
+        l = 1
+        r = 1
         if len(self._config._config_cards) == 1:
-            navigation = "0|0"
-        else:
-            navigation = "1|1"
+            l = 0
+            r = 0
         if card.pos is None:
-            navigation = "2|0"            
+            l = 2
+            r = 0
+            if self._config.get("homeButton"):
+                r = 2
+        navigation = f"{l}|{r}"         
 
         # Switch to page
         if send_page_type: