diff --git a/app/components/line-chart.js b/app/components/line-chart.js
index 5813ad8..1cf8412 100644
--- a/app/components/line-chart.js
+++ b/app/components/line-chart.js
@@ -3,7 +3,7 @@ import Ember from 'ember';
 export default Ember.Component.extend({
   tagName: 'div',
   classNames: ['line-chart'],
-  xaxisLength: 30,
+  xaxisLength: 100,
 
   init: function() {
     this._super();
diff --git a/app/styles/app.css b/app/styles/app.css
index 33b8dbe..b0f96e6 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -61,18 +61,18 @@ footer {
 
 .layout-left {
 	float: left;
-	width: 50%;
 
-	padding-top: 10px;
-	/*padding-left: 25px;*/
+	height: 100%;
+
+	/*margin: 10px;*/
 }
 
 .layout-right {
 	float: right;
-	width: 50%;
 
-	padding-top: 10px;
-	/*padding-right: 25px;*/
+	height: 100%;
+
+	/*margin: 10px;*/
 }
 
 .layout::after {
@@ -81,12 +81,16 @@ footer {
 	clear: both;
 }
 
+#properties {
+	padding-top: 20px;
+}
+
 #properties > .layout-left {
 	width: 25%;
 }
 
 #properties > .layout-right {
-	width: 75%;
+	width: 70%;
 }
 
 #main > .layout-left {
@@ -94,7 +98,7 @@ footer {
 }
 
 #main > .layout-right {
-	width: 60%;
+	width: 55%;
 }
 
 .data-table {
@@ -133,10 +137,8 @@ footer {
 }
 
 .line-chart {
-	width: 100%;
+	width: 90%;
 	height: 500px;
-
-	margin: 10px;
 }
 
 .mockup-image {
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
index c9faed0..9fec6be 100644
--- a/app/templates/application.hbs
+++ b/app/templates/application.hbs
@@ -2,10 +2,11 @@
 	<header id="header">
 		Lab Mashup Visualization
 	</header>
-	
+
 	{{outlet}}
 </section>
-
+<!--
 <footer id="info">
 	<p>&copy; 2015 - Institute for Automation of Complex Power Systems</p>
 </footer>
+-->
diff --git a/app/templates/components/line-chart.hbs b/app/templates/components/line-chart.hbs
index e69de29..8b13789 100644
--- a/app/templates/components/line-chart.hbs
+++ b/app/templates/components/line-chart.hbs
@@ -0,0 +1 @@
+
diff --git a/app/templates/lab-mashup/entity/property.hbs b/app/templates/lab-mashup/entity/property.hbs
index 134e322..76d3e37 100644
--- a/app/templates/lab-mashup/entity/property.hbs
+++ b/app/templates/lab-mashup/entity/property.hbs
@@ -1 +1 @@
-{{line-chart data=model.history}}
+{{line-chart data=model.history xaxisLength=600}}