diff --git a/app/__init__.py b/app/__init__.py
index 8ada18a..8921b18 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,5 +1,6 @@
 from flask import Flask
 from flask.ext.sqlalchemy import SQLAlchemy
+
 from config import config
 
 
@@ -17,4 +18,3 @@ def create_app(config_name):
     app.register_blueprint(main_blueprint)
 
     return app
-
diff --git a/app/main/__init__.py b/app/main/__init__.py
index a4b038e..50a1a99 100644
--- a/app/main/__init__.py
+++ b/app/main/__init__.py
@@ -1,7 +1,7 @@
 from flask import Blueprint
 
 
-main = Blueprint('main', __name__)
+main = Blueprint('main', __name__, template_folder='templates')
 
 
 from . import views
diff --git a/app/main/forms.py b/app/main/forms.py
index 603e6dc..c50d848 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -2,9 +2,10 @@ from flask_wtf import Form
 from wtforms import IntegerField
 from wtforms.validators import NumberRange, Required
 from wtforms.ext.sqlalchemy.fields import QuerySelectField
-from app.models import Community, Dataset, Temperature
 from sqlalchemy import func
 
+from .models import Community, Dataset, Temperature
+
 
 class AKIYearField(IntegerField):
     def pre_validate(self, form):
diff --git a/app/models.py b/app/main/models.py
similarity index 99%
rename from app/models.py
rename to app/main/models.py
index cbf073e..808e4f8 100644
--- a/app/models.py
+++ b/app/main/models.py
@@ -1,4 +1,4 @@
-from . import db
+from app import db
 from sqlalchemy.ext.hybrid import hybrid_property
 
 
diff --git a/app/templates/_formhelpers.html b/app/main/templates/main/_formhelpers.html
similarity index 100%
rename from app/templates/_formhelpers.html
rename to app/main/templates/main/_formhelpers.html
diff --git a/app/templates/base.html b/app/main/templates/main/base.html
similarity index 56%
rename from app/templates/base.html
rename to app/main/templates/main/base.html
index 598b2e6..44b046b 100644
--- a/app/templates/base.html
+++ b/app/main/templates/main/base.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
-        <title>{{config['TITLE']}}</title>
+        <title>{{ config['TITLE'] }}</title>
         <link href="/static/css/bootstrap-readable.min.css" rel="stylesheet">
         <link href="/static/css/akindices.css" rel="stylesheet">
         <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
@@ -14,16 +14,16 @@
     </script>
     <div class="container" style="max-width:90%">
         <div class="page-header">
-            <h1>{{title}}<br><small>alaska climate data</small></h1>
+            <h1>{{ config['TITLE'] }}<br><small>alaska climate data</small></h1>
         </div>
         {% block content %}{% endblock %}
         <hr>
 
         <div id="footer">
             <p class="text-muted credit">
-            <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-sa/3.0/80x15.png" /></a> This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.
-            <br>
-            <small>Created by <a href="mailto:mrdillon@alaska.edu">Matthew Dillon</a>, 2015.</small>
+                <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-sa/3.0/80x15.png" /></a> This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.
+                <br>
+                <small>Created by <a href="mailto:mrdillon@alaska.edu">Matthew Dillon</a>, {{ config['COPYRIGHT_YEAR'] }}.</small>
             </p>
         </div>
     </div>
diff --git a/app/templates/details.html b/app/main/templates/main/details.html
similarity index 66%
rename from app/templates/details.html
rename to app/main/templates/main/details.html
index bb6d6ff..8df0ed6 100644
--- a/app/templates/details.html
+++ b/app/main/templates/main/details.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "main/base.html" %}
 {% block content %}
 
 <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.5/leaflet.css" />
@@ -31,27 +31,25 @@
         </thead>
         <tbody>
            {% for temp in temps %}
-         <tr>
-          <td>{{ temp[0]|int }}</td>
-          <td>{{ temp[1]|round(2) }}</td>
-          <td>{{ temp[2]|round(2) }}</td>
-          <td>{{ temp[3]|round(2) }}</td>
-          <td>{{ temp[4]|round(2) }}</td>
-          <td>{{ temp[5]|round(2) }}</td>
-          <td>{{ temp[6]|round(2) }}</td>
-          <td>{{ temp[7]|round(2) }}</td>
-          <td>{{ temp[8]|round(2) }}</td>
-          <td>{{ temp[9]|round(2) }}</td>
-          <td>{{ temp[10]|round(2) }}</td>
-          <td>{{ temp[11]|round(2) }}</td>
-          <td>{{ temp[12]|round(2) }}</td>
-         </tr>
+                <tr>
+                    <td>{{ temp[0]|int }}</td>
+                    <td>{{ temp[1]|round(2) }}</td>
+                    <td>{{ temp[2]|round(2) }}</td>
+                    <td>{{ temp[3]|round(2) }}</td>
+                    <td>{{ temp[4]|round(2) }}</td>
+                    <td>{{ temp[5]|round(2) }}</td>
+                    <td>{{ temp[6]|round(2) }}</td>
+                    <td>{{ temp[7]|round(2) }}</td>
+                    <td>{{ temp[8]|round(2) }}</td>
+                    <td>{{ temp[9]|round(2) }}</td>
+                    <td>{{ temp[10]|round(2) }}</td>
+                    <td>{{ temp[11]|round(2) }}</td>
+                    <td>{{ temp[12]|round(2) }}</td>
+                </tr>
        {% endfor %}
    </tbody>
