diff --git a/ogn_python/__init__.py b/ogn_python/__init__.py
index f6c2758..4e72ae9 100644
--- a/ogn_python/__init__.py
+++ b/ogn_python/__init__.py
@@ -1,6 +1,7 @@
 from flask import Flask
 from flask_bootstrap import Bootstrap
 from flask_sqlalchemy import SQLAlchemy
+from flask_caching import Cache
 from celery import Celery
 
 from ogn_python.navigation import nav
@@ -19,6 +20,9 @@ bootstrap = Bootstrap(app)
 # Sqlalchemy
 db = SQLAlchemy(app)
 
+# Cache
+cache = Cache(app)
+
 # Celery
 celery = make_celery(app)
 
diff --git a/ogn_python/config/default.py b/ogn_python/config/default.py
index b991790..8e5d7d3 100644
--- a/ogn_python/config/default.py
+++ b/ogn_python/config/default.py
@@ -1,10 +1,17 @@
+SECRET_KEY = 'you-will-never-guess'
+
 SQLALCHEMY_DATABASE_URI = 'postgresql://postgres@localhost:5432/ogn'
 SQLALCHEMY_TRACK_MODIFICATIONS = False
 
+# Flask-Cache stuff
+CACHE_TYPE = 'simple'
+CACHE_DEFAULT_TIMEOUT = 300
+
 # Celery stuff
 CELERY_BROKER_URL = 'redis://localhost:6379/0'
 CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'
 
+
 from celery.schedules import crontab
 from datetime import timedelta
 
diff --git a/ogn_python/routes.py b/ogn_python/routes.py
index 60b920d..616984a 100644
--- a/ogn_python/routes.py
+++ b/ogn_python/routes.py
@@ -5,10 +5,51 @@ from sqlalchemy import func, and_, or_
 
 from ogn_python import app
 from ogn_python import db
+from ogn_python import cache
 
 from ogn_python.model import *
 
 
+@cache.cached(key_prefix='countries_in_receivers')
+def get_countries_in_receivers():
+    query = db.session.query(Country) \
+        .filter(Country.gid == Receiver.country_id) \
+        .order_by(Country.iso2) \
+        .distinct()
+
+    return [country for country in query.all()]
+
+
+@cache.cached(key_prefix='countries_in_logbook')
+def get_countries_in_logbook():
+    query = db.session.query(Country) \
+        .filter(Country.iso2 == Airport.country_code) \
+        .order_by(Country.iso2) \
+        .distinct()
+
+    return [country for country in query.all()]
+
+
+def get_airports_in_country(sel_country):
+    query = db.session.query(Airport) \
+        .filter(Airport.country_code == sel_country) \
+        .filter(Logbook.takeoff_airport_id == Airport.id) \
+        .order_by(Airport.name) \
+        .distinct()
+
+    return [airport for airport in query.all()]
+
+
+def get_dates_for_airport(sel_airport):
+    query = db.session.query(func.date(Logbook.reftime), func.count(Logbook.id).label('logbook_count')) \
+        .filter(Airport.id == sel_airport) \
+        .filter(or_(Airport.id == Logbook.takeoff_airport_id, Airport.id == Logbook.landing_airport_id)) \
+        .group_by(func.date(Logbook.reftime)) \
+        .order_by(func.date(Logbook.reftime).desc())
+
+    return [{'date': date, 'logbook_count': logbook_count} for (date, logbook_count) in query.all()]
+
+
 @app.route('/')
 @app.route('/index.html')
 def index():
@@ -18,6 +59,7 @@ def index():
 @app.route('/devices.html', methods=['GET', 'POST'])
 def devices():
     devices = db.session.query(Device) \
+        .order_by(Device.address) \
         .limit(100)
     return render_template('devices.html', devices=devices)
 
@@ -38,10 +80,7 @@ def device_detail():
 def receivers():
     sel_country = request.args.get('country')
 
-    countries_in_receivers = db.session.query(Country.iso2, func.count(Receiver.id).label('receiver_count')) \
-        .filter(Country.gid == Receiver.country_id) \
-        .group_by(Country.iso2) \
-        .order_by(Country.iso2)
+    countries = get_countries_in_receivers()
 
     # Get receiver selection list
     if sel_country:
@@ -55,7 +94,7 @@ def receivers():
     return render_template('receivers.html',
                            title='Receivers',
                            sel_country=sel_country,
-                           countries=countries_in_receivers,
+                           countries=countries,
                            receivers=receivers)
 
 
@@ -83,15 +122,11 @@ def receiver_detail():
 def airports():
     sel_country = request.args.get('country')
 
