diff --git a/infinitas/cms/controllers/contents_controller.php b/infinitas/cms/controllers/contents_controller.php
index 8999bdade..cb336781a 100644
--- a/infinitas/cms/controllers/contents_controller.php
+++ b/infinitas/cms/controllers/contents_controller.php
@@ -128,7 +128,8 @@ function admin_edit($id = null) {
 
 		$categories = array(__('Please select', true)) + $this->Content->Category->generatetreelist();
 		$groups = array(__('Public', true)) + $this->Content->Group->generatetreelist();
-		$this->set(compact('categories','groups'));
+		$layouts = $this->Content->Layout->find('list');
+		$this->set(compact('categories','groups','layouts'));
 	}
 }
 
diff --git a/infinitas/cms/models/content.php b/infinitas/cms/models/content.php
index ce6230717..e8b05f249 100644
--- a/infinitas/cms/models/content.php
+++ b/infinitas/cms/models/content.php
@@ -87,7 +87,8 @@ class Content extends CmsAppModel {
 			),
 			'Layout' => array(
 				'className' => 'Cms.ContentLayout',
-				'foreignKey' => 'layout_id'
+				'foreignKey' => 'layout_id',
+				'counterCache' => true
 			)
 		);
 
@@ -102,7 +103,7 @@ class Content extends CmsAppModel {
 				)
 			),
 			'Frontpage' => array(
-				'className' => 'Cms.ContentFrontpage',
+				'className' => 'Cms.Frontpage',
 				'fields' => array(
 					'Frontpage.id'
 				)