diff --git a/charter_members/admin.py b/charter_members/admin.py
index 4b8d015..d89f125 100644
--- a/charter_members/admin.py
+++ b/charter_members/admin.py
@@ -9,8 +9,8 @@ admin.site.register(Position)
 
 @admin.register(Attorney)
 class MemberAdmin(admin.ModelAdmin):
-    list_display = ('name', 'position', 'chapter', 'phone_formatted', 'email', 'front_page', 'joined', 'thumbnail')
+    list_display = ['name', 'position', 'chapter', 'phone_formatted', 'email', 'front_page', 'joined', 'thumbnail']
     list_filter = ['chapter', 'position', 'front_page', 'joined']
-    search_fields = ('email', 'joined', 'name', 'chapter', 'position', 'website', 'phone', 'phone_formatted')
-    fields = ('image_preview', 'image', 'name', 'position', 'chapter', 'biography', 'phone', 'email', 'website', 'front_page', 'joined')
-    readonly_fields = ('image_preview',)
+    search_fields = ['email', 'joined', 'name', 'chapter', 'position', 'website', 'phone', 'phone_formatted']
+    fields = ['image_preview', 'image', 'name', 'position', 'chapter', 'biography', 'phone', 'email', 'website', 'front_page', 'joined']
+    readonly_fields = ['image_preview']
diff --git a/expert_witnesses/admin.py b/expert_witnesses/admin.py
index 33416be..9f2a8a8 100644
--- a/expert_witnesses/admin.py
+++ b/expert_witnesses/admin.py
@@ -8,5 +8,8 @@ admin.site.register(AreaOfExpertise)
 
 @admin.register(Expert)
 class ExpertiseAdmin(admin.ModelAdmin):
+    list_display = ['name', 'institute', 'CV']
+    list_filter = ['institute', 'expertise']
+    search_fields = ['name', 'institute', 'expertise']
     fields = ['name', 'institute', 'CV', 'expertise', 'cases']
-    filter_horizontal = ('expertise', 'cases')
+    filter_horizontal = ['expertise', 'cases']
diff --git a/forum/admin.py b/forum/admin.py
index 3a73d08..1a56245 100644
--- a/forum/admin.py
+++ b/forum/admin.py
@@ -8,15 +8,16 @@ admin.site.register(Thread)
 
 @admin.register(Post)
 class PostAdmin(admin.ModelAdmin):
-    list_display = ['title', 'resolved', 'topic', 'creator', 'created']
-    search_fields = ['title', 'resolved', 'topic', 'creator', 'created']
+    list_display = ['title', 'resolved', 'thread', 'creator', 'created']
+    list_filter = ['thread', 'resolved', 'created']
+    search_fields = ['title', 'resolved', 'thread', 'creator', 'created']
 
     def get_form(self, request, obj=None, **kwargs):
         if obj:
-            self.fields = ['creator', 'created', 'resolved', 'title', 'topic', 'question']
+            self.fields = ['creator', 'created', 'resolved', 'title', 'thread', 'question']
             self.readonly_fields = ['creator', 'created']
         else:
-            self.fields = ['title', 'topic', 'question']
+            self.fields = ['title', 'thread', 'question']
             self.readonly_fields = []
         return super(PostAdmin, self).get_form(request, obj, **kwargs)
 
diff --git a/forum/forms.py b/forum/forms.py
index fef7e85..33db4a0 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -18,7 +18,7 @@ class CreatePostForm(forms.ModelForm):
 
     class Meta:
         model = Post
-        fields = ['title', 'topic', 'question']
+        fields = ['title', 'thread', 'question']
 
 
 class EditPostForm(forms.ModelForm):
diff --git a/forum/models.py b/forum/models.py
index 1452d58..d1c9970 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -5,17 +5,17 @@ from tinymce.models import HTMLField
 
 
 class Thread(models.Model):
-    topic = models.CharField(max_length=255)
+    name = models.CharField(max_length=255)
 
     def __str__(self):
-        return self.topic
+        return self.name
 
 
 class Post(models.Model):
     creator = models.ForeignKey(User)
     created = models.DateTimeField(auto_now_add=True)
     resolved = models.BooleanField(default=False)
-    topic = models.ForeignKey(Thread)
+    thread = models.ForeignKey(Thread)
     title = models.CharField(max_length=255)
     question = HTMLField()
 
diff --git a/forum/templates/view.html b/forum/templates/view.html
index cb59caa..e3d0847 100644
--- a/forum/templates/view.html
+++ b/forum/templates/view.html
@@ -45,7 +45,7 @@
                         <ul class="list-group">
                             {% for thread in threads %}
                                 <a href="{% url 'forum' thread.id %}"
-                                   class="list-group-item list-group-item-action">{{ thread.topic }}</a>
+                                   class="list-group-item list-group-item-action">{{ thread.name }}</a>
                             {% endfor %}
                         </ul>
                     </div>
diff --git a/forum/views.py b/forum/views.py
index 2f641ea..2efc1e6 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -24,8 +24,8 @@ def view(request, thread=None):
         posts = Post.objects.filter(resolved=False).order_by('-created')[:10]
     else:
         threads = None
-        thread_name = Thread.objects.get(id=thread).topic
-        posts = Post.objects.filter(topic=thread).order_by('-created')
+        thread_name = Thread.objects.get(id=thread).name
+        posts = Post.objects.filter(thread=thread).order_by('-created')
     return render(request, 'view.html', {'threads': threads, 'posts': posts, 'myPosts': my_posts, 'thread': thread_name, 'form': form})
 
 
diff --git a/newsletters/admin.py b/newsletters/admin.py
index 32c4690..bc6d89e 100644
--- a/newsletters/admin.py
+++ b/newsletters/admin.py
@@ -5,7 +5,11 @@ from OACPL import settings
 from .models import Newsletter, Subscriber
 
 
-admin.site.register(Subscriber)
+@admin.register(Subscriber)
+class SubscriberAdmin(admin.ModelAdmin):
+    list_display = ['email', 'date']
+    list_filter = ['date']
+    search_fields = ['email']
 
 
 @admin.register(Newsletter)
diff --git a/newsletters/models.py b/newsletters/models.py
index b893411..89ce54a 100644
--- a/newsletters/models.py
+++ b/newsletters/models.py
@@ -19,6 +19,7 @@ class Newsletter(models.Model):
 
 class Subscriber(models.Model):
     email = models.EmailField(unique=True)
+    date = models.DateField(auto_now_add=True)
 
     def __str__(self):
         return self.email