diff --git a/mojotrollz/sai/saimod_mojotrollz_server_classic/tpl/main.tpl b/mojotrollz/sai/saimod_mojotrollz_server_classic/tpl/main.tpl
index 5ca25a2..544fa38 100644
--- a/mojotrollz/sai/saimod_mojotrollz_server_classic/tpl/main.tpl
+++ b/mojotrollz/sai/saimod_mojotrollz_server_classic/tpl/main.tpl
@@ -3,6 +3,23 @@
         <div class="panel panel-default">
             <div class="panel-heading"><h4>Classic - Status</h4></div>
             <div class="panel-body">
+                <div id="vis_classic"></div>
+                <select id="filter_vis_classic">
+                    <option value="2692000">30d</option>
+                    <option value="1209600">14d</option>
+                    <option value="604800">7d</option>
+                    <option value="172800">2d</option>
+                    <option value="86400">1d</option>
+                    <option value="43200">12h</option>
+                    <option value="21600">6h</option>
+                    <option value="14400">4h</option>
+                    <option value="7200">2h</option>
+                    <option value="3600">1h</option>
+                    <option value="1800">30m</option>
+                    <option value="600" selected>10m</option>
+                </select>
+                <br>
+                <br>
                 <table class="table">
                     <tr>
                         <th>realm</th>
@@ -25,29 +42,10 @@
                         <td>${classic_test_players_online}</td>
                     </tr>
                 </table>
-                <div id="vis_classic"></div>
-                <select id="filter_vis_classic">
-                    <option value="2692000">30d</option>
-                    <option value="1209600">14d</option>
-                    <option value="604800">7d</option>
-                    <option value="172800">2d</option>
-                    <option value="86400">1d</option>
-                    <option value="43200">12h</option>
-                    <option value="21600">6h</option>
-                    <option value="14400">4h</option>
-                    <option value="7200">2h</option>
-                    <option value="3600">1h</option>
-                    <option value="1800">30m</option>
-                    <option value="600" selected>10m</option>
-                    <option value="300">5m</option>
-                    <option value="60">1m</option>
-                    <option value="30">30s</option>
-                    <option value="10">10s</option>
-                    <option value="5">5s</option>
-                    <option value="1">1s</option>
-            </select>
             </div>
         </div>
+    </div>
+    <div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading"><h4>Classic - Run</h4></div>
             <div class="panel-body">
@@ -73,6 +71,8 @@
                 </table>
             </div>
         </div>
+    </div>
+    <div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading"><h4>Classic - Database <font color="red" size="2">Stop the Server first!</font></h4></div>
             <div class="panel-body">
@@ -95,6 +95,8 @@
                 </table>
             </div>
         </div>
+    </div>
+    <div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading"><h4>Classic - Compile <font color="red" size="2">Stop the Server first!</font></h4></div>
             <div class="panel-body">
@@ -110,6 +112,8 @@
                 </table>
             </div>
         </div>
+    </div>
+    <div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading"><h4>Classic - Log</h4></div>
             <div class="panel-body">
diff --git a/mojotrollz/sai/saimod_mojotrollz_server_handling/tpl/main.tpl b/mojotrollz/sai/saimod_mojotrollz_server_handling/tpl/main.tpl
index 310665d..627bd2a 100644
--- a/mojotrollz/sai/saimod_mojotrollz_server_handling/tpl/main.tpl
+++ b/mojotrollz/sai/saimod_mojotrollz_server_handling/tpl/main.tpl
@@ -1,11 +1,7 @@
 <div class="panel panel-default">
-    <div class="panel-heading"><h4>Mojotrollz Server</h4></div>
+    <div class="panel-heading"><h4>Mojotrollz WoW-Servers</h4></div>
     <div class="panel-body">
         <div class="row">
-            <div class="col-md-12">
-                <button id="btn_update" class="btn-primary btn btn-sm" style="margin-right: 15px; height: 32px; font-size: 13px;"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span> Update</button>
-                <button id="btn_changes" class="btn-warning btn btn-sm" style="margin-right: 15px; height: 32px; font-size: 13px;"><span class="glyphicon glyphicon-search" aria-hidden="true"></span> Find Changes</button>
-            </div>
             <div class="col-md-6">
                 <div id="vis_classic"></div>
                 <select id="filter_vis_classic">
