diff --git a/composer.json b/composer.json
index 948993db..ba44bf67 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,6 @@
     "require": {
         "bshaffer/oauth2-server-php": "dev-develop",
         "evandotpro/edp-github": "dev-master",
-        "evandotpro/edp-module-layouts": "1.0.*",
         "ezyang/htmlpurifier": "4.6.*",
         "monolog/monolog": "~1.12",
         "php": "~5.5",
diff --git a/composer.lock b/composer.lock
index b0342e2e..cf343ee6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "9ceb580d51cdf3144a63df23d59a9188",
+    "hash": "eda6da72d0c093464156822f172fb3eb",
     "packages": [
         {
             "name": "bshaffer/oauth2-server-php",
@@ -115,44 +115,6 @@
             ],
             "time": "2015-01-27 14:52:28"
         },
-        {
-            "name": "evandotpro/edp-module-layouts",
-            "version": "v1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/EvanDotPro/EdpModuleLayouts.git",
-                "reference": "984658a4aa3d70d2830b598f0fd44fb0ad56e981"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/EvanDotPro/EdpModuleLayouts/zipball/984658a4aa3d70d2830b598f0fd44fb0ad56e981",
-                "reference": "984658a4aa3d70d2830b598f0fd44fb0ad56e981",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "./Module.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "authors": [
-                {
-                    "name": "Evan Coury",
-                    "email": "me@evancoury.com",
-                    "homepage": "http://blog.evan.pro/"
-                }
-            ],
-            "description": "EdpModuleLayouts is very simple ZF2 module for making module-specific layouts insanely easy.",
-            "homepage": "https://github.com/EvanDotPro/EdpModuleLayouts",
-            "keywords": [
-                "zf2"
-            ],
-            "time": "2012-09-14 01:32:51"
-        },
         {
             "name": "ezyang/htmlpurifier",
             "version": "v4.6.0",
diff --git a/config/application.config.php b/config/application.config.php
index 790e1bba..eab6c518 100644
--- a/config/application.config.php
+++ b/config/application.config.php
@@ -11,7 +11,6 @@
         'EdpGithub',
         'Application',
         'User',
-        'EdpModuleLayouts',
         'ZfModule',
     ],
     'module_listener_options' => [
diff --git a/config/autoload/global.php b/config/autoload/global.php
index 1180b922..1ff6effe 100644
--- a/config/autoload/global.php
+++ b/config/autoload/global.php
@@ -1,10 +1,5 @@
 <?php
 return [
-    'module_layouts' => [
-        'User' => 'layout/layout-small-header.phtml',
-        'ZfcUser' => 'layout/layout-small-header.phtml',
-        'ZfModule' => 'layout/layout-small-header.phtml',
-    ],
     'asset_manager' => [
         'caching' => [
             'default' => [
diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
index e1ba65f3..a5e2c61a 100644
--- a/module/Application/config/module.config.php
+++ b/module/Application/config/module.config.php
@@ -121,7 +121,7 @@
             'application/index/index'           => __DIR__ . '/../view/application/index/index.phtml',
             'application/index/pagination'      => __DIR__ . '/../view/application/index/pagination.phtml',
             'application/search/index'          => __DIR__ . '/../view/application/search/index.phtml',
-            'layout/error'                      => __DIR__ . '/../view/layout/layout-small-header.phtml',
+            'layout/error'                      => __DIR__ . '/../view/layout/layout.phtml',
             'layout/layout'                     => __DIR__ . '/../view/layout/layout.phtml',
             'error/404'                         => __DIR__ . '/../view/error/404.phtml',
             'error/index'                       => __DIR__ . '/../view/error/index.phtml',
diff --git a/module/Application/view/application/index/index.phtml b/module/Application/view/application/index/index.phtml
index 24654760..5e771f92 100644
--- a/module/Application/view/application/index/index.phtml
+++ b/module/Application/view/application/index/index.phtml
@@ -3,6 +3,8 @@
 <?php $this->inlineScript()->appendFile($this->basePath('js/jquery.livesearch.js')); ?>
 <?php $this->inlineScript()->appendScript('$(\'#live-search input[name="query"]\').liveSearch({url: "' . $this->url('live-search', [], ['query' => ['query' => '']]) . '"});'); ?>
 
+<?php $this->layout()->withLargeHeader = true; ?>
+
 <div class="col-xs-12 col-md-8">
     <div class="well well-sm">
         <form id="live-search">
diff --git a/module/Application/view/layout/layout-small-header.phtml b/module/Application/view/layout/layout-small-header.phtml
deleted file mode 100644
index 91387acc..00000000
--- a/module/Application/view/layout/layout-small-header.phtml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php echo $this->doctype(); ?>
-
-<html lang="en">
-    <head>
-        <?php $this->headTitle('ZF2 Modules')->setSeparator(' - ')->setAutoEscape(false); ?>
-        <?php echo $this->headTitle(); ?>
-
-        <?php $this->headMeta()->appendName('viewport', 'width=device-width, initial-scale=1.0'); ?>
-        <?php $this->headMeta()->setCharset('UTF-8'); ?>
-        <?php echo $this->headMeta(); ?>
-
-        <?php $this->headLink(['rel' => 'shortcut icon', 'href' => $this->basePath('favicon.ico')]); ?>
-        <?php $this->headLink()->appendStylesheet($this->basePath('css/bootstrap.min.css')); ?>
-        <?php $this->headLink()->appendStylesheet($this->basePath('css/style.css')); ?>
-        <?php $this->headLink()->appendStylesheet($this->basePath('css/slide.css')); ?>
-        <?php $this->headLink()->appendAlternate($this->url('feed'), 'application/rss+xml', 'RSS Feed for ZF2 Modules'); ?>
-        <?php echo $this->headLink(); ?>
-    </head>
-    <body>
-        <a href="https://github.com/zendframework/modules.zendframework.com" target="_blank">
-            <img style="position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px;" src="<?php echo $this->basePath('img/aral/github-ribbons/right-green@2x.png'); ?>" alt="Fork me on GitHub">
-        </a>
-        <div id="toppanel">
-            <div class="tab">
-                <ul class="login">
-                    <li class="left">&nbsp;</li>
-                    <li>
-                        <a href="<?php echo $this->url('home'); ?>">Home</a>
-                    </li>
-                <?php $userDisplayName = $this->zfcUserDisplayName(); ?>
-                <?php if ($userDisplayName): ?>
-                    <li class="sep">|</li>
-                    <li class="user-info">
-                        <?php /* @var User\Entity\User $identity */ ?>
-                        <?php $identity = $this->zfcUserIdentity(); ?>
-                        <div class="gravatar-container">
-                            <a class="login" href="<?php echo $this->url('zfcuser'); ?>" title="My profile">
-                                <img src="<?php echo $this->escapeHtmlAttr($identity->getPhotoUrl()); ?>" alt="<?php echo $this->escapeHtmlAttr($this->zfcUserDisplayName()); ?>" style="width:23px;height:23px;">
-                            </a>
-                        </div>
-                        <a class="login" href="<?php echo $this->url('zfcuser'); ?>" title="My profile"> Hello <?php echo $this->escapeHtml(ucfirst($userDisplayName)); ?></a>
-                    </li>
-                    <li class="sep">|</li>
-                    <li>
-                        <a href="<?php echo $this->url('zfcuser/logout'); ?>">Logout</a>
-                    </li>
-                <?php else: ?>
-                    <li id="toggle">
-                        <a class="login" href="<?php echo $this->url('scn-social-auth-user/login/provider', ['provider' => 'github']); ?>">GitHub Login</a>
-                    </li>
-                <?php endif; ?>
-                    <li class="right">&nbsp;</li>
-                </ul>
-            </div>
-        </div>
-
-        <div class="container-fluid landing-intro small-header">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-8">
-                        <a href="<?php echo $this->url('home'); ?>" style="text-decoration:none">
-                            <img src="<?php echo $this->basePath('img/zend-logo_small.png'); ?>" alt="ZF Modules">
-                            <p class="zf-green">
-                                Modules
-                            </p>
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="container main-content">
-            <div class="container-fluid">
-                <?php echo $this->content; ?>
-            </div>
-        </div>
-
-        <hr style="clear:both">
-
-        <?php echo $this->partial('layout/footer'); ?>
-
-        <?php $this->inlineScript()->prependFile($this->basePath('js/bootstrap.min.js')); ?>
-        <?php $this->inlineScript()->prependFile($this->basePath('js/jquery-1.11.2.min.js')); ?>
-        <?php echo $this->inlineScript(); ?>
-    </body>
-</html>
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
index d32dcfdf..3283fc8b 100644
--- a/module/Application/view/layout/layout.phtml
+++ b/module/Application/view/layout/layout.phtml
@@ -54,6 +54,7 @@
             </div>
         </div>
 
+    <?php if (true === $this->withLargeHeader): ?>
         <div class="container-fluid landing-intro">
             <div class="container">
                 <div class="row">
@@ -82,6 +83,22 @@
                 </div>
             </div>
         </div>
+    <?php else: ?>
+        <div class="container-fluid landing-intro small-header">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-8">
+                        <a href="<?php echo $this->url('home'); ?>" style="text-decoration:none">
+                            <img src="<?php echo $this->basePath('img/zend-logo_small.png'); ?>" alt="ZF Modules">
+                            <p class="zf-green">
+                                Modules
+                            </p>
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    <?php endif; ?>
 
         <div class="container main-content">
             <div class="container-fluid">