diff --git a/services/web/app/views/general/400.pug b/services/web/app/views/general/400.pug
index b292527b03..6abb0634dc 100644
--- a/services/web/app/views/general/400.pug
+++ b/services/web/app/views/general/400.pug
@@ -1,24 +1,22 @@
-doctype html
-html.full-height(itemscope, itemtype='http://schema.org/Product')
-	head
-		title Something went wrong
-		link(rel="icon", href="/favicon.ico")
-		if buildCssPath
-			link(rel="stylesheet", href=buildCssPath())
+extends ../layout/layout-no-js
 
+block vars
+	- metadata = { title: 'Something went wrong', viewport: true }
+
+block body
 	body.full-height
 		main.content.content-alt.full-height
 			.container.full-height
 				.error-container.full-height
 					.error-details
 						p.error-status I'm sorry, Dave. I'm afraid I can't do that.
-						p.error-description(ng-non-bindable) There was a problem with your latest request
+						p.error-description There was a problem with your latest request
 							if(message)
 								|: #{message}
 							|.
 							br
 							| Please go back and try again.
-						p.error-description(ng-non-bindable)
+						p.error-description
 							| If the problem persists, please contact us at
 							|
 							a(href="mailto:" + settings.adminEmail) #{settings.adminEmail}
diff --git a/services/web/app/views/general/500.pug b/services/web/app/views/general/500.pug
index d3269d4552..bd74d947b3 100644
--- a/services/web/app/views/general/500.pug
+++ b/services/web/app/views/general/500.pug
@@ -1,18 +1,16 @@
-doctype html
-html.full-height(itemscope, itemtype='http://schema.org/Product')
-	head
-		title Something went wrong
-		link(rel="icon", href="/favicon.ico")
-		if buildCssPath
-			link(rel="stylesheet", href=buildCssPath())
+extends ../layout/layout-no-js
 
+block vars
+	- metadata = { title: 'Something went wrong', viewport: true }
+
+block body
 	body.full-height
 		main.content.content-alt.full-height
 			.container.full-height
 				.error-container.full-height
 					.error-details
 						p.error-status Something went wrong, sorry.
-						p.error-description(ng-non-bindable) Our staff are probably looking into this, but if it continues, please check our status page at
+						p.error-description Our staff are probably looking into this, but if it continues, please check our status page at
 							|
 							|
 							a(href="http://" + settings.statusPageUrl) #{settings.statusPageUrl}
diff --git a/services/web/app/views/layout/layout-no-js.pug b/services/web/app/views/layout/layout-no-js.pug
new file mode 100644
index 0000000000..c86721a810
--- /dev/null
+++ b/services/web/app/views/layout/layout-no-js.pug
@@ -0,0 +1,18 @@
+doctype html
+html(lang="en")
+
+	- metadata = metadata || {}
+	block vars
+
+	head
+		if (metadata && metadata.title)
+			title= metadata.title
+		if metadata && metadata.viewport
+			meta(name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes")
+
+		link(rel="icon", href="/favicon.ico")
+
+		if buildCssPath
+			link(rel="stylesheet", href=buildCssPath())
+
+block body
diff --git a/services/web/frontend/stylesheets/app/error-pages.less b/services/web/frontend/stylesheets/app/error-pages.less
index 58b1f3cc88..19878e6e59 100644
--- a/services/web/frontend/stylesheets/app/error-pages.less
+++ b/services/web/frontend/stylesheets/app/error-pages.less
@@ -14,7 +14,11 @@
 
 .error-details {
   flex: 1 1 50%;
-  padding: @line-height-computed * 2;
+  padding: @line-height-computed;
+  max-width: 90%;
+  @media (min-width: @screen-sm-min) {
+    padding: @line-height-computed * 2;
+  }
 }
 
 .error-status {