-    countries_in_logbook = db.session.query(Country.iso2, func.count(Airport.id).label('airport_count')) \
-        .filter(Country.iso2 == Airport.country_code) \
-        .group_by(Country.iso2) \
-        .order_by(Country.iso2)
+    countries = get_countries_in_logbook()
 
     if sel_country:
-        airports = db.session.query(Airport, Receiver).outerjoin(Receiver) \
-            .filter(and_(or_(Logbook.takeoff_airport_id == Airport.id, Logbook.landing_airport_id == Airport.id), Airport.country_code == sel_country)) \
-            .group_by(Airport.id) \
+        airports = db.session.query(Airport) \
+            .filter(Airport.country_code == sel_country) \
             .order_by(Airport.name)
     else:
         airports = []
@@ -100,7 +135,7 @@ def airports():
 
     return render_template('airports.html',
                            sel_country=sel_country,
-                           countries=countries_in_logbook,
+                           countries=countries,
                            airports=airports)
 
 
@@ -129,48 +164,32 @@ def logbook():
 
     sel_device_id = request.args.get('device_id')
 
-    airport_ids_in_logbook = db.session.query(db.distinct(Logbook.takeoff_airport_id).label('id')) \
-        .subquery()
+    countries = get_countries_in_logbook()
 
-    airports_in_logbook = db.session.query(Airport) \
-        .filter(Airport.id == airport_ids_in_logbook.c.id) \
-        .subquery()
-
-    country_ids_in_logbook = db.session.query(db.distinct(Country.gid).label('id')) \
-        .filter(Country.iso2 == airports_in_logbook.c.country_code) \
-        .subquery()
-
-    countries_avail = db.session.query(Country) \
-        .filter(Country.gid == country_ids_in_logbook.c.id) \
-        .order_by(Country.iso2)
-
-    # Get airport selection list
     if sel_country:
-        airports = db.session.query(Airport) \
-            .filter(Airport.id == airport_ids_in_logbook.c.id) \
-            .filter(Airport.country_code == sel_country) \
-            .order_by(Airport.name)
-    elif sel_airport:
-        airports = db.session.query(Airport) \
-            .filter(Airport.id == sel_airport)
-
-        sel_country = airports.one().country_code
+        airports = get_airports_in_country(sel_country)
     else:
-        airports = ['']
+        airports = []
 
-    # Get date selection list
-    if sel_country and sel_airport:
-        dates = db.session.query(db.func.date(Logbook.reftime), db.func.count(Logbook.id)) \
-            .filter(db.or_(Logbook.takeoff_airport_id == sel_airport,
-                           Logbook.landing_airport_id == sel_airport)) \
-            .group_by(db.func.date(Logbook.reftime)) \
-            .order_by(db.func.date(Logbook.reftime))
+    if sel_airport:
+        sel_airport = int(sel_airport)
+        if sel_airport not in [airport.id for airport in airports]:
+            sel_airport = None
+            sel_date = None
+        dates = get_dates_for_airport(sel_airport)
     else:
-        dates = ['']
+        dates = []
+
+    if sel_date:
+        sel_date = datetime.datetime.strptime(sel_date, '%Y-%m-%d').date()
+        if sel_date not in [entry['date'] for entry in dates]:
+            sel_date = dates[0]['date']
+    elif len(dates) > 0:
+        sel_date = dates[0]['date']
 
     # Get Logbook
     filters = []
-    if sel_country and sel_airport:
+    if sel_airport:
         filters.append(db.or_(Logbook.takeoff_airport_id == sel_airport, Logbook.landing_airport_id == sel_airport))
 
     if sel_date:
@@ -189,7 +208,7 @@ def logbook():
     return render_template('logbook.html',
                            title='Logbook',
                            sel_country=sel_country,
-                           countries=countries_avail,
+                           countries=countries,
                            sel_airport=sel_airport,
                            airports=airports,
                            sel_date=sel_date,
diff --git a/ogn_python/templates/logbook.html b/ogn_python/templates/logbook.html
index 9d69019..d393f77 100644
--- a/ogn_python/templates/logbook.html
+++ b/ogn_python/templates/logbook.html
@@ -2,11 +2,14 @@
 
 {% block content %}
 
+<link rel="stylesheet" href="{{ url_for('static', filename='css/flags/flags.css') }}"/>
+
 <div class="container">
 <div class="panel panel-success">
 <div class="panel-heading"><h3 class="panel-title">Logbook</h3></div>
 <div class="panel-body">
 
+
 <form>
 <div class="well">
 <select name="country" onchange="this.form.submit();">
@@ -18,14 +21,17 @@
 <select name="airport" onchange="this.form.submit();">
 	<option value="">(none)</option>
     {% for airport in airports %}
-    <option value="{{ airport.id }}"{% if sel_airport == airport.id|string() %} SELECTED{% endif %}>{{ airport.name }}</option>
+    <option value="{{ airport.id }}"{% if sel_airport == airport.id %} SELECTED{% endif %}>{{ airport.name }}</option>
     {% endfor %}
 </select>
 <select name="date" onchange="this.form.submit();">
-	<option value="">(none)</option>
-    {% for date in dates %}
-    <option value="{{ date[0] }}"{% if sel_date|string() == date[0]|string() %} SELECTED{% endif %}>{{ date[0] }} ({{ date[1] }})</option>
-    {% endfor %}
+	{% if dates|length %}
+	    {% for entry in dates %}
+	    <option value="{{ entry.date }}"{% if sel_date|string() == entry.date|string() %} SELECTED{% endif %}>{{ entry.date }} ({{ entry.logbook_count }})</option>
+	    {% endfor %}
+	{% else %}
+		<option value="">(none)</option>
+	{% endif %}
 </select>
 </div>
 </form>
@@ -46,8 +52,8 @@
 	{% for entry in logbook %}
 	<tr>
 		<td>{{ loop.index }}</td>
-        <td><a href="{{ url_for('device_detail', id=entry.device.id) }}">{% if entry.device.info is none %}{{ entry.device.address }}{% else %}{{ entry.device.info.registration }}{% endif %}</a></td>
-        <td>{% if entry.device.info is none %}-{% else %}{{ entry.device.info.aircraft }}{% endif %}</td>
+        <td><a href="{{ url_for('device_detail', id=entry.device.id) }}">{% if entry.device.info is not none and entry.device.info.registration|length %}{{ entry.device.info.registration }}{% else %}[{{ entry.device.address }}]{% endif %}</a></td>
+        <td>{% if entry.device.info is not none and entry.device.info.aircraft|length %}{{ entry.device.info.aircraft }}{% else %}-{% endif %}</td>
         <td>{% if entry.takeoff_timestamp is not none and entry.takeoff_airport.id|string() == sel_airport %} {{ entry.takeoff_timestamp.strftime('%H:%M') }} {% endif %}</td>
         <td>{% if entry.takeoff_track is not none and entry.takeoff_airport.id|string() == sel_airport %} {{ '%02d' | format(entry.takeoff_track/10) }} {% endif %}</td>
         <td>{% if entry.landing_timestamp is not none and entry.landing_airport.id|string() == sel_airport %} {{ entry.landing_timestamp.strftime('%H:%M') }} {% endif %}</td>
diff --git a/ogn_python/templates/receivers.html b/ogn_python/templates/receivers.html
index 987c553..8775cba 100644
--- a/ogn_python/templates/receivers.html
+++ b/ogn_python/templates/receivers.html
@@ -14,7 +14,7 @@
 <select name="country" onchange="this.form.submit();">
 	<option value="">(all)</option>
     {% for country in countries %}
-    <option value="{{ country.iso2 }}"{% if sel_country == country.iso2 %} SELECTED{% endif %}>{{ country.iso2 }} ({{ country.receiver_count }})</option>
+    <option value="{{ country.iso2 }}"{% if sel_country == country.iso2 %} SELECTED{% endif %}>{{ country.iso2 }}</option>
     {% endfor %}
 </select>
 </div>
diff --git a/ogn_python/templates/statistics.html b/ogn_python/templates/statistics.html
index 0936058..f5a1018 100644
--- a/ogn_python/templates/statistics.html
+++ b/ogn_python/templates/statistics.html
@@ -3,8 +3,8 @@
 {% block content %}
 
 <link rel="stylesheet" href="{{ url_for('static', filename='css/flags/flags.css') }}"/>
-  
-<div class="container-fluid">
+ 
+<div class="container">
 <div class="panel panel-success" id="asdf">
 <div class="panel-heading"><h3 class="panel-title">Devices</h3></div>
 <div class="panel-body">
diff --git a/setup.py b/setup.py
index 1b88a59..3f38f80 100644
--- a/setup.py
+++ b/setup.py
@@ -37,6 +37,8 @@ setup(
         'Flask-Migrate==2.3.1',
         'flask-bootstrap==3.3.7.1',
         'flask-nav==0.6',
+        'flask-wtf==0.14.2',
+        'flask-caching==1.7.0',
         'geopy==1.17.0',
         'celery[redis]==4.2.1',
         'aerofiles==0.4.1',