-
 </table>
 
-
 <script>
 var map = L.map('map').setView([{{ lat }}, {{ lon }}], 5);
 L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg', {
diff --git a/app/templates/index.html b/app/main/templates/main/index.html
similarity index 97%
rename from app/templates/index.html
rename to app/main/templates/main/index.html
index 2072f38..434d7ae 100644
--- a/app/templates/index.html
+++ b/app/main/templates/main/index.html
@@ -1,5 +1,5 @@
-{% extends "base.html" %}
-{% from "_formhelpers.html" import render_field %}
+{% extends "main/base.html" %}
+{% from "main/_formhelpers.html" import render_field %}
 {% block content %}
 
 <p class="lead" align="justify">
@@ -46,7 +46,7 @@
         <div class="col-md-12">
             <div class="form-group col-md-4">
                 <input type="submit" name="submit" class="btn btn-primary form-control"
-                       value="Get Temperatures" >
+                       value="Get Temperatures" />
             </div>
             <div class="form-group col-md-4">
                 <input type="button" name="reset" class="btn btn-danger form-control"
@@ -112,11 +112,6 @@
                         </td>
                     </tr>
                     {% endif %}
-                    {#
-                    <tr>
-                        <td colspan="9">&nbsp;</td>
-                    </tr>
-                    #}
                     <tr class="active">
                         <td colspan="9" align="center">
                             Saved Searches
diff --git a/app/main/utils.py b/app/main/utils.py
index 24541f7..5446309 100644
--- a/app/main/utils.py
+++ b/app/main/utils.py
@@ -1,22 +1,22 @@
 import numpy
 
-from app.models import Temperature, Dataset
+from .models import Temperature, Dataset
 
 
 def getTemps(datasets, community_id, minyear, maxyear):
     temps = Temperature.query.join(Dataset). \
-            filter(Dataset.id == Temperature.dataset_id,
-                   Dataset.id == datasets,
-                   Temperature.community_id == community_id,
-                   Temperature.year >= minyear,
-                   Temperature.year <= maxyear)
+        filter(Dataset.id == Temperature.dataset_id,
+               Dataset.id == datasets,
+               Temperature.community_id == community_id,
+               Temperature.year >= minyear,
+               Temperature.year <= maxyear)
 
     length = int(maxyear) - int(minyear)
     temps_arr = numpy.zeros((length+1, 12))
 
     i = 0
     for t in temps.all():
-        temps_arr[i,:] =  [t.january, t.february, t.march,
+        temps_arr[i, :] = [t.january, t.february, t.march,
                            t.april, t.may, t.june,
                            t.july, t.august, t.september,
                            t.october, t.november, t.december]
@@ -58,8 +58,8 @@ def avg_air_indices(indices):
 
 def des_air_indices(indices):
     if indices.shape[0] > 2:
-        ati = numpy.sort(indices[:,0])
-        afi = numpy.sort(indices[:,1])
+        ati = numpy.sort(indices[:, 0])
+        afi = numpy.sort(indices[:, 1])
         dti = (ati[-1] + ati[-2] + ati[-3]) / 3.0
         dfi = (afi[0] + afi[1] + afi[2]) / 3.0
         return (int(dti), int(dfi))
diff --git a/app/main/views.py b/app/main/views.py
index f0df842..2778804 100644
--- a/app/main/views.py
+++ b/app/main/views.py
@@ -1,11 +1,12 @@
 from numpy import arange, hstack
 
-from flask import session, render_template, request, redirect, current_app
+from flask import session, render_template, request, redirect, url_for
 
 from . import main
 from .forms import AKIForm
-from .utils import getTemps, avg_air_temp, ann_air_indices, avg_air_indices, des_air_indices
-from app.models import Community, Dataset, Temperature
+from .utils import getTemps, avg_air_temp, ann_air_indices, \
+    avg_air_indices, des_air_indices
+from .models import Community, Dataset
 
 
 @main.route('/', methods=['GET'])
@@ -21,24 +22,27 @@ def index():
         if all(key in session for key in ('minyear', 'maxyear', 'datasets')):
             community = Community.query.get_or_404(community_id)
 
-            # TODO: clean this up
-            session['community_data'] = dict()
-            session['community_data']['id'] = community_id
-            session['community_data']['name'] = community.name
-            session['community_data']['latitude'] = round(community.latitude, 5)
-            session['community_data']['longitude'] = round(community.longitude, 5)
+            session['community_data'] = {
+                'id': community_id,
+                'name': community.name,
+                'latitude': round(community.latitude, 5),
+                'longitude': round(community.longitude, 5),
+            }
 
             session['ds_name'] = Dataset.query. \
                 with_entities(Dataset.modelname, Dataset.scenario). \
                 filter_by(id=session['datasets']).all()
-            temps_arr = getTemps(session['datasets'], community_id, session['minyear'], session['maxyear'])
+            temps_arr = getTemps(session['datasets'],
+                                 community_id,
+                                 session['minyear'],
+                                 session['maxyear'])
 
             session['avg_temp'] = avg_air_temp(temps_arr)
             indices = ann_air_indices(temps_arr)
             session['avg_indices'] = avg_air_indices(indices)
             session['des_indices'] = des_air_indices(indices)
 
-    return render_template("index.html", form=form)
+    return render_template("main/index.html", form=form)
 
 
 @main.route('/', methods=['POST'])
@@ -52,20 +56,20 @@ def index_submit():
             session['maxyear'] = session['minyear']
 
         session['datasets'] = request.form['model']
-        return redirect('/')
+        return redirect(url_for('main.index'))
     else:
-        return render_template("index.html", form=form)
+        return render_template("main/index.html", form=form)
 
 
 @main.route('/datatypes')
 def datatypes():
-    return render_template("datatypes.html")
+    return render_template("main/datatypes.html")
 
 
 @main.route('/reset')
 def reset():
     session.clear()
-    return redirect('/')
+    return redirect(url_for('main.index'))
 
 
 @main.route('/details')
@@ -75,40 +79,43 @@ def details():
     minyear = request.args.get('minyear', '')
     maxyear = request.args.get('maxyear', '')
     temps = getTemps(datasets, community_id, minyear, maxyear)
-    years = arange(int(minyear), int(maxyear)+1).reshape(int(maxyear)-int(minyear) + 1, 1)
+    years = arange(int(minyear),
+                   int(maxyear)+1).reshape(int(maxyear)-int(minyear) + 1, 1)
     temps = hstack((years, temps))
-    return render_template("details.html",
-        lat=request.args.get('lat', ''),
-        lon=request.args.get('lon', ''),
-        community_name=request.args.get('name', ''),
-        temps=temps)
+    return render_template("main/details.html",
+                           lat=request.args.get('lat', ''),
+                           lon=request.args.get('lon', ''),
+                           community_name=request.args.get('name', ''),
+                           temps=temps)
 
 
 @main.route('/save')
 def save():
     if 'save' in session:
-        i = len(session['save'])
+        i = str(len(session['save']))
         save = session['save']
     else:
         save = dict()
-        i = 0
+        i = '0'
+
+    save[i] = {
+        'datasets': session['datasets'],
+        'ds_name': session['ds_name'],
+        'community_data': session['community_data'],
+        'minyear': session['minyear'],
+        'maxyear': session['maxyear'],
+        'avg_temp': session['avg_temp'],
+        'avg_indices': session['avg_indices'],
+        'des_indices': session['des_indices'],
+    }
 
-    save[i] = dict()
-    save[i]['datasets'] = session['datasets']
-    save[i]['ds_name'] = session['ds_name']
-    save[i]['community_data'] = session['community_data']
-    save[i]['minyear'] = session['minyear']
-    save[i]['maxyear'] = session['maxyear']
-    save[i]['avg_temp'] = session['avg_temp']
-    save[i]['avg_indices'] = session['avg_indices']
-    save[i]['des_indices'] = session['des_indices']
     session.clear()
     session['save'] = save
-    return redirect('/')
+    return redirect(url_for('main.index'))
 
 
 @main.route('/delete')
 def delete():
     record = request.args.get('record', '')
     session['save'].pop(record)
-    return redirect('/')
+    return redirect(url_for('main.index'))
diff --git a/config.py b/config.py
index d9c1ce8..5138064 100644
--- a/config.py
+++ b/config.py
@@ -1,11 +1,14 @@
 import os
-basedir = os.path.abspath(os.path.dirname(__file__))
 
 
 class Config:
     SECRET_KEY = os.environ.get('SECRET_KEY')
     APP_NAME = 'AKIndices'
     APP_VERSION = '0.2.0'
+    TITLE = 'AKIndices'
+    COPYRIGHT_YEAR = 2015
+    CSRF_ENABLED = True
+    DEBUG = False
 
     @staticmethod
     def init_app(app):
@@ -14,9 +17,10 @@ class Config:
 
 class DevelopmentConfig(Config):
     DEBUG = True
+    TITLE = 'AKIndices (test)'
     SECRET_KEY = os.environ.get('SECRET_KEY') or 'top secret'
     SQLALCHEMY_DATABASE_URI = os.environ.get('DATABASE_URL') or \
-            'postgres://postgres@localhost/akindices'
+        'postgres://postgres@localhost/akindices'
 
 
 config = {
