diff --git a/app/vapemap/conf/base.py b/app/vapemap/conf/base.py
index f845e1b..584f0a0 100644
--- a/app/vapemap/conf/base.py
+++ b/app/vapemap/conf/base.py
@@ -82,6 +82,8 @@ INSTALLED_APPS = [
 ]
 
 MIDDLEWARE_CLASSES = [
+    'django.middleware.http.ConditionalGetMiddleware',
+    'django.middleware.gzip.GZipMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
diff --git a/app/vapemap/templates/base.html b/app/vapemap/templates/base.html
index 4b9e423..f5ddceb 100644
--- a/app/vapemap/templates/base.html
+++ b/app/vapemap/templates/base.html
@@ -14,18 +14,12 @@
     <link href="{% static "css/bootstrap.min.css" %}" rel="stylesheet">
     <link href="{% static "css/bootstrap-responsive.min.css" %}" rel="stylesheet">
     <link href="{% static "css/base.css" %}" rel="stylesheet">
+    {% block style %}
+    {% endblock %}
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
     <script src="{% static "js/html5shiv.js" %}"></script>
     <![endif]-->
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-    <script type="text/javascript">
-        var static_url = '{{ STATIC_URL }}';
-        var django = {'jQuery': $};
-    </script>
-    {% include "ga.html" %}
-    {% block style %}
-    {% endblock %}
 </head>
 
 <body>
@@ -80,6 +74,12 @@
     {% include "login_form.html" %}
     {% endif %}
 </body>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript">
+    var static_url = '{{ STATIC_URL }}';
+    var django = {'jQuery': $};
+</script>
+{% include "ga.html" %}
 <script src="{% static "js/bootstrap.min.js" %}"></script>
 {% block scripts %}
 {% endblock %}
