diff --git a/grails-app/views/error.gsp b/grails-app/views/error.gsp
index 5c3cadff..3ba86a9c 100644
--- a/grails-app/views/error.gsp
+++ b/grails-app/views/error.gsp
@@ -2,39 +2,46 @@
 <html>
 <head>
     <title><g:if env="development">Grails Runtime Exception</g:if><g:else>Error</g:else></title>
-    <meta name="layout" content="ala"/>
+    <meta name="layout" content="${grailsApplication.config.getProperty('skin.layout')}"/>
     <g:if env="development"><asset:stylesheet src="errors.css" type="text/css"/></g:if>
+    <style>
+        ul.errors H1 {
+            font-size: 18px;
+        }
+    </style>
 </head>
 <body>
-<h1>
-    Application error
-</h1>
-<g:if env="development">
-    <ul class="errors">
-        <g:if test="${Throwable.isInstance(exception)}">
-            <li><g:renderException exception="${exception}" /></li>
-        </g:if>
-        <g:elseif test="${flash.message}">
-            <li>${alatag.stripApiKey(message: flash.message)}</li>
-        </g:elseif>
-        <g:else>
-            <li>An error has occurred</li>
-            <li>Exception: ${exception}</li>
-            <li>Message: ${message}</li>
-            <li>Path: ${path}</li>
-        </g:else>
-    </ul>
-</g:if>
-<g:else>
-    <g:if test="${flash.message}">
+<div class="${grailsApplication.config.getProperty('skin.fluidLayout')?'container-fluid':'container'}" id="main-content">
+    <h1>
+        Application error
+    </h1>
+    <hr />
+    <g:if env="development">
         <ul class="errors">
-            <li>${alatag.stripApiKey(message: flash.message)}</li>
+            <g:if test="${Throwable.isInstance(exception)}">
+                <li><g:renderException exception="${exception}" /></li>
+            </g:if>
+            <g:elseif test="${flash.message}">
+                <li>${alatag.stripApiKey(message: flash.message)}</li>
+            </g:elseif>
+            <g:else>
+                <li>An error has occurred</li>
+                <li>Exception: ${exception}</li>
+                <li>Message: ${message}</li>
+                <li>Path: ${path}</li>
+            </g:else>
         </ul>
     </g:if>
-</g:else>
-<ul class="errors">
-    <li>If this problem persists, please send an email to <a href="mailto:${grailsApplication.config.supportEmail ?: 'support@ala.org.au'}?subject=Reporting error on page: ${request.serverName}${request.forwardURI}">${grailsApplication.config.supportEmail ?: 'support@ala.org.au'}</a> and include the URL to this page.</li>
-</ul>
-
+    <g:else>
+        <g:if test="${flash.message}">
+            <ul class="errors">
+                <li>${alatag.stripApiKey(message: flash.message)}</li>
+            </ul>
+        </g:if>
+    </g:else>
+    <ul class="errors">
+        <li>If this problem persists, please send an email to <a href="mailto:${grailsApplication.config.supportEmail ?: 'support@ala.org.au'}?subject=Reporting error on page: ${request.serverName}${request.forwardURI}">${grailsApplication.config.supportEmail ?: 'support@ala.org.au'}</a> and include the URL to this page.</li>
+    </ul>
+</div>
 </body>
 </html>
diff --git a/grails-app/views/notFound.gsp b/grails-app/views/notFound.gsp
index 2525d8b0..1d2a2b5e 100644
--- a/grails-app/views/notFound.gsp
+++ b/grails-app/views/notFound.gsp
@@ -2,14 +2,18 @@
 <html>
     <head>
         <title>Page Not Found</title>
-        <meta name="layout" content="main">
+        <meta name="layout" content="${grailsApplication.config.getProperty('skin.layout')}">
         <g:if env="development"><asset:stylesheet src="errors.css"/></g:if>
     </head>
     <body>
-        <ul class="errors">
-            <li>Error: Page Not Found (404)</li>
-            <li>Path: ${request.forwardURI}</li>
-        </ul>
+        <div class="${grailsApplication.config.getProperty('skin.fluidLayout')?'container-fluid':'container'}" id="main-content">
+            <h1>Page Not Found</h1>
+            <hr />
+            <ul class="errors">
+                <li><b>Error:</b> Page Not Found (404)</li>
+                <li><b>Path:</b> ${request.forwardURI}</li>
+            </ul>
+        </div>
     <!-- Test test.heading g:message - <g:message code="test.heading" default="not set"/><br>
     Test test.heading alatag:message - <alatag:message code="test.heading" default="not set"/><br>
     Test test.app.only g:message - <g:message code="test.app.only" default="not set"/><br>
