diff --git a/app/components/line-chart.js b/app/components/line-chart.js
index e22491e..d4899b9 100644
--- a/app/components/line-chart.js
+++ b/app/components/line-chart.js
@@ -52,22 +52,26 @@ export default Ember.Component.extend({
 					
 					// generate plot options
 					var options = {
-						series: {
-							lines: {
-								show: true,
-								lineWidth: 2
-							},
-							shadowSize: 0
-						},
-						xaxis: {
-				    	mode: 'time',
-				    	timeformat: '%M:%S',
-				    	min: firstTimestamp,
-				    	max: lastTimestamp
-						},
-						yaxis: {
-							tickDecimals: 3
-						}
+					  series: {
+					    lines: {
+					      show: true,
+					      lineWidth: 2
+					    },
+					    shadowSize: 0
+					  },
+					  xaxis: {
+					    mode: 'time',
+					    timeformat: '%M:%S',
+					    min: firstTimestamp,
+					    max: lastTimestamp,
+					    axisLabel: 'time [min]',
+					    axisLabelUseCanvas: true
+					  },
+					  yaxis: {
+					    tickDecimals: 1,
+					    axisLabel: this.data.get('type'),
+					    axisLabelUseCanvas: true
+					  }
 					}
 					
 					// set y axis scale
@@ -86,7 +90,7 @@ export default Ember.Component.extend({
 					}
 					
 					if (this.get('useLabel')) {
-						plotData.label = this.data.get('name') + " [" + this.data.get('type') + "]";
+						plotData.label = this.data.get('name');
 					}
 					
 					// draw plot
diff --git a/app/styles/app.css b/app/styles/app.css
index 7ace4ca..2733811 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -50,6 +50,11 @@ html, body {
 	display: none;
 }
 
+.vertical-text {
+  transform: rotate(270deg);
+  transform-origin: left top 0;
+}
+
 /*
  * Application
  */
@@ -178,7 +183,8 @@ p {
 }
 
 .layout-page {
-	background-color: #f2f2f2;
+	/*background-color: #f2f2f2;*/
+	background-color: #fff;
 	box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2),
 				0 9px 18px 0 rgba(0, 0, 0, 0.1);
 	
@@ -250,7 +256,8 @@ p {
 }
 
 .data-table {
-	background: #eee;
+	/*background: #eee;*/
+	background: #fff;
 
 	margin: 0;
 	padding: 0;
diff --git a/app/templates/components/entity-chart.hbs b/app/templates/components/entity-chart.hbs
index 980acdf..47c14ee 100644
--- a/app/templates/components/entity-chart.hbs
+++ b/app/templates/components/entity-chart.hbs
@@ -9,7 +9,11 @@
 			<h1 style="text-align: center">{{entityName}}</h1>
 		
 			{{#if entityAvailable}}
-				{{line-chart data=visibleProperty height="95%"}}
+				<p style="float: left; margin-top: 185px; margin-left: -8px;" class="vertical-text">[{{visibleProperty.type}}]</p>
+				<div style="padding-left: 10px">
+				  {{line-chart data=visibleProperty height="350px"}}
+				</div>
+				<p style="float: right">[min]</p>
 				
 				<!-- {{#if visibleProperty}}
 					<h4 class="label-source">Source: {{visibleProperty.source}}</h4>
diff --git a/app/templates/lab-mashup.hbs b/app/templates/lab-mashup.hbs
index cfe78f4..2772ddd 100644
--- a/app/templates/lab-mashup.hbs
+++ b/app/templates/lab-mashup.hbs
@@ -10,11 +10,15 @@
 			  <div class="layout-page">
 			    <h1>Control Center</h1>
 
-			    <h2>Voltage203937 [pu]</h2>
-			    {{line-chart data=S2Voltage203937 height="40%" useLabel=false}}
+			    <h2>Voltage203937</h2>
+			    <p style="float: left; margin-top: 85px; margin-left: -15px" class="vertical-text">[pu]</p>
+			    {{line-chart data=S2Voltage203937 height="150px" useLabel=false}}
+			    <p style="float: right">[min]</p>
 					  
-			    <h2>Frequency at the substation bus [Hz]</h2>
-			    {{line-chart data=S1Freq575 height="40%" useLabel=false}}
+			    <h2 style="margin-top: 20px;">Frequency at the substation bus</h2>
+			    <p style="float: left; margin-top: 85px; margin-left: -15px" class="vertical-text">[Hz]</p>
+			    {{line-chart data=S1Freq575 height="150px" useLabel=false}}
+			    <p style="float: right">[min]</p>
 			  </div>
 			</td>
 		</tr>
@@ -27,13 +31,17 @@
 			</td>
 			<td style="width: 33%; padding-bottom: 20px;">
 			  <div class="layout-page" id="consumer-page">
-					<h1>Prosumer behavior</h1>
+					<h1 style="text-align: center">Prosumer behavior</h1>
 					
-					<h2>Prosumer: Total consumption [MW]</h2>
-					{{line-chart data=S3LoadProfile height="40%" useLabel=false}}
+					<h2>Total consumption</h2>
+					<p style="float: left; margin-top: 85px; margin-left: -15px" class="vertical-text">[MW]</p>
+					{{line-chart data=S3LoadProfile height="150px" useLabel=false}}
+					<p style="float: right;">[min]</p>
 
-					<h2>Prosumer: Total PV generation [MW]</h2>
-					{{line-chart data=S3GenProfile height="40%" useLabel=false}}
+					<h2>Total PV generation</h2>
+					<p style="float: left; margin-top: 85px; margin-left: -15px;" class="vertical-text">[MW]</p>
+					{{line-chart data=S3GenProfile height="150px" useLabel=false}}
+					<p style="float: right;">[min]</p>
 				</div>
 			</td>
 		</tr>