diff --git a/config/floorplan-lovelace.yaml b/config/floorplan-lovelace.yaml
index 7f5348c..df20176 100644
--- a/config/floorplan-lovelace.yaml
+++ b/config/floorplan-lovelace.yaml
@@ -40,6 +40,12 @@ views:
 
           - binary_sensor.motion_1_ias_zone
           - binary_sensor.motion_2_ias_zone
+
+          - input_boolean.floorplan_night_mode
+          - input_boolean.floorplan_show_all
+          - input_boolean.guest_mode
+          - input_boolean.speech_notifications
+          - input_boolean.georgi_home
         card:
           type: picture-elements
           image: /local/images/floorplan/floorplan_night_transparent.png
diff --git a/config/lovelace/decluttering_templates/cards/network_card.yaml b/config/lovelace/decluttering_templates/cards/network_card.yaml
new file mode 100644
index 0000000..1601715
--- /dev/null
+++ b/config/lovelace/decluttering_templates/cards/network_card.yaml
@@ -0,0 +1,59 @@
+network_card:
+  default:
+    - title:
+    - icon:
+  card:
+    type: vertical-stack
+    cards:
+      - type: entities
+        title: "[[title]]"
+        icon: "[[icon]]"
+        entities:
+          - type: custom:dummy-entity-row
+            entity: sensor.fast_com_download
+            name: Open admin UI
+            icon: mdi:firefox
+            tap_action:
+              action: url
+              url_path: http://router.lan
+      - type: "custom:mini-graph-card"
+        animate: true
+        points_per_hour: 1
+        hours_to_show: 72
+        show:
+          graph: bar
+          average: true
+          extrema: true
+        entities:
+          - entity: sensor.fast_com_download
+
+      - type: "custom:mini-graph-card"
+        animate: true
+        points_per_hour: 1
+        hours_to_show: 72
+        show:
+          graph: bar
+          average: true
+          extrema: true
+        entities:
+          - entity: sensor.speedtest_download
+
+      - type: horizontal-stack
+        cards:
+          - type: custom:mini-graph-card
+            points_per_hour: 0.3
+            hours_to_show: 72
+            font_size: 75
+            line_color: var(--accent-color)
+            line_width: 6
+            entities:
+              - sensor.speedtest_upload
+
+          - type: custom:mini-graph-card
+            font_size: 75
+            points_per_hour: 0.3
+            hours_to_show: 72
+            line_color: var(--accent-color)
+            line_width: 6
+            entities:
+              - sensor.speedtest_ping
diff --git a/config/lovelace/floorplan-dashboard/picture_elements/sensors.yaml b/config/lovelace/floorplan-dashboard/picture_elements/sensors.yaml
index 73c8e5c..e9eb2a7 100644
--- a/config/lovelace/floorplan-dashboard/picture_elements/sensors.yaml
+++ b/config/lovelace/floorplan-dashboard/picture_elements/sensors.yaml
@@ -24,6 +24,17 @@
         - tap_action:
             action: more-info
 
+    # Router
+    - type: custom:decluttering-card
+      template: floorplan_state_with_icon
+      variables:
+        - entity: sensor.fast_com_download
+        - top: 54%
+        - left: 54%
+        - icon: mdi:router-wireless
+        - tap_action:
+            action: more-info
+
     # Shield + TV
     - type: custom:decluttering-card
       template: floorplan_state_with_icon
diff --git a/config/lovelace/home_dashboard/08_network.yaml b/config/lovelace/home_dashboard/08_network.yaml
index 9c0d465..428c9df 100644
--- a/config/lovelace/home_dashboard/08_network.yaml
+++ b/config/lovelace/home_dashboard/08_network.yaml
@@ -96,46 +96,8 @@ cards:
                   entities:
                     - sensor.pi_hole_seen_clients
 
-        - type: vertical-stack
-          cards:
-            - type: "custom:mini-graph-card"
-              animate: true
-              points_per_hour: 1
-              hours_to_show: 72
-              show:
-                graph: bar
-                average: true
-                extrema: true
-              entities:
-                - entity: sensor.fast_com_download
-
-            - type: "custom:mini-graph-card"
-              animate: true
-              points_per_hour: 1
-              hours_to_show: 72
-              show:
-                graph: bar
-                average: true
-                extrema: true
-              entities:
-                - entity: sensor.speedtest_download
-
-            - type: horizontal-stack
-              cards:
-                - type: custom:mini-graph-card
-                  points_per_hour: 0.3
-                  hours_to_show: 72
-                  font_size: 75
-                  line_color: var(--accent-color)
-                  line_width: 6
-                  entities:
-                    - sensor.speedtest_upload
-
-                - type: custom:mini-graph-card
-                  font_size: 75
-                  points_per_hour: 0.3
-                  hours_to_show: 72
-                  line_color: var(--accent-color)
-                  line_width: 6
-                  entities:
-                    - sensor.speedtest_ping
+        - type: custom:decluttering-card
+          template: network_card
+          variables:
+            - title: Network
+            - icon: mdi:router-wireless
diff --git a/config/lovelace/popup_cards.yaml b/config/lovelace/popup_cards.yaml
index 2f88277..4b19965 100644
--- a/config/lovelace/popup_cards.yaml
+++ b/config/lovelace/popup_cards.yaml
@@ -8,6 +8,9 @@ broader_popup_style: &broad_popup_style
   width: 40%
   min-width: 500px
 
+no_margin: &no_margin
+  margin-bottom: 0
+
 binary_sensor.house_mode:
   title: House mode
   style: *popup_style
@@ -170,8 +173,8 @@ sensor.synology_dsm_type_volume_1:
   title: Platinum
   style:
     <<: *popup_style
+    <<: *no_margin
     height: 80%
-    margin-bottom: 0;
   card:
     type: custom:decluttering-card
     template: platinum_card
@@ -184,3 +187,12 @@ switch.titanium_power:
   card:
     type: custom:decluttering-card
     template: titanium_card
+
+sensor.fast_com_download:
+  title: Network Speed
+  style:
+    <<: *popup_style
+    <<: *broad_popup_style
+  card:
+    type: custom:decluttering-card
+    template: network_card