@@ -22,6 +18,8 @@
                     <option value="1800">30m</option>
                     <option value="600" selected>10m</option>
                 </select>
+                <br>
+                <br>
             </div>
             <div class="col-md-6">
                 <div id="vis_tbc"></div>
@@ -39,6 +37,12 @@
                         <option value="1800">30m</option>
                         <option value="600" selected>10m</option>
                 </select>
+                <br>
+                <br>
+            </div>
+            <div class="col-md-12">
+                <button id="btn_update" class="btn-primary btn btn-sm" style="margin-right: 15px; height: 32px; font-size: 13px;"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span> Update</button>
+                <button id="btn_changes" class="btn-warning btn btn-sm" style="margin-right: 15px; height: 32px; font-size: 13px;"><span class="glyphicon glyphicon-search" aria-hidden="true"></span> Find Changes</button>
             </div>
         </div>
     </div>
diff --git a/mojotrollz/sai/saimod_mojotrollz_server_tbc/tpl/main.tpl b/mojotrollz/sai/saimod_mojotrollz_server_tbc/tpl/main.tpl
index e6239fb..b663d30 100644
--- a/mojotrollz/sai/saimod_mojotrollz_server_tbc/tpl/main.tpl
+++ b/mojotrollz/sai/saimod_mojotrollz_server_tbc/tpl/main.tpl
@@ -3,6 +3,23 @@
         <div class="panel panel-default">
             <div class="panel-heading"><h4>TBC - Status</h4></div>
             <div class="panel-body">
+                <div id="vis_tbc"></div>
+                <select id="filter_vis_tbc">
+                        <option value="2692000">30d</option>
+                        <option value="1209600">14d</option>
+                        <option value="604800">7d</option>
+                        <option value="172800">2d</option>
+                        <option value="86400">1d</option>
+                        <option value="43200">12h</option>
+                        <option value="21600">6h</option>
+                        <option value="14400">4h</option>
+                        <option value="7200">2h</option>
+                        <option value="3600">1h</option>
+                        <option value="1800">30m</option>
+                        <option value="600" selected>10m</option>
+                </select>
+                <br>
+                <br>
                 <table class="table">
                     <tr>
                         <th>realm</th>
@@ -25,29 +42,10 @@
                         <td>${tbc_test_players_online}</td>
                     </tr>
                 </table>
-                <div id="vis_tbc"></div>
-                <select id="filter_vis_tbc">
-                        <option value="2692000">30d</option>
-                        <option value="1209600">14d</option>
-                        <option value="604800">7d</option>
-                        <option value="172800">2d</option>
-                        <option value="86400">1d</option>
-                        <option value="43200">12h</option>
-                        <option value="21600">6h</option>
-                        <option value="14400">4h</option>
-                        <option value="7200">2h</option>
-                        <option value="3600">1h</option>
-                        <option value="1800">30m</option>
-                        <option value="600" selected>10m</option>
-                        <option value="300">5m</option>
-                        <option value="60">1m</option>
-                        <option value="30">30s</option>
-                        <option value="10">10s</option>
-                        <option value="5">5s</option>
-                        <option value="1">1s</option>
-                </select>
             </div>
         </div>
+    </div>
+    <div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading"><h4>TBC - Run</h4></div>
             <div class="panel-body">
@@ -73,6 +71,8 @@
                 </table>
             </div>
         </div>
+    </div>
+    <div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading"><h4>TBC - Database <font color="red" size="2">Stop the Server first!</font></h4></div>
             <div class="panel-body">
@@ -95,6 +95,8 @@
                 </table>
             </div>
         </div>
+    </div>
+    <div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading"><h4>TBC - Compile <font color="red" size="2">Stop the Server first!</font></h4></div>
             <div class="panel-body">
@@ -110,6 +112,8 @@
                 </table>
             </div>
         </div>
+    </div>
+    <div class="col-md-6">
         <div class="panel panel-default">
             <div class="panel-heading"><h4>TBC - Log</h4></div>
             <div class="panel-body">