diff --git a/README.org b/README.org
index b9b8df3..5f15e85 100644
--- a/README.org
+++ b/README.org
@@ -46,5 +46,6 @@ docker-compose -f dev.yml run django python manage.py createsuperuser
 If you want to export some data you entered into the admin area you can use =dumpdata= and =loaddata= to export and import.
 
 #+BEGIN_SRC sh
-docker-compose -fdev.yml run django python manage.py dumpdata feeds > mhackspace/feeds/fixtures/default.json
+docker-compose -fdev.yml run django python manage.py dumpdata feeds > mhackspace/feeds/fixtures/defaults.json
+docker-compose -fdev.yml run django python manage.py loaddata mhackspace/feeds/fixtures/defaults.json
 #+END_SRC
diff --git a/mhackspace/feeds/admin.py b/mhackspace/feeds/admin.py
index 3167acd..4dc10a1 100644
--- a/mhackspace/feeds/admin.py
+++ b/mhackspace/feeds/admin.py
@@ -1,12 +1,13 @@
 from django.contrib import admin
-from django.contrib.admin import AdminSite, TabularInline, ModelAdmin
+from django.contrib.admin import ModelAdmin
 from mhackspace.feeds.models import Feed
 
 
 @admin.register(Feed)
 class FeedAdmin(ModelAdmin):
     list_display = ('url', 'author', 'tags', 'enabled')
+    list_filter = ('enabled', )
 
-admin.site.site_title = 'Maidstone hackspace Admin Area'
-admin.site.site_header = 'Maidstone hackspace Admin Area'
+admin.site.site_title = 'Maidstone Hackspace Admin Area'
+admin.site.site_header = 'Maidstone Hackspace Admin Area'
 admin.site.index_title = 'Maidstone Admin Home'
diff --git a/mhackspace/feeds/fixtures/defaults.json b/mhackspace/feeds/fixtures/defaults.json
index 8d25010..f20b1fe 100644
--- a/mhackspace/feeds/fixtures/defaults.json
+++ b/mhackspace/feeds/fixtures/defaults.json
@@ -1,4 +1,68 @@
-Postgres is up - continuing...
-/usr/local/lib/python3.5/site-packages/environ/environ.py:608: UserWarning: /app/config/settings/.env doesn't exist - if you're not configuring your environment separately, create one.
-  "environment separately, create one." % env_file)
-[{"model": "feeds.feed", "pk": 1, "fields": {"url": "http://waistcoatforensicator.blogspot.com/feeds/posts/default?alt=rss", "author": "Simon Ridley", "tags": "", "image": "", "enabled": true}}, {"model": "feeds.feed", "pk": 2, "fields": {"url": "http://www.matthewbeddow.co.uk/?feed=rss2", "author": "Mathew Beddow", "tags": "tech", "image": "", "enabled": true}}, {"model": "feeds.feed", "pk": 3, "fields": {"url": "http://blog.digitaloctave.co.uk/rss.xml", "author": "Oliver Marks", "tags": "", "image": "", "enabled": true}}, {"model": "feeds.feed", "pk": 4, "fields": {"url": "http://webboggles.com/feed/", "author": "Ilya Titov", "tags": "", "image": "", "enabled": true}}, {"model": "feeds.feed", "pk": 5, "fields": {"url": "http://thearduinoguy.org/?feed=rss2", "author": "Mike McRoberts", "tags": "", "image": "", "enabled": true}}, {"model": "feeds.feed", "pk": 6, "fields": {"url": "https://feeds.feedburner.com/projects-jl", "author": "James", "tags": "", "image": "", "enabled": false}}]
\ No newline at end of file
+[
+  {
+    "model": "feeds.feed",
+    "pk": 1,
+    "fields": {
+      "url": "http://waistcoatforensicator.blogspot.com/feeds/posts/default?alt=rss",
+      "author": "Simon Ridley",
+      "tags": "",
+      "image": "",
+      "enabled": true
+    }
+  },
+  {
+    "model": "feeds.feed",
+    "pk": 2,
+    "fields": {
+      "url": "http://www.matthewbeddow.co.uk/?feed=rss2",
+      "author": "Mathew Beddow",
+      "tags": "tech",
+      "image": "",
+      "enabled": true
+    }
+  },
+  {
+    "model": "feeds.feed",
+    "pk": 3,
+    "fields": {
+      "url": "http://blog.digitaloctave.co.uk/rss.xml",
+      "author": "Oliver Marks",
+      "tags": "",
+      "image": "",
+      "enabled": true
+    }
+  },
+  {
+    "model": "feeds.feed",
+    "pk": 4,
+    "fields": {
+      "url": "http://webboggles.com/feed/",
+      "author": "Ilya Titov",
+      "tags": "",
+      "image": "",
+      "enabled": true
+    }
+  },
+  {
+    "model": "feeds.feed",
+    "pk": 5,
+    "fields": {
+      "url": "http://thearduinoguy.org/?feed=rss2",
+      "author": "Mike McRoberts",
+      "tags": "",
+      "image": "",
+      "enabled": true
+    }
+  },
+  {
+    "model": "feeds.feed",
+    "pk": 6,
+    "fields": {
+      "url": "https://feeds.feedburner.com/projects-jl",
+      "author": "James",
+      "tags": "",
+      "image": "",
+      "enabled": false
+    }
+  }
+]
diff --git a/mhackspace/feeds/templatetags/feed_views.py b/mhackspace/feeds/templatetags/feed_views.py
index 463e6ea..023d5b2 100644
--- a/mhackspace/feeds/templatetags/feed_views.py
+++ b/mhackspace/feeds/templatetags/feed_views.py
@@ -17,4 +17,4 @@ def show_feeds():
         })
 
     result = feed_reader(rss_feeds)
-    return {'feeds': [item for item in result]}
+    return {'articles': [item for item in result]}
diff --git a/mhackspace/templates/feeds/list.html b/mhackspace/templates/feeds/list.html
index c8fe4ec..84ef063 100644
--- a/mhackspace/templates/feeds/list.html
+++ b/mhackspace/templates/feeds/list.html
@@ -1,22 +1,13 @@
-Maker feed
-
-<div class="card-deck-wrapper">
-  <div class="card-deck">
-    {% for feed in feeds %}
-      <div class="card">
-        <img class="card-img-top img-responsive" src="{{ feed.image }}" alt="Card image cap" style="width:100%">
-        <div class="card-block">
-          <h4 class="card-title">{{ feed.title }}</h4>
-          <p class="card-text">{{ feed.author }}</p>
-        </div>
-        <div class="card-block">
-          <p class="card-text">{{ feed.description }}</p>
-        </div>
-        <div class="card-block">
-          <a href="{{ feed.url }}" class="card-link">View Original</a>
-        </div>
+<div class="card-columns" id="feeds">
+  {% for article in articles %}
+    <div class="card" style="width: 20rem;">
+      <img class="card-img-top img-fluid" src="{{ article.image }}" alt="{{ article.title }}">
+      <div class="card-block">
+        <h4 class="card-title">{{ article.title }}</h4>
+        <p class="card-text">{{ article.author }}</p>
+        <p class="card-text">{{ article.description|striptags }}</p>
+        <a href="{{ article.url }}" class="card-link">View Original</a>
       </div>
-      {% if forloop.counter|divisibleby:3 %}</div><div class="card-deck">{% endif %}
-    {% endfor %}
-  </div>
+    </div>
+  {% endfor %}
 </div>