diff --git a/app/styles/app.css b/app/styles/app.css
index 276dfce..897e144 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -55,7 +55,7 @@ h2 {
 }
 
 #main {
-
+	
 }
 
 .grid {
@@ -69,23 +69,6 @@ h2 {
 	border-collapse: collapse;
 }
 
-.grid2x2 td {
-	padding: 0;
-	margin: 0;
-
-	width: 50%;
-	height: 50%;
-}
-
-.grid3x1 td {
-	height: 100%;
-	width: auto;
-	
-	padding: 5px;
-	
-	border: 1px solid black;
-}
-
 #S1-image {
 	height: auto;
 }
@@ -95,10 +78,11 @@ h2 {
 }
 
 .column-right {
-	width: auto;
-	
-	padding: 25px;
+	padding-top: 25px;
 	padding-bottom: 40px;
+	
+	width: 100%;
+	height: 100%;
 }
 
 .column-right h3 {
@@ -121,8 +105,8 @@ h2 {
 }
 
 .line-chart {
-	width: 100%;
-	height: 100%;
+	width: 400px;
+	height: 400px;
 }
 
 .data-table {
diff --git a/app/templates/components/line-chart.hbs b/app/templates/components/line-chart.hbs
index 8b13789..3fefec9 100644
--- a/app/templates/components/line-chart.hbs
+++ b/app/templates/components/line-chart.hbs
@@ -1 +1,3 @@
-
+<div>
+	Get some space
+</div>
diff --git a/app/templates/lab-mashup.hbs b/app/templates/lab-mashup.hbs
index 325f0b5..f7c553b 100644
--- a/app/templates/lab-mashup.hbs
+++ b/app/templates/lab-mashup.hbs
@@ -1,68 +1,57 @@
 <section id="main">
-	<table class="grid grid2x2">
+	<table class="grid">
+		<tr>
+			<td colspan="2">
+				<div class="layout-page" width="70%">
+					<img src={{"assets/images/View2/TransmissionSystem.svg"}} class="svg-image" />
+				</div>
+			</td>
+			<td rowspan="2" width="30%" height="100%">
+				<div class="layout-page">
+					<h2>Simulation</h2>
+					<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.<br />
+
+					Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet,</p>
+				</div>
+			</td>
+		</tr>
 		<tr>
 			<td>
-				<div id="top-left" class="layout-page">
-					<h2>Transmission System</h2>
-	
-					<table class="grid grid3x1">
-						<tr>
-							<td colspan="2" id="S1-image">
-								<img src={{"assets/images/View2/TransmissionSystem.svg"}} class="svg-image" />
-							</td>
-						</tr>
+				<div class="layout-page">
+					<table>
 						<tr>
 							<td class="column-left">
 								{{property-table model=S1Entity showProperty="showProperty1Values"}}
 							</td>
-	
 							<td class="column-right">
-								<h3>{{S1Property.name}}</h3>
+								{{#if S1Property}}
+									<h3>{{S1Property.name}}</h3>
+								{{/if}}
+								
 								{{line-chart data=S1Property.values}}
-								<h4>{{S1Property.type}}</h4>
+								
+								{{#if S1Property}}
+									<h4>{{S1Property.type}}</h4>
+								{{/if}}
 							</td>
 						</tr>
 					</table>
 				</div>
 			</td>
 			<td>
-				<div id="top-right" class="layout-page">
-					<h2>Distribution System</h2>
-	
-					<table class="grid grid3x1">
-						<tr>
-							<td colspan="2" id="S1-image">
-								<img src={{"assets/images/View3/DistributionSystem.svg"}} class="svg-image" />
-							</td>
-						</tr>
+				<div class="layout-page">
+					<table>
 						<tr>
 							<td class="column-left">
 								{{property-table model=S2Entity showProperty="showProperty2Values"}}
 							</td>
-	
 							<td class="column-right">
 								<h3>{{S2Property.name}}</h3>
 								{{line-chart data=S2Property.values}}
 								<h4>{{S2Property.type}}</h4>
 							</td>
 						</tr>
-					</table>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<div id="bottom-left" class="layout-page">
-					<h2>Simulation</h2>
-
-					<img src={{"assets/images/View1/Simulation Scenario.svg"}} class="svg-image" />
-				</div>
-			</td>
-			<td>
-				<div id="bottom-right" class="layout-page">
-					<h2>Static</h2>
-					
-					<p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
+						</table>
 				</div>
 			</td>
 		</tr>