diff --git a/equipment/admin.py b/equipment/admin.py
index 4de9ca8..9080d77 100644
--- a/equipment/admin.py
+++ b/equipment/admin.py
@@ -76,6 +76,8 @@ class EquipmentAttributeAdmin(admin.ModelAdmin):
 
 
 class EquipmentAdmin(admin.ModelAdmin):
+    save_as_continue = True
+    save_on_top = True
     readonly_fields = ['full_category_p',
                         'added_at',
                         'modified_at',
@@ -115,6 +117,7 @@ class EquipmentAdmin(admin.ModelAdmin):
                EquipmentLostExtraInline,
                EquipmentRevisionExtraInline]
     search_fields = ['name', 'description',]
+    list_filter = ['owner', 'category' ]
 
 
 admin_site.register(Equipment, EquipmentAdmin)