diff --git a/party/static/css/session.css b/party/static/css/session.css
index f172dbd..2351d9c 100644
--- a/party/static/css/session.css
+++ b/party/static/css/session.css
@@ -452,46 +452,34 @@ cursor: pointer;
     background-image: url('/static/icons/play.png');
 }
 
-#mate_reset {
+/* Ende Musik */
+
+/* Mate */
+
+.mate-control {
     background-color: #454443;
-    position: fixed;
-    width: 10%; 
-    height: 5%;
+    border: none;
+    padding: 10px;
     border-radius: 10px;
     cursor: pointer;
+    color: white;
     background-position: center;
     background-repeat: no-repeat;
     background-size: 60%;
-    border: none;
-    padding: 10px;
-    color: white;
-    font-size: 16px;
-    bottom: 10%;
-    top: 15%;
-    right: 45%;
-  
+}
+
+#mate_reset {
+    width: 10%; 
+    height: 5%;
 }
 
 #mate_hinzu {
-    background-color: #454443;
-    position: fixed;
-    width: 20%; 
+    width: 15%; 
     height: 5%;
-    border-radius: 10px;
-    cursor: pointer;
-    background-position: center;
-    background-repeat: no-repeat;
-    background-size: 60%;
-    border: none;
-    padding: 10px;
-    color: white;
-    font-size: 16px;
-    bottom: 10%;
-    top: 25%;
-    right: 41%;
-  
 }
 
+/* Ende Mate */
+
 /* Settings */
 
 .settings-control {
diff --git a/party/static/js/mate.js b/party/static/js/mate.js
index 4fbfd7c..b7098a2 100644
--- a/party/static/js/mate.js
+++ b/party/static/js/mate.js
@@ -90,3 +90,7 @@ socket.on('mate-resetten', () => {
         flasche.style.backgroundColor = '#c88a35';
     }
 });
+
+(function () {
+    getMateStatus(socket);
+})();
diff --git a/party/templates/session.html b/party/templates/session.html
index 337b3a6..ce3d3e6 100644
--- a/party/templates/session.html
+++ b/party/templates/session.html
@@ -204,8 +204,8 @@
             <h1>Mate</h1>
             <table id="mate_kiste">
             </table>
-            <button id="mate_reset" class="reset-kiste" onclick="resetKiste()">Reset</button>
-            <button id="mate_hinzu">Kasten Hinzufügen</button>
+            <button class="mate-control" id="mate_reset" onclick="resetKiste()">Reset</button>
+            <button class="mate-control" id="mate_hinzu">Kasten Hinzufügen</button>
         </div>
     </article>