diff --git a/geomagio/webservice/public_app.py b/geomagio/webservice/public_app.py
index beb3ba2e164a55c66962d06e77338328ca8f35b4..ba56a46e5531ed3bbedb7908d426abe4139b29bc 100644
--- a/geomagio/webservice/public_app.py
+++ b/geomagio/webservice/public_app.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals
import os
import flask
-from . import data, login
+from . import data
def create_app():
@@ -12,7 +12,6 @@ def create_app():
app.config.update(os.environ)
# connect modules
- login.init_app(app)
data.init_app(app)
# add default route
diff --git a/geomagio/webservice/templates/_template.html b/geomagio/webservice/templates/_template.html
index 2931c1972529c8a391a39f2459211b27a61c5a74..845a27a1fccbb21ca06ebea50c3650123f12ec3b 100644
--- a/geomagio/webservice/templates/_template.html
+++ b/geomagio/webservice/templates/_template.html
@@ -10,8 +10,8 @@
</head>
<body>
<nav>
- {% if current_user.is_authenticated %} Logged in as {{ current_user.email
- }}
+ {% if current_user & if current_user.is_authenticated %} Logged in as {{
+ current_user.email }}
<a href="{{ url_for('login.logout') }}">Log Out</a>
{% else %}
<a href="{{ url_for('login.login') }}">Log In</a>
diff --git a/geomagio/webservice/templates/data/usage.html b/geomagio/webservice/templates/data/usage.html
index dc6e7a8a888a7afbc0a42f362c6fd8743ae0b51c..08fd9694b626e12d38eb03bb42d6f3abae7b9ab1 100644
--- a/geomagio/webservice/templates/data/usage.html
+++ b/geomagio/webservice/templates/data/usage.html
@@ -1,4 +1,4 @@
-{% extends '_template.html' %} {% block header %}
+{% block header %}
<link
rel="stylesheet"
type="text/css"
diff --git a/geomagio/webservice/templates/index.html b/geomagio/webservice/templates/index.html
index 0b929933271d6cb830d41b5135313323dc9cc253..e01d2fb50c54647918c23149706f4bfb1a278f37 100644
--- a/geomagio/webservice/templates/index.html
+++ b/geomagio/webservice/templates/index.html
@@ -1,10 +1,5 @@
-{% extends '_template.html' %}
-
{% block header %}
<h1>{% block title %}Index{% endblock %}</h1>
-{% endblock %}
-
-
-{% block content %}
+{% endblock %} {% block content %}
<p>This is the default page, when logged out</p>
{% endblock %}