diff --git a/src/servala/core/admin.py b/src/servala/core/admin.py
index 29ddb2f..b686e2f 100644
--- a/src/servala/core/admin.py
+++ b/src/servala/core/admin.py
@@ -92,13 +92,43 @@ class OrganizationOriginAdmin(admin.ModelAdmin):
     list_display = (
         "name",
         "billing_entity",
+        "invoice_grouping",
         "default_odoo_sale_order_id",
         "hide_billing_address",
     )
-    list_filter = ("hide_billing_address",)
+    list_filter = ("hide_billing_address", "invoice_grouping")
     search_fields = ("name",)
     autocomplete_fields = ("billing_entity",)
     filter_horizontal = ("limit_cloudproviders",)
+    fieldsets = (
+        (
+            None,
+            {
+                "fields": (
+                    "name",
+                    "description",
+                )
+            },
+        ),
+        (
+            _("Billing"),
+            {
+                "fields": (
+                    "billing_entity",
+                    "default_odoo_sale_order_id",
+                    "invoice_grouping",
+                    "hide_billing_address",
+                    "billing_message",
+                )
+            },
+        ),
+        (
+            _("Restrictions"),
+            {
+                "fields": ("limit_cloudproviders",),
+            },
+        ),
+    )
 
 
 @admin.register(OrganizationMembership)