diff --git a/src/gameservers/views.py b/src/gameservers/views.py
index df15a7c..ca20963 100644
--- a/src/gameservers/views.py
+++ b/src/gameservers/views.py
@@ -13,23 +13,6 @@ class ServerDetailView(generic.DetailView):
     def get_context_data(self, **kwargs):
         context = super(ServerDetailView, self).get_context_data(**kwargs)
         server = context['server']
-        context['weekly_history'] = server.get_history_stats(days=7)
-
-        stats = server.calc_player_stats(days=1)
-        context['daily_average'] = stats['players__avg']
-        context['daily_min'] = stats['players__min']
-        context['daily_max'] = stats['players__max']
-
-        stats = server.calc_player_stats(days=7)
-        context['weekly_average'] = stats['players__avg']
-        context['weekly_min'] = stats['players__min']
-        context['weekly_max'] = stats['players__max']
-
-        stats = server.calc_player_stats(days=31)
-        context['monthly_average'] = stats['players__avg']
-        context['monthly_min'] = stats['players__min']
-        context['monthly_max'] = stats['players__max']
-
-        context['weekday_averages'] = server.weekday_averages()
+        context['weekly_history'] = server.get_stats_history(days=7)
         return context
 
diff --git a/src/templates/gameservers/server_detail.html b/src/templates/gameservers/server_detail.html
index 1309ed4..882bc6f 100644
--- a/src/templates/gameservers/server_detail.html
+++ b/src/templates/gameservers/server_detail.html
@@ -6,9 +6,7 @@
 {% endblock %}
 
 {% block content %}
-    <h1>
-        {{server}}
-    </h1>
+    <h1>{{server}}</h1>
 
     <a class="btn btn-default" href="{{server.game_url}}" rel="nofollow">Launch game</a>
     {% if server.site_url %}
@@ -17,42 +15,32 @@
         <button class="btn btn-default">No homepage</button>
     {% endif %}
 
-    <h2>Player Population</h2>
-    <p>Currently <span class="bold">
-        {{server.current_players}} players
-    </span>online.</p>
-
+    <h3>Players</h3>
     <p>Last updated <span class="bold" title="{{server.last_updated|date:'r'}} GMT">
         {{server.last_updated|timesince}}
     </span>ago.</p>
 
     <table class="table table-hover">
-        <thead>
-            <tr>
-                <th>Time period</th>
-                <th>Average</th>
-                <th>Min</th>
-                <th>Max</th>
-            </tr>
-        </thead>
         <tbody>
-            <tr>
-                <th>Last day</th>
-                <th>{{daily_average|floatformat}}</th>
-                <th>{{daily_min}}</th>
-                <th>{{daily_max}}</th>
+        {% if server.players_current > 0 %}
+            <tr class="success">
+        {% else %}
+            <tr class="danger">
+        {% endif %}
+                <th>Current</th>
+                <th>{{server.players_current}}</th>
             </tr>
             <tr>
-                <th>Last week</th>
-                <th>{{weekly_average|floatformat}}</th>
-                <th>{{weekly_min}}</th>
-                <th>{{weekly_max}}</th>
+                <th>Average</th>
+                <th>{{server.players_avg}}</th>
             </tr>
             <tr>
-                <th>Last month</th>
-                <th>{{monthly_average|floatformat}}</th>
-                <th>{{monthly_min}}</th>
-                <th>{{monthly_max}}</th>
+                <th>Min</th>
+                <th>{{server.players_min}}</th>
+            </tr>
+            <tr>
+                <th>Max</th>
+                <th>{{server.players_max}}</th>
             </tr>
     </table>
 
diff --git a/src/templates/gameservers/server_list.html b/src/templates/gameservers/server_list.html
index 03be50b..a622818 100644
--- a/src/templates/gameservers/server_list.html
+++ b/src/templates/gameservers/server_list.html
@@ -16,7 +16,7 @@
         <tbody>
             {% for server in server_list %}
                 <tr>
-                    <th>{{server.current_players}}</th>
+                    <th>{{server.players_current}}</th>
                     <th>
                         <a href="{% url 'gameservers:detail' pk=server.id slug=server %}">
                             {{server}}