diff --git a/rollyourown/seo/admin.py b/rollyourown/seo/admin.py
index 2cdddf4..4229b14 100644
--- a/rollyourown/seo/admin.py
+++ b/rollyourown/seo/admin.py
@@ -62,15 +62,35 @@ def register_seo_admin(admin_site, metadata_class):
 
     class ModelAdmin(model_admin):
         form = get_model_form(metadata_class)
+        if metadata_class._meta.groups:
+            fieldsets = tuple([(None,
+                {'fields':tuple(['_content_type',]+core_choice_fields(metadata_class))}),] \
+                    + [(k, {'classes': ('collapse',), 'fields': v}) \
+                    for k, v in metadata_class._meta.groups.iteritems()])
 
     class ViewAdmin(view_admin):
         form = get_view_form(metadata_class)
+        if metadata_class._meta.groups:
+            fieldsets = tuple( [(None,
+                {'fields':tuple(['_view',]+core_choice_fields(metadata_class))}),] \
+                    +[(k, {'classes': ('collapse',), 'fields': v}) \
+                    for k, v in metadata_class._meta.groups.iteritems()])
+
 
     class PathAdmin(path_admin):
         form = get_path_form(metadata_class)
+        if metadata_class._meta.groups:
+            fieldsets = tuple([(None,
+                {'fields':tuple(['_path',]+core_choice_fields(metadata_class))})] \
+                    +[(k, {'classes': ('collapse',), 'fields': v}) \
+                    for k, v in metadata_class._meta.groups.iteritems()])
 
     class ModelInstanceAdmin(model_instance_admin):
-        pass
+        if metadata_class._meta.groups:
+            fieldsets = tuple([(None,
+                {'fields':tuple(core_choice_fields(metadata_class))})] \
+                    +[(k, {'classes': ('collapse',), 'fields': v}) \
+                    for k, v in metadata_class._meta.groups.iteritems()])
 
     _register_admin(admin_site, metadata_class._meta.get_model('path'), PathAdmin)
     _register_admin(admin_site, metadata_class._meta.get_model('modelinstance'), ModelInstanceAdmin)