diff --git a/app/styles/app.css b/app/styles/app.css
index a12696f..e4e8262 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -132,7 +132,11 @@ h2 {
 }
 
 h3 {
-	font-size: 1.8em;
+	font-size: 0.9em;
+}
+
+h4 {
+	font-size: 0.8em;
 }
 
 /*
@@ -168,11 +172,11 @@ h3 {
 	padding: 20px;
 }
 
-.layout-page h2 {
+.layout-page h3 {
 	text-align: center;
 	
 	margin: 0;
-	margin-bottom: 10px;
+	margin-bottom: 5px;
 }
 
 .page-grid {
@@ -205,7 +209,7 @@ h3 {
 }
  
 .chart-cell {
-	padding-left: 10px;
+	padding-left: 10px !important;
 }
 
 /*
@@ -213,7 +217,7 @@ h3 {
  */
 .line-chart {
 	width: 100%;
-	height: 100%;
+	height: 90%;
 }
 
 .data-table {
@@ -236,7 +240,7 @@ h3 {
 
 	padding: 2px 4px;
 
-	font-size: 70%;
+	font-size: 0.7em;
 }
 
 .data-table td {
@@ -245,7 +249,7 @@ h3 {
 
 	padding: 2px 4px;
 
-	font-size: 60%;
+	font-size: 0.6em;
 }
 
 .label-source {
@@ -265,3 +269,10 @@ h3 {
 	
 	float: right;
 }
+
+/*
+ * Flot charts
+ */
+.flot-tick-label {
+	font-size: 0.75em;
+}
diff --git a/app/templates/components/entity-chart.hbs b/app/templates/components/entity-chart.hbs
index 868d77b..41287f9 100644
--- a/app/templates/components/entity-chart.hbs
+++ b/app/templates/components/entity-chart.hbs
@@ -1,24 +1,25 @@
 <table class="page-grid">
 	<tr>
 		<td valign="top" class="property-cell">
-			{{property-table model=entity showProperty="showPropertyValues"}}
-		</td>
-		<td valign="top" width="100%" height="100%" class="chart-cell">
-			<!-- <h2>{{entityName}}</h2> -->
-				
 			{{#if entityAvailable}}
-				<!-- {{#if visibleProperty}}
-					<h3>{{visibleProperty.name}}</h3>
-				{{/if}} -->
+				{{property-table model=entity showProperty="showPropertyValues"}}
+			{{/if}}
+		</td>
+		<td valign="top" width="100%" height="100%" class="chart-cell">	
+			{{#if entityAvailable}}
+				<h3>{{entityName}}</h3>
+			
+				{{#if visibleProperty}}
+					<h4>{{visibleProperty.name}} [{{visibleProperty.type}}]</h4>
+				{{/if}}
 				
 				{{line-chart data=visibleProperty}}
 				
 				<!-- {{#if visibleProperty}}
 					<h4 class="label-source">Source: {{visibleProperty.source}}</h4>
-					<h4 class="label-type">{{visibleProperty.type}}</h4>
 				{{/if}} -->
 			{{else}}
-				<h3>Entity has no attributes</h3>
+				<h3>{{entityName}} not found</h3>
 			{{/if}}
 		</td>
 	</tr>