diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 33c9a8a..c9e9c6b 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -27,27 +27,6 @@
             border-radius: 10px;
         }
 
-        .collapsible {
-            background-color: #333333;
-            color: black;
-            margin-top: 10px;
-            padding: 18px;
-            width: 100%;
-            border: none;
-            text-align: left;
-            outline: none;
-            font-size: 15px;
-        }
-
-        .content {
-            padding: 0 18px;
-            display: none;
-            overflow: hidden;
-            background-color: #999999;
-            color: #000;
-            border-radius: 10px;
-        }
-
         button {
             padding: 10px;
             border: #333333 3px solid;
@@ -146,6 +125,7 @@
 
         #dice-box {
             position: relative;
+            justify-self: center;
             box-sizing: border-box;
             width: 100%;
             height: 100%;
@@ -156,7 +136,6 @@
         #dice-box canvas {
             width: 100%;
             height: 100%;
-            margin: 20px
         }
 
         .checkbox {
@@ -259,136 +238,139 @@
 <body class="w3-theme-l1">
 <div class="w3-container w3-content"
      style="height: 95vh; display: flex; flex-direction: column; justify-content: space-between;  padding: 25px">
-    <h1 style="text-align: center"><i class="fa-solid fa-dice-d20"></i> Dice-Tower <i class="fa-solid fa-dice-d20"></i></h1>
+    <h1 style="text-align: center"><i class="fa-solid fa-dice-d20"></i> Dice-Tower <i class="fa-solid fa-dice-d20"></i>
+    </h1>
     <div class="w3-panel w3-theme-l4 w3-card w3-display-container"
          style="padding: 25px; text-align: center; margin-bottom: auto;">
-        <label for="name" id="nameLabel">Name </label><input type="text" id="name" style="width: 50%; margin-top: 20px"
-                                                             required onkeyup="start(event)"/><br/>
-        <label for="room" id="roomLabel">Room </label><input type="text" id="room" style="width: 50%" required
-                                                             onkeyup="start(event)"/><br/>
-        <div id="start-container" >
-            <button id="start" onclick="start()" style="align-self: center; margin-top: 20px">Join <i
-                    class="fa-solid fa-right-to-bracket"></i></button>
-            <label class="checkbox" id="gm-container">Join as GM
-                <input type="checkbox" id="gm" >
-                <span class="checkmark"></span>
-            </label>
-            <br/>
+        <h2 id="nameH" popovertarget="room-hint" data-trigger="hover" style="margin: 0" hidden>Name</h2>
+        <div>
+            <label for="name" id="nameLabel">Name </label>
+            <input type="text" id="name" style="width: 50%; margin-top: 20px" required onkeyup="start(event)"/>
+        </div>
+        <div>
+            <label for="room" id="roomLabel">Room </label>
+            <input type="text" id="room" style="width: 50%" required onkeyup="start(event)"/>
+        </div>
+        <div id="start-container">
+            <div>
+                <button id="start" onclick="start()" style="align-self: center; margin-top: 20px">Join <i
+                        class="fa-solid fa-right-to-bracket"></i></button>
+                <label class="checkbox" id="gm-container">Join as GM
+                    <input type="checkbox" id="gm">
+                    <span class="checkmark"></span>
+                </label>
+            </div>
+        </div>
+        <div id="options-container" hidden style="position: absolute; right: 25px; top: 5px">
+            <button id="customize" popovertarget="customize-overlay" style="align-self: center; margin-top: 20px"><i class="fa-solid fa-palette"></i>
+            </button>
+            <button id="urls" popovertarget="urls-overlay" style="align-self: center; margin-top: 20px"><i class="fa-solid fa-link"></i></button>
         </div>
     </div>
     <div id="dice-tower" hidden class="w3-panel w3-theme-l4 w3-card w3-display-container"
          style="padding: 25px; margin-bottom: auto">
-        <button type="button" class="collapsible" style="color: white; font-weight: bold">Overlay URLs <a><i
-                class="fa-solid fa-chevron-down"></i></a></button>
 
-        <div class="content">
-            <div id="overlay-urls">
-                <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline;">
-                    <label for="overlayId" id="overlayLabel">Dice-Overlay </label>
-                    <input type="text" readonly id="overlayId" style="flex-grow: 1" onclick="copyToClipboard(this.id)"/>
-                    <button id="overlay-hint-button" popovertarget="overlay-hint" data-trigger="hover"
-                            class="overlayButton"><i class="fa-solid fa-circle-info"></i>
-                    </button>
-                </div>
-            </div>
-            <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline;"
-                 hidden id="all-results-urls">
-                <label for="resultsId">All-Results-Overlay </label>
-                <input type="text" readonly id="resultsId" style="flex-grow: 1" onclick="copyToClipboard(this.id)"/>
-                <button popovertarget="all-results-hint" data-trigger="hover" class="overlayButton"><i
-                        class="fa-solid fa-circle-info"></i></button>
-            </div>
-            <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline;">
-                <label for="myResultsId">My-Results-Overlay </label>
-                <input type="text" readonly id="myResultsId" style="flex-grow: 1" onclick="copyToClipboard(this.id)"/>
-                <button popovertarget="my-results-hint" data-trigger="hover" class="overlayButton"><i
-                        class="fa-solid fa-circle-info"></i></button>
-            </div>
-        </div>
-        <button type="button" class="collapsible" style="color: white; font-weight: bold">Customize Dice <a><i
-                class="fa-solid fa-chevron-down"></i></a>
-        </button>
-        <div class="content">
-            <label for="theme">Theme </label>
-            <select name="theme" id="theme" style="margin: 25px">
-                <option value="default">Default</option>
-                <option value="blueGreenMetal">Blue-Green Metal</option>
-                <option value="diceOfRolling">Dice of Rolling</option>
-                <option value="gemstone">Gemstone</option>
-                <option value="gemstoneMarble">Marble Gemstone</option>
-                <option value="rock">Rock</option>
-                <option value="rust">Rust</option>
-                <option value="smooth">Smooth</option>
-                <option value="wooden">Wooden</option>
-            </select>
-            <color-picker id="themeColor"></color-picker>
-            <div id="dice-box"></div>
-
-            <button style="margin: 10px" id="preview">Preview <i class="fa-solid fa-magnifying-glass"></i></button>
-            <button style="margin: 10px" onclick="saveDice()">Save <i class="fa-solid fa-floppy-disk"></i></button>
-            <button popovertarget="save-dice-hint" data-trigger="hover" class="overlayButton"><i
-                    class="fa-solid fa-circle-info"></i></button>
-        </div>
-        <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: center; margin: 20px 25px;">
-            <label style="font-size: x-large; font-weight: bold;">Roll </label>
-            <button style="border: transparent; border-radius: 100%; font-size: x-large; font-weight: bold; height: 50px; width: 50px"
+        <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: center; margin: 10px; padding-right: 25px; padding-left: 25px">
+            <label style="font-size: large; font-weight: bold; margin: 10px">Roll </label>
+            <button style="border: transparent; border-radius: 100%; font-size: large; font-weight: bold; height: 50px; width: 50px"
                     onclick="removeDice()">-
             </button>
-            <label style="font-size: x-large; font-weight: bold;" id="dice-amount">1</label>
-            <button style="border: transparent; border-radius: 100%; font-size: x-large; font-weight: bold; height: 50px; width: 50px"
+            <label style="font-size: large; font-weight: bold" id="dice-amount">1</label>
+            <button style="border: transparent; border-radius: 100%; font-size: large; font-weight: bold; height: 50px; width: 50px"
                     onclick="addDice()">+
             </button>
-            <button style="font-size: x-large; font-weight: bold;" onclick="rollEasy('d4')">D4</button>
-            <button style="font-size: x-large; font-weight: bold;" onclick="rollEasy('d6')">D6</button>
-            <button style="font-size: x-large; font-weight: bold;" onclick="rollEasy('d8')">D8</button>
-            <button style="font-size: x-large; font-weight: bold;" onclick="rollEasy('d10')">D10</button>
-            <button style="font-size: x-large; font-weight: bold;" onclick="rollEasy('d12')">D12</button>
-            <button style="font-size: x-large; font-weight: bold;" onclick="rollEasy('d20')">D20</button>
-            <button style="font-size: x-large; font-weight: bold;" onclick="rollEasy('d100')">D100</button>
+            <button style="font-size: large; font-weight: bold;" onclick="rollEasy('d4')">D4</button>
+            <button style="font-size: large; font-weight: bold;" onclick="rollEasy('d6')">D6</button>
+            <button style="font-size: large; font-weight: bold;" onclick="rollEasy('d8')">D8</button>
+            <button style="font-size: large; font-weight: bold;" onclick="rollEasy('d10')">D10</button>
+            <button style="font-size: large; font-weight: bold;" onclick="rollEasy('d12')">D12</button>
+            <button style="font-size: large; font-weight: bold;" onclick="rollEasy('d20')">D20</button>
+            <button style="font-size: large; font-weight: bold;" onclick="rollEasy('d100')">D100</button>
         </div>
-        <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline; margin: 20px 25px;">
+        <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline; margin: 20px 25px 0;">
             <label for="command">Command </label>
-            <input type="text" id="command" style="flex-grow: 1" onkeyup="roll(event)"/>
+            <input popovertarget="command-hint" data-trigger="hover" type="text" id="command" style="flex-grow: 1" onkeyup="roll(event)"/>
             <button hidden id="roll" onclick="roll()">Roll <i class="fa-solid fa-dice"></i></button>
-            <button popovertarget="command-hint" data-trigger="hover" class="overlayButton"><i
-                    class="fa-solid fa-circle-info"></i></button>
+            <div style="margin: 20px 25px" id="all-results">
+                <label for="resultSwitch">Show all results </label>
+                <label class="switch">
+                    <input type="checkbox" id="resultSwitch">
+                    <span class="slider"></span>
+                </label>
+            </div>
         </div>
 
-        <div style="margin: 20px 25px" id="all-results">
-            <label for="resultSwitch">Show all results </label>
-            <label class="switch">
-                <input type="checkbox" id="resultSwitch">
-                <span class="slider"></span>
-            </label>
-        </div>
+
     </div>
     <div id="results" hidden class="w3-panel w3-theme-l6 w3-card w3-display-container"
          style="padding: 25px; flex-grow: 1; margin-bottom: auto">
-        <iframe id="resultFrame" title="results" style="width: 100%; height: 85%; overflow: hidden; border: 0"
+        <iframe id="resultFrame" title="results" style="width: 100%; height: 100%; overflow: hidden; border: 0"
                 onload="this.height=this.contentWindow.document.body.scrollHeight;"></iframe>
     </div>
 
-    <div popover id="overlay-hint" class="tooltip">
-        <p style="color: red; font-weight: bold">Only the last loaded instance of that overlay rolls the dice!</p>
-        <p>Query Params you can Change:</p>
-        <ul>
-            <li><strong>scale</strong> changes the size of the dice (any value over 1)</li>
-            <li><strong>clearAfter</strong> time until dice are cleared (in seconds; remove param or set -1 to keep the
-                dice)
-            </li>
-        </ul>
+    <div popover id="urls-overlay" class="tooltip" style="width: 600px">
+        <div id="overlay-urls">
+            <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline;">
+                <label for="overlayId" id="overlayLabel">Dice-Overlay </label>
+                <input popovertarget="overlay-hint" data-trigger="hover" type="text" readonly id="overlayId" style="flex-grow: 1" onclick="copyToClipboard(this.id)"/>
+            </div>
+        </div>
+        <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline;"
+             hidden id="all-results-urls">
+            <label for="resultsId">All-Results-Overlay </label>
+            <input popovertarget="all-results-hint" data-trigger="hover"  type="text" readonly id="resultsId" style="flex-grow: 1" onclick="copyToClipboard(this.id)"/>
+        </div>
+        <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline;">
+            <label for="myResultsId">My-Results-Overlay </label>
+            <input popovertarget="my-results-hint" data-trigger="hover" type="text" readonly id="myResultsId" style="flex-grow: 1" onclick="copyToClipboard(this.id)"/>
+        </div>
     </div>
-    <div popover id="all-results-hint" class="tooltip">
+    <div popover id="customize-overlay" class="tooltip" style="width: 680px;">
+        <label for="theme">Theme </label>
+        <select name="theme" id="theme" style="margin: 25px">
+            <option value="default">Default</option>
+            <option value="blueGreenMetal">Blue-Green Metal</option>
+            <option value="diceOfRolling">Dice of Rolling</option>
+            <option value="gemstone">Gemstone</option>
+            <option value="gemstoneMarble">Marble Gemstone</option>
+            <option value="rock">Rock</option>
+            <option value="rust">Rust</option>
+            <option value="smooth">Smooth</option>
+            <option value="wooden">Wooden</option>
+        </select>
+        <color-picker id="themeColor"></color-picker>
+        <div id="dice-box"></div>
+
+        <button style="margin: 10px" id="preview">Preview <i class="fa-solid fa-magnifying-glass"></i></button>
+        <button popovertarget="save-dice-hint" data-trigger="hover" style="margin: 10px" onclick="saveDice()">Save <i class="fa-solid fa-floppy-disk"></i></button>
+    </div>
+    <div hidden id="overlay-hint">
+        <div style="text-align: left">
+            <p style="color: red; font-weight: bold">Only the last loaded instance of that overlay rolls the dice!</p>
+            <p>Query Params you can Change:</p>
+            <ul>
+                <li><strong>scale</strong> changes the size of the dice (any value over 1)</li>
+                <li><strong>clearAfter</strong> time until dice are cleared (in seconds; remove param or set -1 to keep the
+                    dice)
+                </li>
+            </ul>
+        </div>
+    </div>
+
+    <div hidden id="all-results-hint">
         <p>Shows all Results in this room</p>
     </div>
-    <div popover id="my-results-hint" class="tooltip">
+    <div hidden id="my-results-hint">
         <p>Shows only my Results in this room</p>
     </div>
-    <div popover id="save-dice-hint" class="tooltip">
-        This saves your current theme and theme color for current Name
+    <div hidden id="save-dice-hint">
+        <p>This saves your current theme and theme color for <a id="save-dice-hint-name"></a></p>
     </div>
-    <div popover id="command-hint" class="tooltip">
-        Example Commands: "1d6", "2d8 1d100", "1d4 and 1d6", "2d20 & 1d2, "5d6+10"
+    <div hidden id="command-hint">
+        <p>Example Commands: "1d6", "2d8 1d100", "1d4 and 1d6", "2d20 & 1d2, "5d6+10"</p>
+    </div>
+    <div hidden id="room-hint">
+        <p>How is your character called?</p>
     </div>
 
     <div style="margin-top: 20px; flex-grow: 1" id="how-to">
@@ -406,8 +388,7 @@
                     <li style="color: red; font-weight: bold">Only the last loaded instance of that overlay rolls the
                         dice!
                     </li>
-                    <li>You can configure your Overlay with query parameters (more information at the info element next
-                        to the link)
+                    <li>You can configure your Overlay with query parameters (for more information hover over the link)
                     </li>
                 </ul>
                 <li>Configure your dice</li>
@@ -444,20 +425,21 @@
             document.getElementById('myResultsId').value = document.getElementById('resultsId').value + '?name=' + encodeURIComponent(document.getElementById('name').value) + '&user=' + localStorage.getItem('userId');
             document.getElementById('resultFrame').src = document.getElementById('myResultsId').value;
             document.getElementById('roll').hidden = false;
-            if (document.getElementById('rejoin')) {
-                document.getElementById('rejoin').hidden = true;
-            }
-            document.getElementById('start').hidden = true;
+            document.getElementById('start-container').hidden = true;
+            document.getElementById('options-container').hidden = false;
             document.getElementById('dice-tower').hidden = false;
             document.getElementById('name').hidden = true;
             document.getElementById('room').hidden = true;
-            document.getElementById('gm-container').hidden = true;
             document.getElementById('how-to').hidden = true;
             document.getElementById('results').hidden = false;
             document.getElementById('all-results').hidden = !document.getElementById('gm').checked;
             document.getElementById('all-results-urls').style.display = document.getElementById('gm').checked ? 'fles' : 'none';
-            document.getElementById('nameLabel').innerHTML = '<strong style="font-size:x-large;">' + document.getElementById('name').value + '</strong>';
-            document.getElementById('roomLabel').innerHTML = '<strong style="font-size:medium;">' + document.getElementById('room').value + '</strong>';
+            document.getElementById('nameH').innerHTML = '<strong style="font-size:x-large;">' + document.getElementById('name').value + '</strong>';
+            document.getElementById('save-dice-hint-name').innerHTML = '<strong>' + document.getElementById('name').value + '</strong>';
+            document.getElementById('roomLabel').hidden = true;
+            document.getElementById('nameLabel').hidden = true;
+            document.getElementById('nameH').hidden = false;
+            document.getElementById('room-hint').innerHTML = '<p>Room: <strong style="font-size:medium;">' + document.getElementById('room').value + '</strong></p>';
             document.getElementById('overlayLabel').innerHTML = 'Dice-Overlay for <strong>' + document.getElementById('name').value + '</strong>';
             document.title = document.getElementById('name').value + ' - Dice-Tower';
 
@@ -471,6 +453,9 @@
             if (localStorage.getItem(document.getElementById('name').value + "-themeColor")) {
                 document.getElementById('themeColor').setColor(localStorage.getItem(document.getElementById('name').value + "-themeColor"));
             }
+
+            document.getElementById('urls-overlay').showPopover();
+
             let httpRequest = new XMLHttpRequest();
             httpRequest.open('POST', url() + '/dice/' + document.getElementById('room').value + '/register')
             httpRequest.setRequestHeader('Content-Type', 'application/json')
@@ -497,20 +482,18 @@
                         let newLabel = document.createElement('label');
                         newLabel.for = data.id + 'url';
                         newLabel.innerHTML = "Dice-Overlay for <strong>" + data.name + "</strong>";
-                        let newInput = document.createElement('input');
+                        let newInput = document.getElementById('overlayId').cloneNode();
                         newInput.type = "text";
                         newInput.readOnly = true;
                         newInput.id = data.id + 'url';
                         newInput.style.flexGrow = '1';
                         newInput.value = data.overlay;
                         newInput.onclick = () => copyToClipboard(newInput.id)
-                        let hint = document.getElementById('overlay-hint-button').cloneNode(true);
                         newOverlay.appendChild(newLabel);
                         newOverlay.appendChild(newInput);
-                        newOverlay.appendChild(hint);
                         overlays.appendChild(newOverlay);
                     }
