diff --git a/Kieker.WebGUI/src/main/webapp/Cockpit.xhtml b/Kieker.WebGUI/src/main/webapp/Cockpit.xhtml
index d8b1420da5e28b8cb7ab8d7f57c4a4e436e67441..31ecb088b06ba45d2da2370e7b55ebe2bb5e91e6 100644
--- a/Kieker.WebGUI/src/main/webapp/Cockpit.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/Cockpit.xhtml
@@ -7,11 +7,11 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://java.sun.com/jsp/jstl/core">
 
-     <f:metadata>
-         <f:viewParam name="projectName" value="#{currentCockpitBean.projectName}"/>
-         <f:event type="preRenderView" listener="#{currentCockpitBean.initalize()}"  />
+    <f:metadata>
+        <f:viewParam name="projectName" value="#{currentCockpitBean.projectName}"/>
+        <f:event type="preRenderView" listener="#{currentCockpitBean.initalize()}"  />
     </f:metadata>
-    
+
     <h:head>
         <title>Kieker.WebGUI</title>
         <link rel="stylesheet" type="text/css" href="../css/Common.css" />
@@ -59,7 +59,7 @@
                             <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-comment" value="  About..." onclick="aboutDlg.show()" ajax="true"/>
                         </p:submenu>
 
-                        <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" disabled="true"/>
+                        <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" url="login"/>
                     </p:menubar>
 
                 </h:form>
@@ -77,16 +77,22 @@
             </p:layoutUnit>
 
             <p:layoutUnit position="west" size="300" header="Views" resizable="true" collapsible="true">
-                <h:form id="viewsForm">
+                <h:form id="viewForm">
                     <p:poll interval="1" update=":centerForm"/>
-                    <p:accordionPanel multiple="true" activeIndex="" value="#{currentCockpitBean.project.views}" var="currView">
-                        <p:tab title="#{currView.name}">
+                    <p:dataList value="#{currentCockpitBean.project.views}" var="currView">  
+                        <p:commandLink style="#{currView == currentCockpitBean.activeView ? 'font-weight:bold' : ''}" value="#{currView.name}" action="#{currentCockpitBean.setActiveView(currView)}" id="viewLink" update=":viewForm"/>
+                        <p:tooltip for="viewLink">
+                            <b><h:outputText value="#{currView.name}"/></b>
+                            <br/>
                             <h:outputText value="#{currView.description}" rendered="#{not empty currView.description}"/>
                             <h:outputText value="No description available." rendered="#{empty currView.description}"/>
-                            <hr/>
-                            Click <h:commandLink value="here" action="#{currentCockpitBean.setActiveView(currView)}"/> to activate this view.
-                        </p:tab>
-                    </p:accordionPanel>
+                            <br/><br/>
+                            <b><h:outputText value="Displays"/></b>
+                            <p:dataList value="#{currView.displayConnectors}" var="connector">
+                                #{connector.getName()}
+                            </p:dataList>
+                        </p:tooltip>
+                    </p:dataList>
                 </h:form>
             </p:layoutUnit>
         </p:layout>
diff --git a/Kieker.WebGUI/src/main/webapp/CockpitEditor.xhtml b/Kieker.WebGUI/src/main/webapp/CockpitEditor.xhtml
index 452ace230ff8fdb190a5fcacbc37c897501cc80a..d0782ba6da1b6764012fdc1ad79453f833710d6a 100644
--- a/Kieker.WebGUI/src/main/webapp/CockpitEditor.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/CockpitEditor.xhtml
@@ -64,7 +64,7 @@
                             <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-comment" value="  About..." onclick="aboutDlg.show()" ajax="true"/>
                         </p:submenu>
 
-                        <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" disabled="true"/>
+                        <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" url="login"/>
                     </p:menubar>
 
                 </h:form>
diff --git a/Kieker.WebGUI/src/main/webapp/Controller.xhtml b/Kieker.WebGUI/src/main/webapp/Controller.xhtml
index 3665b9f1c757c74991f6374c77270cd5bf2b5c5f..9c54e90650b4044d5e795a145960e84ebd6ffccf 100644
--- a/Kieker.WebGUI/src/main/webapp/Controller.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/Controller.xhtml
@@ -60,7 +60,7 @@
                             <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-comment" value="  About..." onclick="aboutDlg.show()" ajax="true"/>
                         </p:submenu>
 
-                        <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" disabled="true"/>
+                       <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" url="login"/>
                     </p:menubar>
 
                 </h:form>
diff --git a/Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml b/Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml
index f2b13ec53f81c3bf455748ab9718262a2f37529a..387aadcb98f11c6d9e8178360808d32b886fe83e 100644
--- a/Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/ProjectOverview.xhtml
@@ -55,7 +55,7 @@
                             <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-comment" value="  About..." onclick="aboutDlg.show()" ajax="true"/>
                         </p:submenu>
 
-                        <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" disabled="true"/>
+                        <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" url="login"/>
                     </p:menubar>
                 </h:form>
             </p:layoutUnit>
diff --git a/Kieker.WebGUI/src/main/webapp/css/Cockpit.css b/Kieker.WebGUI/src/main/webapp/css/Cockpit.css
index 92fd9a4cf103854ad8bcbe51e1bc47d740badb4f..f76427d5f35cb64de7850e8f43df2255b9d2f0f4 100644
--- a/Kieker.WebGUI/src/main/webapp/css/Cockpit.css
+++ b/Kieker.WebGUI/src/main/webapp/css/Cockpit.css
@@ -1,5 +1,10 @@
-.@charset "UTF-8";
+@charset "UTF-8";
 
 ui-dashboard-column {
     width: 50%
+}
+
+/* This is necessary to remove the border from the datalist */
+.ui-datalist * {
+    border : 0px !important;
 }
\ No newline at end of file