diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index 2bb86c14..11fde8c1 100644
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -3,7 +3,7 @@ module Admin
 
     include Locomotive::Routing::SiteDispatcher
 
-    layout 'admin/application'
+    layout '/admin/layouts/application'
 
     before_filter :authenticate_admin!
 
diff --git a/app/controllers/admin/cross_domain_sessions_controller.rb b/app/controllers/admin/cross_domain_sessions_controller.rb
index dc184687..2f333801 100644
--- a/app/controllers/admin/cross_domain_sessions_controller.rb
+++ b/app/controllers/admin/cross_domain_sessions_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class CrossDomainSessionsController < BaseController
 
-    layout 'admin/box'
+    layout '/admin/layouts/box'
 
     skip_before_filter :verify_authenticity_token
 
diff --git a/app/controllers/admin/passwords_controller.rb b/app/controllers/admin/passwords_controller.rb
index ec99d835..cc513ab7 100644
--- a/app/controllers/admin/passwords_controller.rb
+++ b/app/controllers/admin/passwords_controller.rb
@@ -3,7 +3,7 @@ module Admin
 
     include Locomotive::Routing::SiteDispatcher
 
-    layout 'admin/box'
+    layout '/admin/layouts/box'
 
     before_filter :require_site
 
diff --git a/app/controllers/admin/sessions_controller.rb b/app/controllers/admin/sessions_controller.rb
index f3b43c8b..7aa60f68 100644
--- a/app/controllers/admin/sessions_controller.rb
+++ b/app/controllers/admin/sessions_controller.rb
@@ -3,7 +3,7 @@ module Admin
 
     include Locomotive::Routing::SiteDispatcher
 
-    layout 'admin/box'
+    layout '/admin/layouts/box'
 
     before_filter :require_site
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6e5f9df7..6947e663 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -6,6 +6,6 @@ class ApplicationController < ActionController::Base
   # rescue_from Exception, :with => :render_error
   #
   # def render_error
-  #   render :template => "/admin/errors/500", :layout => 'admin/box', :status => 500
+  #   render :template => "/admin/errors/500", :layout => '/admin/layouts/box', :status => 500
   # end
 end
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
deleted file mode 100644
index 594b2ea5..00000000
--- a/app/controllers/home_controller.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class HomeController < ApplicationController
-
-  def show; end
-
-  def unknown; end
-
-end
diff --git a/app/views/layouts/admin/application.html.haml b/app/views/admin/layouts/application.html.haml
similarity index 100%
rename from app/views/layouts/admin/application.html.haml
rename to app/views/admin/layouts/application.html.haml
diff --git a/app/views/layouts/admin/box.html.haml b/app/views/admin/layouts/box.html.haml
similarity index 100%
rename from app/views/layouts/admin/box.html.haml
rename to app/views/admin/layouts/box.html.haml
diff --git a/app/views/home/show.html.haml b/app/views/home/show.html.haml
deleted file mode 100644
index 86bb6f0a..00000000
--- a/app/views/home/show.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-%h2 Locomotive rocks !!!
-
-%p
-  = flash[:error]
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
deleted file mode 100644
index 639013e7..00000000
--- a/app/views/layouts/application.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-!!! XML
-!!!
-%html{ :xmlns => 'http://www.w3.org/1999/xhtml'  }
-  %head
-  %body
-    %h1 Welcome to Locomotive
-    = yield
diff --git a/lib/locomotive/render.rb b/lib/locomotive/render.rb
index c41bfa1f..5b98aa19 100644
--- a/lib/locomotive/render.rb
+++ b/lib/locomotive/render.rb
@@ -9,7 +9,7 @@ module Locomotive
 
       def render_locomotive_page
         if request.fullpath =~ /^\/admin\//
-          render :template => "/admin/errors/404", :layout => 'admin/box', :status => 404
+          render :template => "/admin/errors/404", :layout => '/admin/layouts/box', :status => 404
         else
           @page = locomotive_page