-                    showPopover();
+                    configurePopover();
                 });
             }
         }
@@ -540,21 +523,6 @@
         localStorage.setItem(document.getElementById('name').value + "-themeColor", document.getElementById('themeColor').value)
     }
 
-    let coll = document.getElementsByClassName("collapsible");
-
-    for (let i = 0; i < coll.length; i++) {
-        coll[i].addEventListener("click", function () {
-            const content = this.nextElementSibling;
-            if (content.style.display === "block") {
-                content.style.display = "none";
-                this.children[0].innerHTML = "<i class='fa-solid fa-chevron-down'></i>"
-            } else {
-                content.style.display = "block";
-                this.children[0].innerHTML = "<i class='fa-solid fa-chevron-up'></i>"
-            }
-        });
-    }
-
     if (localStorage.getItem('last-name') && localStorage.getItem('last-room')) {
         let rejoin = document.createElement('button');
         rejoin.id = 'rejoin';
@@ -571,22 +539,22 @@
         document.getElementById('start-container').appendChild(rejoin)
     }
 
-    function showPopover() {
+    function configurePopover() {
         const popover = document.querySelectorAll("[popovertarget][data-trigger='hover']");
 
         popover.forEach((e) => {
             const target = document.querySelector("#" + e.getAttribute("popovertarget"));
             e.addEventListener("mouseover", () => {
-                target.showPopover();
+                showSnackbar(target.innerHTML);
             });
 
             e.addEventListener("mouseout", () => {
-                target.hidePopover();
+                hideSnackbar();
             });
         });
     }
 
-    showPopover();
+    configurePopover();
 
     document.getElementById('resultSwitch').addEventListener('change', function () {
         if (!this.checked) {
@@ -616,10 +584,13 @@
         snackbar.innerHTML = message;
         snackbar.className = "show";
         snackbarContainer.className = "show";
-        setTimeout(function () {
-            snackbar.className = snackbar.className.replace("show", "");
-            snackbarContainer.className = snackbarContainer.className.replace("show", "");
-        }, 5000);
+    }
+
+    function hideSnackbar() {
+        let snackbar = document.getElementById("snackbar");
+        let snackbarContainer = document.getElementById("snackbar-container");
+        snackbar.className = snackbar.className.replace("show", "");
+        snackbarContainer.className = snackbarContainer.className.replace("show", "");
     }
 </script>
 <script type="module">
@@ -641,9 +612,8 @@
 
 </script>
 </body>
-<footer class="w3-theme-l1 w3-center w3-padding-16">
+<footer class="w3-theme-l1 w3-center">
     Version {version} ::
-    <a href="https://git.arindy.de/arindy/dice-tower" target="_blank" class="w3-hover-text-black">Dice-Tower on my
-        GitTea</a>
+    <a href="https://git.arindy.de/arindy/dice-tower" target="_blank" class="w3-hover-text-black"><i class="fa-solid fa-code"></i> Source on GitTea</a>
 </footer>
 </html>
