diff --git a/config/caddy/Caddyfile b/config/caddy/Caddyfile
index 715bb37..78fb41f 100644
--- a/config/caddy/Caddyfile
+++ b/config/caddy/Caddyfile
@@ -13,6 +13,11 @@ http://loki {
 	handle_path /viz* {
 		reverse_proxy http://foxglove:8080
 	}
+
+	# this is not working right now
+	handle_path /joy* {
+		reverse_proxy http://host.docker.internal:8000
+	}
 }
 
 http://loki.local {
diff --git a/config/caddy/content/overview/index.html b/config/caddy/content/overview/index.html
index 1a599df..66027ed 100644
--- a/config/caddy/content/overview/index.html
+++ b/config/caddy/content/overview/index.html
@@ -12,30 +12,22 @@
 </head>
 
 <header>
-    <h1 id="HEADLINE">CPS Bot Mini Overview<img src="CPS_Logo_White_square_TRANSP.png" id="LOGO"></h1>
+    <h1 id="HEADLINE">Loki Overview<img src="CPS_Logo_White_square_TRANSP.png" id="LOGO"></h1>
 </header>
 
 <body>
-    <div class="box" id="LEFT">
-        <p class="mini-heads">Connect to Wi-Fi:</p>
-        <!-- replace mit relativen Link!!!, bei mir spinnts und es wird das gebrochene Bild symbol angezeigt. Anders geht
-        es allerdings, falls nicht bei dir sags mir -->
-        <img src="qr-loki.wifi.svg" class="qr">
-        <div id="NORM_SET">
-            <table>
-                <tr>
-                    <td>SSID:</td>
-                    <td>cps-loki</td>
-                </tr>
-                <tr>
-                    <td>Password: </td>
-                    <td>cps-loki</td>
-                </tr>
-            </table>
-        </div>
-    </div>
 
     <div class="box" id="RIGHT">
+        <div id="BLOCK_ONE">
+            <p class="mini-heads">Teleop:</p>
+            <!-- again -->
+            <!-- Replace link at href -->
+            <!-- hier Link zu Joystick -->
+            <a href="http://loki:8000/">
+            <img src="joystick.png" class="qr qr_2"></a>
+            <br>
+        </div>
+
         <div id="BLOCK_ONE">
             <p class="mini-heads">Robot Configuration:</p>
             <!-- again -->
@@ -64,7 +56,7 @@
             <p class="mini-heads">Manual:</p>
             <!-- again -->
             <!-- hier Link zu Manual -->
-            <a href="https://www.unileoben.ac.at/universitaet/lehrstuehle/institute/department-product-engineering/lehrstuhl-fuer-cyber-physical-systems/">
+            <a href="https://cps.unileoben.ac.at">
                 <img src="blueprint.svg" class="qr qr_2">
             </a>
             <br>
@@ -72,6 +64,25 @@
 
     </div>
 
+    <div class="box" id="LEFT">
+        <p class="mini-heads">Connect to Wi-Fi:</p>
+        <!-- replace mit relativen Link!!!, bei mir spinnts und es wird das gebrochene Bild symbol angezeigt. Anders geht
+        es allerdings, falls nicht bei dir sags mir -->
+        <img src="qr-loki.wifi.svg" class="qr">
+        <div id="NORM_SET">
+            <table>
+                <tr>
+                    <td>SSID:</td>
+                    <td>cps-loki</td>
+                </tr>
+                <tr>
+                    <td>Password: </td>
+                    <td>cps-loki</td>
+                </tr>
+            </table>
+        </div>
+    </div>
+
     <div class="info">
         <!-- Link zum Lehrstuhl, einfach den ganzen Div Block rausnehmen falls du das nicht willst -->
         <a href="https://cps.unileoben.ac.at/">Check us out!</a>
diff --git a/config/caddy/content/overview/joystick.png b/config/caddy/content/overview/joystick.png
new file mode 100644
index 0000000..6c127f3
Binary files /dev/null and b/config/caddy/content/overview/joystick.png differ
diff --git a/config/caddy/content/overview/qr_dummy_1.png b/config/caddy/content/overview/qr_dummy_1.png
deleted file mode 100644
index 4df57de..0000000
Binary files a/config/caddy/content/overview/qr_dummy_1.png and /dev/null differ
diff --git a/config/caddy/content/overview/qr_dummy_2.png b/config/caddy/content/overview/qr_dummy_2.png
deleted file mode 100644
index 4df57de..0000000
Binary files a/config/caddy/content/overview/qr_dummy_2.png and /dev/null differ
diff --git a/config/caddy/content/overview/qr_wifi_actual.png b/config/caddy/content/overview/qr_wifi_actual.png
deleted file mode 100644
index 4df57de..0000000
Binary files a/config/caddy/content/overview/qr_wifi_actual.png and /dev/null differ
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7c2e43c..9146a4e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -233,6 +233,8 @@ services:
     image: caddy:latest
     networks:
       - caddy_network
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     ports:
       - "80:80"
       - "443:443"
@@ -260,10 +262,14 @@ services:
     environment:
       - ROS_DOMAIN_ID=5
       - RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
-    restart: no
+    restart: always
   webui-joystick:
     image: husarion/webui-ros-joystick:noetic-0.0.1-20230510-stable
     network_mode: host
+    # networks:
+    #   - caddy_network
+    # ports:
+    #   - 8000:8000
     ipc: host
     environment:
       - ROS_DOMAIN_ID=5
