diff --git a/app/components/line-chart.js b/app/components/line-chart.js
index 2cca294..d3ed5de 100644
--- a/app/components/line-chart.js
+++ b/app/components/line-chart.js
@@ -31,7 +31,7 @@ export default Ember.Component.extend({
         var lastTimestamp = this.data[this.data.length - 1][0];
 
         var diff = lastTimestamp - firstTimestamp;
-        var diffValue = this.xaxisLength * 100;
+        var diffValue = this.xaxisLength * 1000;
 
         if (diff > diffValue) {
           firstTimestamp = lastTimestamp - diffValue;
diff --git a/app/routes/lab-mashup.js b/app/routes/lab-mashup.js
index f066f4f..13de805 100644
--- a/app/routes/lab-mashup.js
+++ b/app/routes/lab-mashup.js
@@ -28,7 +28,7 @@ export default Ember.Route.extend({
     // fetch new data from server
     this.store.query('entity', { entities: [
       {
-        id: 'S3_ElectricalGrid',
+        id: 'S1_ElectricalGrid',
         isPattern: false,
         type: 'ElectricalGridMonitoring'
       },
diff --git a/app/styles/app.css b/app/styles/app.css
index 12d8121..4272933 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -64,6 +64,8 @@ h2 {
 	margin: 0;
 
 	border: 0;
+	
+	border-collapse: collapse;
 }
 
 .grid2x2 td {
@@ -79,11 +81,22 @@ h2 {
 }
 
 #S1-left {
-	width: 200px;
+	width: 150px;
 }
 
 #S1-right {
 	width: auto;
+	
+	padding: 25px;
+	padding-bottom: 30px;
+}
+
+#S1-right h3 {
+	text-align: center;
+}
+
+#S1-right h4 {
+	text-align: right;
 }
 
 #S2-left {
diff --git a/app/templates/components/property-table.hbs b/app/templates/components/property-table.hbs
index 3325f68..df07bf6 100644
--- a/app/templates/components/property-table.hbs
+++ b/app/templates/components/property-table.hbs
@@ -3,6 +3,6 @@
 </tr>
 {{#each model.properties as |property|}}
   <tr>
-    <td {{action "propertyClicked" property}}>{{property.name}}</td>
+    <td><a href="#" {{action "propertyClicked" property}}>{{property.name}}</a></td>
   </tr>
 {{/each}}
diff --git a/app/templates/lab-mashup.hbs b/app/templates/lab-mashup.hbs
index 04ed7a1..ecd665d 100644
--- a/app/templates/lab-mashup.hbs
+++ b/app/templates/lab-mashup.hbs
@@ -16,7 +16,9 @@
 						</td>
 
 						<td id="S1-right">
-							{{line-chart data=S1Property.values dataName=S1Property.name}}
+							<h3>{{S1Property.name}}</h3>
+							{{line-chart data=S1Property.values}}
+							<h4>{{S1Property.type}}</h4>
 						</td>
 					</tr>
 				</table>
@@ -33,7 +35,7 @@
 							{{property-table model=S2Entity showProperty="showPropertyValues"}}
 						</td>
 						<td id="S2-right">
-							{{line-chart data=S2Property.values dataName=S2Property.name}}
+							{{line-chart data=S2Property.values}}
 						</td>
 					</tr>
 				</table>