diff --git a/styles/components/_error_page.scss b/styles/components/_error_page.scss
index 19ae7531..683b527f 100644
--- a/styles/components/_error_page.scss
+++ b/styles/components/_error_page.scss
@@ -1,8 +1,13 @@
 .error-page {
-  max-width: 475px;
-  margin: auto;
+  max-width: $max-page-width;
 
   .panel {
+    box-shadow: none;
+    background-color: unset;
+    border: none;
+    max-width: 475px;
+    margin: auto;
+
     &__heading {
       text-align: center;
       padding: $gap 0;
@@ -15,17 +20,6 @@
         margin-bottom: $gap;
       }
     }
-
-    &__body {
-      padding: $gap * 2;
-      margin: 0;
-
-      hr {
-        width: 80%;
-        margin: auto;
-        margin-bottom: $gap * 3;
-      }
-    }
   }
 
   .icon {
diff --git a/styles/components/_topbar.scss b/styles/components/_topbar.scss
index 6d84f426..feca57b6 100644
--- a/styles/components/_topbar.scss
+++ b/styles/components/_topbar.scss
@@ -12,7 +12,7 @@
     flex-direction: row;
     align-items: stretch;
     justify-content: space-between;
-    max-width: 1190px;
+    max-width: $max-page-width;
 
     a {
       color: $color-white;
diff --git a/styles/core/_variables.scss b/styles/core/_variables.scss
index 12657ca4..372fa868 100644
--- a/styles/core/_variables.scss
+++ b/styles/core/_variables.scss
@@ -19,6 +19,7 @@ $sidenav-collapsed-width: 10rem;
 $max-panel-width: 90rem;
 $home-pg-icon-width: 6rem;
 $large-spacing: 4rem;
+$max-page-width: $max-panel-width + $sidenav-expanded-width + $large-spacing;
 
 /*
  * USWDS Variables
diff --git a/templates/error.html b/templates/error.html
index 449c9a88..45ff12a3 100644
--- a/templates/error.html
+++ b/templates/error.html
@@ -5,6 +5,7 @@
 {% block content %}
 
 <main class="usa-section usa-content error-page">
+  <div class="panel">
     <div class="panel__heading">
       {{ Icon('cloud', classes="icon--red icon--large")}}
       <hr>
@@ -17,6 +18,7 @@
         {%- endif %}
       </p>
     </div>
+  </div>
 </main>
 
 {% endblock %}
diff --git a/templates/error_base.html b/templates/error_base.html
index 92be8e60..b5751e81 100644
--- a/templates/error_base.html
+++ b/templates/error_base.html
@@ -10,29 +10,30 @@
   <link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='img/favicon.ico') }} " />
 </head>
 <body class="{% if g.modalOpen %} modalOpen{% endif %}">
+  <div id='app-root'>
+    {% block template_vars %}{% endblock %}
 
-  {% block template_vars %}{% endblock %}
+    {% include 'components/usa_header.html' %}
 
-  {% include 'components/usa_header.html' %}
+    {% include 'navigation/topbar.html' %}
 
-  {% include 'navigation/topbar.html' %}
+    <div class='global-layout'>
 
-  <div class='global-layout'>
+      <div class='global-panel-container'>
+        {% block sidenav %}{% endblock %}
 
-    <div class='global-panel-container'>
-      {% block sidenav %}{% endblock %}
-
-      {% block content %}
-        these are not the droids you are looking for
-      {% endblock %}
+        {% block content %}
+          these are not the droids you are looking for
+        {% endblock %}
+      </div>
     </div>
+
+    {% include 'footer.html' %}
+
+    {% block modal %}{% endblock %}
+    {% assets "js_all" %}
+      <script src="{{ ASSET_URL }}"></script>
+    {% endassets %}
   </div>
-
-  {% include 'footer.html' %}
-
-  {% block modal %}{% endblock %}
-  {% assets "js_all" %}
-    <script src="{{ ASSET_URL }}"></script>
-  {% endassets %}
 </body>
 </html>
