diff --git a/templates/base.html b/templates/base.html
index 63ae0e74880a63afb926cbf9ea6533802127c11e..f5b64acd45a42fd562e6a0715198d68c3d240480 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -22,44 +22,12 @@ function changeTime(obj, label) {
<body id="{% block pageid %}{% endblock %}"{% block bodyattrs %}{% endblock %}>
-<div id="header">
-<!-- Header -->
- <table width="100%%">
- <tr>
- <td align="left" valign="bottom">
- <h1>GraceDB</h1>
- </td>
-
- <td align="center">
- <img width="52" height="37" src="/gracedb-static/images/ligo-blue.gif">
- <!-- 673px 487px -->
- </td>
-
- <td align="center">
- <img width="164" height="30" src="/gracedb-static/images/Virgo_logo50.png">
- <!-- 4,829px 884px -->
- </td>
-
- <td align="center">
- <img width="107" height="37" src="/gracedb-static/images/anim2.gif">
- <!-- 287px 101px -->
- </td>
-
- <td align="center">
- <img width="87" height="37" src="/gracedb-static/images/LSC_logo50.png">
- <!-- 6,261px 2,652px -->
- </td>
- </tr>
- <tr>
- <td colspan="5" align="left">
- <h2>Gravitational-Wave Candidate Event Database</h2>
- </tr>
- </table>
-<!-- End Header -->
-</div>
-
<div id="content">
+<center>
+<h1> GraceDB — Gravitational-wave Candidate Event Database</h1>
+</center>
+
{% block nav %}
<ul id="nav">
<li id="nav-home"><a href="{% url home %}">Home</a></li>
@@ -86,19 +54,33 @@ function changeTime(obj, label) {
</div>
- <div id="footer">
- <table><tr><td><img
- width="50" height="36"
- src="/gracedb-static/images/ligo-blue.gif"
- alt="LIGO" /></td>
- <td width="50%"> </td>
- <td>
- <!--<p>GraceDB is a product of the LIGO Scientific Collaboration</p>-->
- <!-- <p>Copyright © 2008 LIGO</p> -->
- </td>
- </tr></table>
- </div>
+<div id="header">
+<!-- Header. Yea, this is actually a footer. It *was* as header once, though. -->
+ <table align="center" width="90%%">
+ <tr>
+ <td align="center">
+ <img width="52" height="36" src="/gracedb-static/images/ligo-blue.gif">
+ <!-- 673px 487px -->
+ </td>
+
+ <td align="center">
+ <img width="164" height="30" src="/gracedb-static/images/Virgo_logo50.png">
+ <!-- 4,829px 884px -->
+ </td>
+ <td align="center">
+ <img width="107" height="37" src="/gracedb-static/images/anim2.gif">
+ <!-- 287px 101px -->
+ </td>
+
+ <td align="center">
+ <img width="87" height="37" src="/gracedb-static/images/LSC_logo50.png">
+ <!-- 6,261px 2,652px -->
+ </td>
+ </tr>
+ </table>
+<!-- End Header -->
+</div>
</body>
</html>
diff --git a/templates/base2.html b/templates/base2.html
deleted file mode 100644
index b47906ce821c237a9ca9a7640db234160f159511..0000000000000000000000000000000000000000
--- a/templates/base2.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <link rel="stylesheet" href="/gracedb-static/css/style.css" />
- <title>GraceDb | {% block title %}{% endblock %}</title>
-<!-- START TESTING -->
-<script type="text/javascript">
-function changeTime(obj, label) {
- var timetype= obj[obj.selectedIndex].value;
- if (timetype=="") { return; }
- var times = document.getElementsByName("time-"+label);
- for (i=0; i<times.length; i++) {
- newtime = times[i].getAttribute(timetype);
- times[i].innerHTML = newtime;
- }
-}
-</script>
-<!-- END TESTING -->
-{% block jscript %}{% endblock %}
-</head>
-
-<body id="{% block pageid %}{% endblock %}"{% block bodyattrs %}{% endblock %}>
-
-<div id="content">
-
-<center>
-<h1> GraceDB — Gravitational-wave Candidate Event Database</h1>
-</center>
-
-{% block nav %}
-<ul id="nav">
- <li id="nav-home"><a href="{% url home %}">Home</a></li>
- <li id="nav-search"><a href="{% url search %}">Search</a></li>
- <li id="nav-create"><a href="{% url create %}">Create</a></li>
- <li id="nav-feeds"><a href="{% url feeds %}">RSS</a></li>
- <li id="nav-userprofile"><a href="{% url userprofile-home %}">Options</a></li>
- {% if ligouser %}<li id="nav-user">Authenticated as: {{ ligouser.name }}</li>{% endif %}
-</ul>
-{% endblock %}
-
- <p> </p> <!-- bad way to create vertical space -->
-
-{% load flash %}
-{% flash %}
- <div id="status_block" class="{{ params.class }}">{{ msg }}</div>
-{% endflash %}
-
-
- <h2>{% block heading %}Title{% endblock %}</h2>
-
-
- {% block content %}{% endblock %}
-
- </div>
-
-<div id="header">
-<!-- Header -->
- <table align="center" width="70%%">
- <tr>
- <td align="center">
- <img width="52" height="36" src="/gracedb-static/images/ligo-blue.gif">
- <!-- 673px 487px -->
- </td>
-
- <td align="center">
- <img width="164" height="30" src="/gracedb-static/images/Virgo_logo50.png">
- <!-- 4,829px 884px -->
- </td>
-
- <td align="center">
- <img width="107" height="37" src="/gracedb-static/images/anim2.gif">
- <!-- 287px 101px -->
- </td>
-
- <td align="center">
- <img width="87" height="37" src="/gracedb-static/images/LSC_logo50.png">
- <!-- 6,261px 2,652px -->
- </td>
- </tr>
- </table>
-<!-- End Header -->
-</div>
-
-</body>
-</html>
diff --git a/templates/feeds/index.html b/templates/feeds/index.html
index 59fd87da9da20f8c827f66a4d8a295f8c0523cd5..c7a550911ba6716d3046f4b7859bb45a8d53e5fe 100644
--- a/templates/feeds/index.html
+++ b/templates/feeds/index.html
@@ -1,4 +1,4 @@
-{% extends "base2.html" %}
+{% extends "base.html" %}
{% block title %}RSS Feeds{% endblock %}
{% block heading %}RSS Feeds{% endblock %}
diff --git a/templates/profile/notifications.html b/templates/profile/notifications.html
index 6b42d35f6499693992cdaabf6444c0883db00e85..ea4105918b918c6b2b5549c9ba768ffeab1174e9 100644
--- a/templates/profile/notifications.html
+++ b/templates/profile/notifications.html
@@ -1,4 +1,4 @@
-{% extends "base2.html" %}
+{% extends "base.html" %}
{% block title %}Options | Notifications{% endblock %}
{% block heading %}Notifications{% endblock %}