diff --git a/frontend/templates/500.html b/frontend/templates/500.html
index b1269653..ee545938 100644
--- a/frontend/templates/500.html
+++ b/frontend/templates/500.html
@@ -1,8 +1,10 @@
 {% extends "base.html" %}
 
 {% block content %}
-<div style="text-align: center; margin-top: 20%; margin-bottom: 20%;">
-<h1>Uhoh, something bad happened. Don't worry, we're on it!</h1>
+<div class="js-main">
+<h1>Whoops, an error occurred.</h1>
+
+<p>Help us fix it by sending us feedback: <a href="mailto:support@gluejar.com">support@gluejar.com</a>.</p>
 </div>
 {% endblock %}
 
diff --git a/frontend/templates/claim.html b/frontend/templates/claim.html
index 29602d76..7067e2a4 100644
--- a/frontend/templates/claim.html
+++ b/frontend/templates/claim.html
@@ -9,8 +9,8 @@
 {{ rights_holder.rights_holder_name }}
 <h3> Work being claimed  </h3>
 <ul>
-<li>{{ work.title }}</li>
-<li>{{ work.author }}</li>
+<li>Title: {{ work.title }}</li>
+<li>Author: {{ work.author }}</li>
 </ul>
 <h3> Terms and Conditions  </h3>
     {{ form.as_p }}
diff --git a/frontend/urls.py b/frontend/urls.py
index 95e40dca..af5a5ccb 100644
--- a/frontend/urls.py
+++ b/frontend/urls.py
@@ -40,5 +40,6 @@ urlpatterns = patterns(
     url(r"^subjects/$", "subjects", name="subjects"),
     url(r"^librarything/$", LibraryThingView.as_view(), name="librarything"),
     url(r"^librarything/load/$","librarything_load", name="librarything_load"),
-    url('^404testing/$', direct_to_template, {'template': '404.html'})
+    url('^404testing/$', direct_to_template, {'template': '404.html'}),
+    url('^500testing/$', direct_to_template, {'template': '500.html'}),
 )
diff --git a/static/images/bg-googlewatermark.png b/static/images/bg-googlewatermark.png
new file mode 100644
index 00000000..88b65b7c
Binary files /dev/null and b/static/images/bg-googlewatermark.png differ
diff --git a/static/images/generic_cover_larger.png b/static/images/generic_cover_larger.png
new file mode 100644
index 00000000..9b1cddb8
Binary files /dev/null and b/static/images/generic_cover_larger.png differ
diff --git a/static/images/google_watermark.gif b/static/images/google_watermark.gif
new file mode 100644
index 00000000..b1cce51e
Binary files /dev/null and b/static/images/google_watermark.gif differ