diff --git a/app/components/entity-title.js b/app/components/entity-title.js
deleted file mode 100644
index db250f6..0000000
--- a/app/components/entity-title.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Component.extend({
-  tagName: 'h2'
-});
diff --git a/app/routes/entities.js b/app/routes/entities.js
index 44a5d51..3ac0567 100644
--- a/app/routes/entities.js
+++ b/app/routes/entities.js
@@ -2,7 +2,6 @@ import Ember from 'ember';
 
 export default Ember.Route.extend({
   model() {
-    console.log('entities');
     return this.store.findAll('entity');
   }
 });
diff --git a/app/routes/entities/entity.js b/app/routes/entities/entity.js
index b423a80..35e2667 100644
--- a/app/routes/entities/entity.js
+++ b/app/routes/entities/entity.js
@@ -2,7 +2,6 @@ import Ember from 'ember';
 
 export default Ember.Route.extend({
   model(params) {
-    console.log("entity: " + params.entity_id);
     return this.store.findRecord('entity', params.entity_id);
   }
 });
diff --git a/app/routes/entities/entity/property.js b/app/routes/entities/entity/property.js
index e583ed5..40054d9 100644
--- a/app/routes/entities/entity/property.js
+++ b/app/routes/entities/entity/property.js
@@ -2,7 +2,6 @@ import Ember from 'ember';
 
 export default Ember.Route.extend({
   model(params) {
-    console.log("property: " + params.property_id);
     return this.store.findRecord('property', params.property_id);
   }
 });
diff --git a/app/styles/app.css b/app/styles/app.css
index 2523d8d..c19c64b 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -11,7 +11,7 @@ body {
 	max-width: 1500px;
 	margin: 0 auto;
 
-	font: 14px 'Helvetica Neue', Helvetica, Arial, sans-serif;
+	font: 16px 'Helvetica Neue', Helvetica, Arial, sans-serif;
 	font-weight: 300;
 	font-smoothing: antialiased;
 	-webkit-font-smoothing: antialiased;
@@ -58,8 +58,6 @@ body {
 	float: left;
 	width: 45%;
 
-	margin-top: 20px;
-
 	padding-top: 10px;
 	/*padding-left: 25px;*/
 }
@@ -68,8 +66,6 @@ body {
 	float: right;
 	width: 45%;
 
-	margin-top: 20px;
-
 	padding-top: 10px;
 	/*padding-right: 25px;*/
 }
diff --git a/app/templates/components/entity-title.hbs b/app/templates/components/entity-title.hbs
deleted file mode 100644
index 4af51a6..0000000
--- a/app/templates/components/entity-title.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{entity.id}}
diff --git a/app/templates/entities.hbs b/app/templates/entities.hbs
index 654b8f4..8521648 100644
--- a/app/templates/entities.hbs
+++ b/app/templates/entities.hbs
@@ -1,7 +1,11 @@
 <section id="main">
-	<h2>Entities</h2>
+	{{#if model}}
+		<h2>Entities</h2>
 
-	{{entities-table entities=model}}
+		{{entities-table entities=model}}
+	{{else}}
+		<h2>No entities found</h2>
+	{{/if}}
 
 	{{outlet}}
 </section>
diff --git a/app/templates/entities/entity.hbs b/app/templates/entities/entity.hbs
index 592aa67..82b3fb7 100644
--- a/app/templates/entities/entity.hbs
+++ b/app/templates/entities/entity.hbs
@@ -1,5 +1,13 @@
-{{entity-title entity=model}}
+<h3>{{model.id}}</h3>
 
-{{properties-table entity=model}}
+{{#if model.properties}}
+<section id="main-left">
+  {{properties-table entity=model}}
+</section>
 
-{{outlet}}
+<section id="main-right">
+  {{outlet}}
+</section>
+{{else}}
+  <h3>No properties</h3>
+{{/if}}
diff --git a/app/templates/entities/entity/index.hbs b/app/templates/entities/entity/index.hbs
index e69de29..0233710 100644
--- a/app/templates/entities/entity/index.hbs
+++ b/app/templates/entities/entity/index.hbs
@@ -0,0 +1 @@
+<p>Select a property</p>
diff --git a/app/templates/entities/index.hbs b/app/templates/entities/index.hbs
index 5321cb4..8265e61 100644
--- a/app/templates/entities/index.hbs
+++ b/app/templates/entities/index.hbs
@@ -1 +1,3 @@
-<p>Select an entity to show it's properties</p>
+{{#if model}}
+  <p>Select an entity to show it's properties</p>
+{{/if}}