diff --git a/guacamole/src/main/webapp/index.xhtml b/guacamole/src/main/webapp/index.xhtml
index fb2e9cc30..f3b066172 100644
--- a/guacamole/src/main/webapp/index.xhtml
+++ b/guacamole/src/main/webapp/index.xhtml
@@ -66,8 +66,8 @@
         <!-- Connection list UI -->
         <div id="connection-list-ui" style="display: none">
 
-            <div id="logout">
-                <a href="logout">Logout</a>
+            <div id="logout-panel">
+                <button id="logout">Logout</button>
             </div>
             
             <h1>
@@ -78,7 +78,7 @@
             <table class="connections">
                 <thead>
                     <tr>
-                        <th class="protocol">Protocol</th>
+                        <th class="protocol"> </th>
                         <th class="name">Name</th>
                     </tr>
                 </thead>
@@ -92,40 +92,11 @@
             Guacamole ${project.version}
         </div>
 
+        <script type="text/javascript" src="scripts/connections.js"></script>
+
         <!-- Init -->
         <script type="text/javascript"> /* <![CDATA[ */
 
-            function Config(protocol, id) {
-                this.protocol = protocol;
-                this.id = id;
-            }
-
-            function getConfigList() {
-
-                // Get config list
-                var xhr = new XMLHttpRequest();
-                xhr.open("GET", "configs", false);
-                xhr.send(null);
-
-                // If fail, throw error
-                if (xhr.status != 200)
-                    throw new Error(xhr.statusText);
-
-                // Otherwise, get list
-                var configs = new Array();
-
-                var configElements = xhr.responseXML.getElementsByTagName("config");
-                for (var i=0; i<configElements.length; i++) {
-                    configs.push(new Config(
-                        configElements[i].getAttribute("protocol"),
-                        configElements[i].getAttribute("id")
-                    ));
-                }
-
-                return configs;
-                
-            }
-
             function resetUI() {
 
                 var configs;
@@ -192,6 +163,11 @@
             var loginForm = document.getElementById("login-form");
             var loginUI = document.getElementById("login-ui");
             var connectionListUI = document.getElementById("connection-list-ui");
+            var logout = document.getElementById("logout");
+
+            logout.onclick = function() {
+                window.location.href = "logout";
+            };
 
             // TODO: Get connection list
             // On no-auth fail, show login UI 
diff --git a/guacamole/src/main/webapp/scripts/connections.js b/guacamole/src/main/webapp/scripts/connections.js
new file mode 100644
index 000000000..98f2a37c4
--- /dev/null
+++ b/guacamole/src/main/webapp/scripts/connections.js
@@ -0,0 +1,32 @@
+
+
+function Config(protocol, id) {
+    this.protocol = protocol;
+    this.id = id;
+}
+
+function getConfigList() {
+
+    // Get config list
+    var xhr = new XMLHttpRequest();
+    xhr.open("GET", "configs", false);
+    xhr.send(null);
+
+    // If fail, throw error
+    if (xhr.status != 200)
+        throw new Error(xhr.statusText);
+
+    // Otherwise, get list
+    var configs = new Array();
+
+    var configElements = xhr.responseXML.getElementsByTagName("config");
+    for (var i=0; i<configElements.length; i++) {
+        configs.push(new Config(
+            configElements[i].getAttribute("protocol"),
+            configElements[i].getAttribute("id")
+        ));
+    }
+
+    return configs;
+    
+}
diff --git a/guacamole/src/main/webapp/styles/login.css b/guacamole/src/main/webapp/styles/login.css
index 1db2c03b9..a9f7d43b7 100644
--- a/guacamole/src/main/webapp/styles/login.css
+++ b/guacamole/src/main/webapp/styles/login.css
@@ -177,14 +177,15 @@ div#connection-list-ui table tbody tr {
 div#connection-list-ui table td {
     padding: 0.25em;
     text-align: center;
+    font-size: 0.9em;
 }
 
 div#connection-list-ui table td.name {
     text-align: left;
 }
 
-div#connection-list-ui table tbody tr:nth-child(even)       { background: #CCC; }
-div#connection-list-ui table tbody tr:nth-child(odd)       { background: #EEE; }
+div#connection-list-ui table tbody tr:nth-child(even) { background: #CCC; }
+div#connection-list-ui table tbody tr:nth-child(odd)  { background: #EEE; }
 
 div#connection-list-ui table td.description {
     text-align: left;
@@ -205,8 +206,19 @@ div#connection-list-ui img {
     vertical-align: middle;
 }
 
-div#logout {
-    padding: 0.5em;
+div#logout-panel {
+    padding: 0.25em;
     text-align: right;
     float: right;
 }
+
+div#connection-list-ui a[href] {
+    text-decoration: none;
+    color: black;
+    font-weight: bold;
+    font-size: 0.9em;
+}
+
+div#connection-list-ui a[href]:hover {
+    text-decoration: underline;
+}