diff --git a/dailystone/admin.py b/dailystone/admin.py
index 9dba50a..33cd6af 100644
--- a/dailystone/admin.py
+++ b/dailystone/admin.py
@@ -5,7 +5,25 @@ from .models import Mineral
 
 @admin.register(Mineral)
 class MineralAdmin(admin.ModelAdmin):
-    list_display = ('name', 'formula', 'day_of_year', 'color_hex')
+    list_display = ('name', 'formula', 'day_of_year', 'color_hex', 'category')
     list_filter = ('category', 'crystal_system')
     search_fields = ('name', 'formula')
-    readonly_fields = ('image_urls',)
+    list_editable = ('day_of_year', 'color_hex')
+    fieldsets = (
+        (None, {
+            'fields': ('name', 'formula', 'day_of_year'),
+        }),
+        ('Appearance', {
+            'fields': ('color_hex', 'color_description', 'image_urls'),
+        }),
+        ('Properties', {
+            'fields': ('category', 'crystal_system', 'mohs_hardness',
+                       'luster', 'streak', 'specific_gravity'),
+        }),
+        ('Text', {
+            'fields': ('description', 'history'),
+        }),
+        ('Links', {
+            'fields': ('wikipedia_url',),
+        }),
+    )