diff --git a/templates/zerver/activity.html b/templates/zerver/activity.html
index 124c00bf10..4fb85127ec 100644
--- a/templates/zerver/activity.html
+++ b/templates/zerver/activity.html
@@ -14,7 +14,7 @@
 {% block content %}
 
 <ul class="nav nav-tabs">
-{% for name, activity in data.iteritems %}
+{% for name, activity in data %}
     <li {% if activity.default_tab %} class="active" {% endif %}>
         <a href="#{{ name }}" data-toggle="tab">{{ name }}</a>
     </li>
@@ -27,7 +27,7 @@
 
 <div class="tab-content">
 
-{% for name, activity in data.iteritems %}
+{% for name, activity in data %}
 
     <div class="tab-pane {% if activity.default_tab %} active {% endif %}" id="{{ name }}">
     <h2>{{ name }} usage</h2>
diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py
index ab9cdc10f6..8ca72049f8 100644
--- a/zerver/views/__init__.py
+++ b/zerver/views/__init__.py
@@ -1847,13 +1847,13 @@ def get_activity(request):
     )
 
     return render_to_response('zerver/activity.html',
-        { 'data': {
-            'Website': ActivityTable('website',       web_queries, default_tab=True),
-            'Mirror':  ActivityTable('zephyr_mirror', api_queries),
-            'API':     ActivityTable('API',           api_queries),
-            'Android': ActivityTable('Android',       api_queries),
-            'iPhone':  ActivityTable('iPhone',        api_queries)
-        }}, context_instance=RequestContext(request))
+        { 'data': [
+            ('Website',    ActivityTable('website',       web_queries, default_tab=True)),
+            ('Mirror',     ActivityTable('zephyr_mirror', api_queries)),
+            ('API',        ActivityTable('API',           api_queries)),
+            ('Android',    ActivityTable('Android',       api_queries)),
+            ('iPhone',     ActivityTable('iPhone',        api_queries))
+        ]}, context_instance=RequestContext(request))
 
 def get_status_list(requesting_user_profile):
     return {'presences': get_status_dict(requesting_user_profile),