diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index 1f1c3c1..fef5e41 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -48,8 +48,6 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
     protected function _initLayout()
     {
         $layout = Zend_Layout::startMvc();
-        $layout->setLayoutPath(APPLICATION_PATH . '/modules/default/views/layout');
-        $layout->setLayout('default');
 
         return $layout;
     }
@@ -103,6 +101,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         // Add plugins
         $frontController->registerPlugin(new Fiktiv_Controller_Plugin_Language());
         $frontController->registerPlugin(new Fiktiv_Controller_Plugin_Navigation());
+        $frontController->registerPlugin(new Fiktiv_Controller_Plugin_Layout());
 
         return $frontController;
     }
diff --git a/application/modules/admin/controllers/IndexController.php b/application/modules/admin/controllers/IndexController.php
new file mode 100644
index 0000000..28ee119
--- /dev/null
+++ b/application/modules/admin/controllers/IndexController.php
@@ -0,0 +1,9 @@
+<?php
+
+class Admin_IndexController extends Fiktiv_Controller_Action
+{
+    public function indexAction()
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/application/modules/admin/views/layout/default.phtml b/application/modules/admin/views/layout/default.phtml
new file mode 100644
index 0000000..7d13e89
--- /dev/null
+++ b/application/modules/admin/views/layout/default.phtml
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <?=$this->headTitle() . "\n" /* Newline for pretty source :) */ ?>
+    <?=$this->headMeta() . "\n"  /* Newline for pretty source :) */ ?>
+    <link rel="stylesheet" type="text/css" href="<?=$this->baseUrl()?>/css/reset.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="<?=$this->baseUrl()?>/fancybox/jquery.fancybox-1.3.1.css" media="screen" />
+    <?=$this->headScript() ?>
+    <script type="text/javascript" src="<?=$this->baseUrl()?>/fancybox/jquery.fancybox-1.3.1.pack.js"></script>
+    <?=$this->fancybox()->headScript() ?>
+</head>
+<body>
+<div id="wrapper" class="small">
+
+    <?=$this->layout()->content ?>
+
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/application/modules/admin/views/scripts/index/index.phtml b/application/modules/admin/views/scripts/index/index.phtml
new file mode 100644
index 0000000..17967e8
--- /dev/null
+++ b/application/modules/admin/views/scripts/index/index.phtml
@@ -0,0 +1 @@
+<h1>Admin module, more here later.</h1>
\ No newline at end of file
diff --git a/library/Fiktiv/Controller/Plugin/Layout.php b/library/Fiktiv/Controller/Plugin/Layout.php
new file mode 100644
index 0000000..e999aee
--- /dev/null
+++ b/library/Fiktiv/Controller/Plugin/Layout.php
@@ -0,0 +1,30 @@
+<?php
+require_once 'Zend/Controller/Plugin/Abstract.php';
+
+/**
+ * Load module layout before trying to load global layout
+ */
+class Fiktiv_Controller_Plugin_Layout extends Zend_Controller_Plugin_Abstract
+{
+
+    protected $_default = 'default';
+
+    public function  preDispatch(Zend_Controller_Request_Abstract $request) {
+
+        $bootstrap = Zend_Controller_Front::getInstance()->getParam('bootstrap');
+        $layout = $bootstrap->getResource('layout');
+
+        $moduleName = $request->getModuleName();
+
+        if (file_exists(APPLICATION_PATH . '/modules/' . $moduleName . '/views/layout/' . $this->_default . '.phtml')) {
+
+            $layout->setLayoutPath(APPLICATION_PATH . '/modules/' . $moduleName . '/views/layout');
+        } else {
+
+            $layout->setLayoutPath(APPLICATION_PATH . '/modules/default/views/layout');
+        }
+
+        $layout->setLayout($this->_default);
+        
+    }
+}
\ No newline at end of file
