diff --git a/event/admin.py b/event/admin.py
index 867003e..0902645 100644
--- a/event/admin.py
+++ b/event/admin.py
@@ -27,20 +27,59 @@ class ActivityTagAdmin(admin.ModelAdmin):
     list_filter = ['event', 'is_public', ]
 
 
-class AbstractActivityTemplateAdmin(admin.ModelAdmin):
-    list_display = ['title', 'event', 'is_public', ]
-    ordering = ['title', 'event', 'has_perm', ]
+class ActivityTemplateAdmin(admin.ModelAdmin):
+    list_display = ['name', 'title', 'event', 'is_public', ]
+    ordering = ['name', 'title', 'event', 'has_perm', ]
+    search_fields = ['name', 'title', 'description', 'remark', ]
+    list_filter = ['event', 'is_public', 'has_perm', 'tags', ]
+    filter_horizontal = ['tags', 'places', ]
+    fieldsets = (
+            ('Identifiant', {
+                'fields': ('name', ),
+                }),
+            ('Général', {
+                'fields': ('event', 'title', 'is_public', 'places', ),
+                'description': "Tous ces champs sont héritables (Sauf Évènement)",
+                }),
+            ('Permanences', {
+                'fields': ('has_perm', ('min_perm', 'max_perm', ), ),
+                'classes': ('collapse',),
+                'description': "Tous ces champs sont héritables",
+                }),
+            ('Descriptions', {
+                'fields': ('description', 'tags', 'remarks', ),
+                'classes': ('collapse',),
+                'description': "Tous ces champs sont héritables",
+                }),
+            )
+
+
+class ActivityAdmin(admin.ModelAdmin):
+    list_display = ['title', 'event', 'is_public', 'parent', ]
+    ordering = ['title', 'event', 'has_perm', 'parent', ]
     search_fields = ['title', 'description', 'remark', ]
     list_filter = ['event', 'is_public', 'has_perm', 'tags', ]
-
-
-class ActivityTemplateAdmin(AbstractActivityTemplateAdmin):
-    pass
-
-
-class ActivityAdmin(AbstractActivityTemplateAdmin):
-    pass
-    #exclude = ['parent', ]  # TODO remove me
+    filter_horizontal = ['tags', 'places', ]
+    fieldsets = (
+            ('Général', {
+                'fields': ('event', 'parent', 'title', 'is_public', 'places', ),
+                'description': "Tous ces champs sont héritables (sauf parent et Évènement)",
+                }),
+            ('Champs non-héritables', {
+                'fields': ('parent', ),
+                'description': "Tous ces champs doivent être spécifiés",
+                }),
+            ('Permanences', {
+                'fields': ('has_perm', ('min_perm', 'max_perm', ), ),
+                'classes': ('collapse',),
+                'description': "Tous ces champs sont héritables (sauf les gens en perm)",
+                }),
+            ('Descriptions', {
+                'fields': ('description', 'tags', 'remarks', 'staff', ),
+                'classes': ('collapse',),
+                'description': "Tous ces champs sont héritables",
+                }),
+            )
 
 
 admin_site.register(Event, EventAdmin)