diff --git a/Kieker.WebGUI/src/main/webapp/AnalysisEditor.xhtml b/Kieker.WebGUI/src/main/webapp/AnalysisEditor.xhtml
index ad7d309de6e95bc013e721dda26730ead17a6124..5dd9c8f7968801795e9c08e2c006a29f78e8682b 100644
--- a/Kieker.WebGUI/src/main/webapp/AnalysisEditor.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/AnalysisEditor.xhtml
@@ -14,12 +14,18 @@
         <script type="text/javascript" src="../js/js-graph-it.js"/> 
         <link rel="stylesheet" type="text/css" href="../css/js-graph-it.css"/>
         <style>
+            .canvas {
+                font-family: tahoma;
+            }
             .block { 
                 position: absolute;
             }
             .connector {
                 background-color: #FF9900;
             }
+            .source-label, .middle-label, .destination-label {
+                padding: 5px;
+            }
         </style>
     </h:head>
 
@@ -69,11 +75,11 @@
 
             <p:layoutUnit position="center" id="centerLayout">
                 <h:form id="centerForm" style="height: 100%" rendered="#{not empty currentWorkSpaceProjectBean.project}">
-                    <div class="canvas" id="mainCanvas" style="width : 500px;height: 500px">
+                    <div class="canvas" id="mainCanvas" style="width : 100%;height: 100%">
                         <ui:repeat value="#{currentWorkSpaceProjectBean.project.plugins}" var="plugin" varStatus="counter">
                             <p:remoteCommand name="setPlugin#{counter.index}" action="#{currentWorkSpaceProjectBean.setSelectedPlugin(plugin)}" update=":propertiesForm"/>
                             <!-- Netbeans reports an error here, but the code does still work though... -->
-                            <div onclick="setPlugin#{counter.index}();" class="ui-panel ui-widget ui-widget-content ui-corner-all block draggable" id="#{stringToIDBean.stringToID(plugin)}" >
+                            <div onclick="setPlugin#{counter.index}();" style="left: #{counter.index * 90}px; top: #{counter.index * 70}px; position: absolute" class="ui-panel ui-widget ui-widget-content ui-corner-all block draggable" id="#{stringToIDBean.stringToID(plugin)}" >
                                 <div class="ui-panel-titlebar ui-widget-header ui-corner-all">
                                     <h:outputText style="font-weight: bold" value="#{plugin.getName()}"/>
                                 </div>
@@ -83,7 +89,7 @@
                         <ui:repeat value="#{currentWorkSpaceProjectBean.project.repositories}" var="repository" varStatus="counter">
                             <p:remoteCommand name="setRepository#{counter.index}" action="#{currentWorkSpaceProjectBean.setSelectedRepository(repository)}" update=":propertiesForm"/>
                             <!-- Netbeans reports an error here, but the code does still work though... -->
-                            <div onclick="setRepository#{counter.index}();" class="ui-panel ui-widget ui-widget-content ui-corner-all block draggable" id="#{stringToIDBean.stringToID(repository)}" >
+                            <div onclick="setRepository#{counter.index}();" style="left: #{(currentWorkSpaceProjectBean.project.plugins.size() + counter.index) * 90}px; top: #{counter.index * 70}px; position: absolute" class="ui-panel ui-widget ui-widget-content ui-corner-all block draggable" id="#{stringToIDBean.stringToID(repository)}" >
                                 <div class="ui-panel-titlebar ui-widget-header ui-corner-all">
                                     <h:outputText style="font-weight: bold" value="#{repository.getName()}"/>
                                 </div>