diff --git a/app/components/architecture-visualisation-cytoscape/style.js b/app/components/architecture-visualisation-cytoscape/style.js
index f2538970bc92c650579494d81d6adff7e10571e4..bfa4a4f976c072dd97dae0fb0d7532d3174c26d8 100644
--- a/app/components/architecture-visualisation-cytoscape/style.js
+++ b/app/components/architecture-visualisation-cytoscape/style.js
@@ -46,9 +46,10 @@ $node > node { /* compounds. "Nodes" in meta model. $ selects the parent node th
 }
 
 [type="service"] {
-    background-color: ${theme.nodeColor};
+    background-color: ${theme.serviceColor};
     color: ${theme.nodeTextColor};
     border-color: ${theme.nodeBorderColor};
+    border-width: 2px;
     font-weight: bold;
     z-index: 100;
 }
diff --git a/app/services/architecture-graphing-service.js b/app/services/architecture-graphing-service.js
index 106a86b62a6bc938910e0e2cbd4880865b8de3eb..baa34752cd3352e81566e8b2710634e960d21aff 100644
--- a/app/services/architecture-graphing-service.js
+++ b/app/services/architecture-graphing-service.js
@@ -32,7 +32,7 @@ export default Ember.Service.extend({
             data: data
         });
     });
-    
+
     // serviceInstances.forEach(data => {
     //     data.label = data.name;
     //     data.parent = data.serviceId;
@@ -52,7 +52,8 @@ export default Ember.Service.extend({
             .filter((instance) => instance.get('communicationId') === data.id );
 
         data.workload = instanceList.reduce((previous, instance) => previous + instance.get('workload'), 0);
-        this.debug('workload: ', data.workload);
+
+        //TODO Normalize
 
         network.edges.push({
             data,