diff --git a/pyweb/mumble/media/js/rendermumbleserver.js b/pyweb/mumble/media/js/rendermumbleserver.js
index 2762dfa..1405716 100644
--- a/pyweb/mumble/media/js/rendermumbleserver.js
+++ b/pyweb/mumble/media/js/rendermumbleserver.js
@@ -23,12 +23,12 @@ function renderserverinfos( server ){
     }
     buf.push( String.format( '<a href="{0}">{1}</a>', server.minurl, gettext( "Switch to minimal view" ) ) );
 
-    res = ['<div class="mumble-ext" id="serverstuffz">', '<ul>'];
+    res = ['<div class="mumble-ext" id="serverstuffz">', String.format( "<h2>{0}</h2><br />", server.name ), '<ul>'];
     for( var i = 0; i < buf.length; i++ )
         res.push( '<li>'+buf[i]+'</li>' );
     res.push( '</ul><br /><br />' );
     if( server.motd ){
-        res.push( String.format( '<b>{0}:</b><br />', gettext("Welcome message") ) );
+        res.push( String.format( '<h2>{0}:</h2>', gettext("Welcome message") ) );
         res.push( String.format( '<div style="padding: 10px">{0}</div>', server.motd ) );
     }
     res.push( '</div>' );
diff --git a/pyweb/mumble/templates/mumble/list.html b/pyweb/mumble/templates/mumble/list.html
index 319c4e3..aee3637 100644
--- a/pyweb/mumble/templates/mumble/list.html
+++ b/pyweb/mumble/templates/mumble/list.html
@@ -59,6 +59,11 @@
                         width: 1.
                     }],
                     listeners: {
+                        beforerender: function( listview ){
+                            listview.store.on("load", function( store, records, objects ){
+                                listview.select(0);
+                                });
+                        },
                         dblclick: function(listview){
                             selectedstuff = listview.getSelectedRecords();
                             MumbleList.serverurl( selectedstuff[0].data.id, function(provider, response){
@@ -78,7 +83,7 @@
                     region: "center",
                     title:  gettext("Server overview"),
                     ref:    'descrippanel',
-                    html:   "here goez teh servur descripshun",
+                    html:   gettext("Loading..."),
                 }],
             });
             function updateLayout(){