diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap
index fd8a7ab27a..a1798213c0 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+// Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`getStandardObjectMetadataRelatedEntityIds should return standard object metadata related entity ids 1`] = `
 {
@@ -163,7 +163,7 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
           "general": {
             "id": "00000000-0000-0000-0000-000000000050",
           },
-          "other": {
+          "system": {
             "id": "00000000-0000-0000-0000-000000000051",
           },
         },
@@ -278,7 +278,7 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
           "general": {
             "id": "00000000-0000-0000-0000-000000000113",
           },
-          "other": {
+          "system": {
             "id": "00000000-0000-0000-0000-000000000114",
           },
         },
@@ -372,7 +372,7 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
           "general": {
             "id": "00000000-0000-0000-0000-000000000076",
           },
-          "other": {
+          "system": {
             "id": "00000000-0000-0000-0000-000000000077",
           },
         },
@@ -588,7 +588,7 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
           "general": {
             "id": "00000000-0000-0000-0000-000000000150",
           },
-          "other": {
+          "system": {
             "id": "00000000-0000-0000-0000-000000000151",
           },
         },
@@ -700,7 +700,7 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
         "id": "00000000-0000-0000-0000-000000000195",
       },
     },
-    "id": "00000000-0000-0000-0000-000000000242",
+    "id": "00000000-0000-0000-0000-000000000243",
     "views": {
       "allCompanies": {
         "id": "00000000-0000-0000-0000-000000000218",
@@ -734,16 +734,19 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
         "viewGroups": {},
       },
       "companyRecordPageFields": {
-        "id": "00000000-0000-0000-0000-000000000241",
+        "id": "00000000-0000-0000-0000-000000000242",
         "viewFieldGroups": {
-          "additional": {
+          "business": {
             "id": "00000000-0000-0000-0000-000000000239",
           },
+          "contact": {
+            "id": "00000000-0000-0000-0000-000000000240",
+          },
           "general": {
             "id": "00000000-0000-0000-0000-000000000238",
           },
-          "other": {
-            "id": "00000000-0000-0000-0000-000000000240",
+          "system": {
+            "id": "00000000-0000-0000-0000-000000000241",
           },
         },
         "viewFields": {
@@ -812,118 +815,118 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
   "connectedAccount": {
     "fields": {
       "accessToken": {
-        "id": "00000000-0000-0000-0000-000000000249",
-      },
-      "accountOwner": {
-        "id": "00000000-0000-0000-0000-000000000251",
-      },
-      "authFailedAt": {
-        "id": "00000000-0000-0000-0000-000000000253",
-      },
-      "calendarChannels": {
-        "id": "00000000-0000-0000-0000-000000000256",
-      },
-      "connectionParameters": {
-        "id": "00000000-0000-0000-0000-000000000259",
-      },
-      "createdAt": {
-        "id": "00000000-0000-0000-0000-000000000244",
-      },
-      "createdBy": {
-        "id": "00000000-0000-0000-0000-000000000260",
-      },
-      "deletedAt": {
-        "id": "00000000-0000-0000-0000-000000000246",
-      },
-      "handle": {
-        "id": "00000000-0000-0000-0000-000000000247",
-      },
-      "handleAliases": {
-        "id": "00000000-0000-0000-0000-000000000257",
-      },
-      "id": {
-        "id": "00000000-0000-0000-0000-000000000243",
-      },
-      "lastCredentialsRefreshedAt": {
-        "id": "00000000-0000-0000-0000-000000000254",
-      },
-      "lastSyncHistoryId": {
-        "id": "00000000-0000-0000-0000-000000000252",
-      },
-      "messageChannels": {
-        "id": "00000000-0000-0000-0000-000000000255",
-      },
-      "position": {
-        "id": "00000000-0000-0000-0000-000000000262",
-      },
-      "provider": {
-        "id": "00000000-0000-0000-0000-000000000248",
-      },
-      "refreshToken": {
         "id": "00000000-0000-0000-0000-000000000250",
       },
-      "scopes": {
-        "id": "00000000-0000-0000-0000-000000000258",
+      "accountOwner": {
+        "id": "00000000-0000-0000-0000-000000000252",
       },
-      "searchVector": {
-        "id": "00000000-0000-0000-0000-000000000263",
+      "authFailedAt": {
+        "id": "00000000-0000-0000-0000-000000000254",
       },
-      "updatedAt": {
+      "calendarChannels": {
+        "id": "00000000-0000-0000-0000-000000000257",
+      },
+      "connectionParameters": {
+        "id": "00000000-0000-0000-0000-000000000260",
+      },
+      "createdAt": {
         "id": "00000000-0000-0000-0000-000000000245",
       },
-      "updatedBy": {
+      "createdBy": {
         "id": "00000000-0000-0000-0000-000000000261",
       },
+      "deletedAt": {
+        "id": "00000000-0000-0000-0000-000000000247",
+      },
+      "handle": {
+        "id": "00000000-0000-0000-0000-000000000248",
+      },
+      "handleAliases": {
+        "id": "00000000-0000-0000-0000-000000000258",
+      },
+      "id": {
+        "id": "00000000-0000-0000-0000-000000000244",
+      },
+      "lastCredentialsRefreshedAt": {
+        "id": "00000000-0000-0000-0000-000000000255",
+      },
+      "lastSyncHistoryId": {
+        "id": "00000000-0000-0000-0000-000000000253",
+      },
+      "messageChannels": {
+        "id": "00000000-0000-0000-0000-000000000256",
+      },
+      "position": {
+        "id": "00000000-0000-0000-0000-000000000263",
+      },
+      "provider": {
+        "id": "00000000-0000-0000-0000-000000000249",
+      },
+      "refreshToken": {
+        "id": "00000000-0000-0000-0000-000000000251",
+      },
+      "scopes": {
+        "id": "00000000-0000-0000-0000-000000000259",
+      },
+      "searchVector": {
+        "id": "00000000-0000-0000-0000-000000000264",
+      },
+      "updatedAt": {
+        "id": "00000000-0000-0000-0000-000000000246",
+      },
+      "updatedBy": {
+        "id": "00000000-0000-0000-0000-000000000262",
+      },
     },
-    "id": "00000000-0000-0000-0000-000000000278",
+    "id": "00000000-0000-0000-0000-000000000279",
     "views": {
       "allConnectedAccounts": {
-        "id": "00000000-0000-0000-0000-000000000269",
+        "id": "00000000-0000-0000-0000-000000000270",
         "viewFieldGroups": {},
         "viewFields": {
           "accountOwner": {
-            "id": "00000000-0000-0000-0000-000000000266",
-          },
-          "authFailedAt": {
             "id": "00000000-0000-0000-0000-000000000267",
           },
-          "createdAt": {
+          "authFailedAt": {
             "id": "00000000-0000-0000-0000-000000000268",
           },
+          "createdAt": {
+            "id": "00000000-0000-0000-0000-000000000269",
+          },
           "handle": {
-            "id": "00000000-0000-0000-0000-000000000264",
+            "id": "00000000-0000-0000-0000-000000000265",
           },
           "provider": {
-            "id": "00000000-0000-0000-0000-000000000265",
+            "id": "00000000-0000-0000-0000-000000000266",
           },
         },
         "viewGroups": {},
       },
       "connectedAccountRecordPageFields": {
-        "id": "00000000-0000-0000-0000-000000000277",
+        "id": "00000000-0000-0000-0000-000000000278",
         "viewFieldGroups": {
           "general": {
-            "id": "00000000-0000-0000-0000-000000000275",
-          },
-          "other": {
             "id": "00000000-0000-0000-0000-000000000276",
           },
+          "system": {
+            "id": "00000000-0000-0000-0000-000000000277",
+          },
         },
         "viewFields": {
           "accountOwner": {
-            "id": "00000000-0000-0000-0000-000000000271",
-          },
-          "authFailedAt": {
             "id": "00000000-0000-0000-0000-000000000272",
           },
-          "createdAt": {
+          "authFailedAt": {
             "id": "00000000-0000-0000-0000-000000000273",
           },
-          "createdBy": {
+          "createdAt": {
             "id": "00000000-0000-0000-0000-000000000274",
           },
+          "createdBy": {
+            "id": "00000000-0000-0000-0000-000000000275",
+          },
           "provider": {
-            "id": "00000000-0000-0000-0000-000000000270",
+            "id": "00000000-0000-0000-0000-000000000271",
           },
         },
         "viewGroups": {},
@@ -933,62 +936,62 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
   "dashboard": {
     "fields": {
       "attachments": {
-        "id": "00000000-0000-0000-0000-000000000290",
-      },
-      "createdAt": {
-        "id": "00000000-0000-0000-0000-000000000280",
-      },
-      "createdBy": {
-        "id": "00000000-0000-0000-0000-000000000286",
-      },
-      "deletedAt": {
-        "id": "00000000-0000-0000-0000-000000000282",
-      },
-      "favorites": {
-        "id": "00000000-0000-0000-0000-000000000289",
-      },
-      "id": {
-        "id": "00000000-0000-0000-0000-000000000279",
-      },
-      "pageLayoutId": {
-        "id": "00000000-0000-0000-0000-000000000285",
-      },
-      "position": {
-        "id": "00000000-0000-0000-0000-000000000284",
-      },
-      "searchVector": {
         "id": "00000000-0000-0000-0000-000000000291",
       },
-      "timelineActivities": {
-        "id": "00000000-0000-0000-0000-000000000288",
-      },
-      "title": {
-        "id": "00000000-0000-0000-0000-000000000283",
-      },
-      "updatedAt": {
+      "createdAt": {
         "id": "00000000-0000-0000-0000-000000000281",
       },
-      "updatedBy": {
+      "createdBy": {
         "id": "00000000-0000-0000-0000-000000000287",
       },
+      "deletedAt": {
+        "id": "00000000-0000-0000-0000-000000000283",
+      },
+      "favorites": {
+        "id": "00000000-0000-0000-0000-000000000290",
+      },
+      "id": {
+        "id": "00000000-0000-0000-0000-000000000280",
+      },
+      "pageLayoutId": {
+        "id": "00000000-0000-0000-0000-000000000286",
+      },
+      "position": {
+        "id": "00000000-0000-0000-0000-000000000285",
+      },
+      "searchVector": {
+        "id": "00000000-0000-0000-0000-000000000292",
+      },
+      "timelineActivities": {
+        "id": "00000000-0000-0000-0000-000000000289",
+      },
+      "title": {
+        "id": "00000000-0000-0000-0000-000000000284",
+      },
+      "updatedAt": {
+        "id": "00000000-0000-0000-0000-000000000282",
+      },
+      "updatedBy": {
+        "id": "00000000-0000-0000-0000-000000000288",
+      },
     },
-    "id": "00000000-0000-0000-0000-000000000297",
+    "id": "00000000-0000-0000-0000-000000000298",
     "views": {
       "allDashboards": {
-        "id": "00000000-0000-0000-0000-000000000296",
+        "id": "00000000-0000-0000-0000-000000000297",
         "viewFieldGroups": {},
         "viewFields": {
           "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000294",
+            "id": "00000000-0000-0000-0000-000000000295",
           },
           "createdBy": {
-            "id": "00000000-0000-0000-0000-000000000293",
+            "id": "00000000-0000-0000-0000-000000000294",
           },
           "title": {
-            "id": "00000000-0000-0000-0000-000000000292",
+            "id": "00000000-0000-0000-0000-000000000293",
           },
           "updatedAt": {
-            "id": "00000000-0000-0000-0000-000000000295",
+            "id": "00000000-0000-0000-0000-000000000296",
           },
         },
         "viewGroups": {},
@@ -998,143 +1001,143 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
   "favorite": {
     "fields": {
       "company": {
-        "id": "00000000-0000-0000-0000-000000000305",
-      },
-      "createdAt": {
-        "id": "00000000-0000-0000-0000-000000000299",
-      },
-      "createdBy": {
-        "id": "00000000-0000-0000-0000-000000000315",
-      },
-      "dashboard": {
-        "id": "00000000-0000-0000-0000-000000000314",
-      },
-      "deletedAt": {
-        "id": "00000000-0000-0000-0000-000000000301",
-      },
-      "favoriteFolder": {
-        "id": "00000000-0000-0000-0000-000000000313",
-      },
-      "forWorkspaceMember": {
-        "id": "00000000-0000-0000-0000-000000000303",
-      },
-      "id": {
-        "id": "00000000-0000-0000-0000-000000000298",
-      },
-      "note": {
-        "id": "00000000-0000-0000-0000-000000000311",
-      },
-      "opportunity": {
         "id": "00000000-0000-0000-0000-000000000306",
       },
-      "person": {
-        "id": "00000000-0000-0000-0000-000000000304",
-      },
-      "position": {
-        "id": "00000000-0000-0000-0000-000000000302",
-      },
-      "searchVector": {
-        "id": "00000000-0000-0000-0000-000000000317",
-      },
-      "task": {
-        "id": "00000000-0000-0000-0000-000000000310",
-      },
-      "updatedAt": {
+      "createdAt": {
         "id": "00000000-0000-0000-0000-000000000300",
       },
-      "updatedBy": {
+      "createdBy": {
         "id": "00000000-0000-0000-0000-000000000316",
       },
-      "viewId": {
+      "dashboard": {
+        "id": "00000000-0000-0000-0000-000000000315",
+      },
+      "deletedAt": {
+        "id": "00000000-0000-0000-0000-000000000302",
+      },
+      "favoriteFolder": {
+        "id": "00000000-0000-0000-0000-000000000314",
+      },
+      "forWorkspaceMember": {
+        "id": "00000000-0000-0000-0000-000000000304",
+      },
+      "id": {
+        "id": "00000000-0000-0000-0000-000000000299",
+      },
+      "note": {
         "id": "00000000-0000-0000-0000-000000000312",
       },
-      "workflow": {
+      "opportunity": {
         "id": "00000000-0000-0000-0000-000000000307",
       },
-      "workflowRun": {
-        "id": "00000000-0000-0000-0000-000000000309",
+      "person": {
+        "id": "00000000-0000-0000-0000-000000000305",
       },
-      "workflowVersion": {
+      "position": {
+        "id": "00000000-0000-0000-0000-000000000303",
+      },
+      "searchVector": {
+        "id": "00000000-0000-0000-0000-000000000318",
+      },
+      "task": {
+        "id": "00000000-0000-0000-0000-000000000311",
+      },
+      "updatedAt": {
+        "id": "00000000-0000-0000-0000-000000000301",
+      },
+      "updatedBy": {
+        "id": "00000000-0000-0000-0000-000000000317",
+      },
+      "viewId": {
+        "id": "00000000-0000-0000-0000-000000000313",
+      },
+      "workflow": {
         "id": "00000000-0000-0000-0000-000000000308",
       },
+      "workflowRun": {
+        "id": "00000000-0000-0000-0000-000000000310",
+      },
+      "workflowVersion": {
+        "id": "00000000-0000-0000-0000-000000000309",
+      },
     },
-    "id": "00000000-0000-0000-0000-000000000341",
+    "id": "00000000-0000-0000-0000-000000000342",
     "views": {
       "allFavorites": {
-        "id": "00000000-0000-0000-0000-000000000327",
+        "id": "00000000-0000-0000-0000-000000000328",
         "viewFieldGroups": {},
         "viewFields": {
           "company": {
-            "id": "00000000-0000-0000-0000-000000000320",
-          },
-          "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000326",
-          },
-          "dashboard": {
-            "id": "00000000-0000-0000-0000-000000000324",
-          },
-          "favoriteFolder": {
-            "id": "00000000-0000-0000-0000-000000000325",
-          },
-          "forWorkspaceMember": {
-            "id": "00000000-0000-0000-0000-000000000318",
-          },
-          "note": {
-            "id": "00000000-0000-0000-0000-000000000323",
-          },
-          "opportunity": {
             "id": "00000000-0000-0000-0000-000000000321",
           },
-          "person": {
+          "createdAt": {
+            "id": "00000000-0000-0000-0000-000000000327",
+          },
+          "dashboard": {
+            "id": "00000000-0000-0000-0000-000000000325",
+          },
+          "favoriteFolder": {
+            "id": "00000000-0000-0000-0000-000000000326",
+          },
+          "forWorkspaceMember": {
             "id": "00000000-0000-0000-0000-000000000319",
           },
-          "task": {
+          "note": {
+            "id": "00000000-0000-0000-0000-000000000324",
+          },
+          "opportunity": {
             "id": "00000000-0000-0000-0000-000000000322",
           },
+          "person": {
+            "id": "00000000-0000-0000-0000-000000000320",
+          },
+          "task": {
+            "id": "00000000-0000-0000-0000-000000000323",
+          },
         },
         "viewGroups": {},
       },
       "favoriteRecordPageFields": {
-        "id": "00000000-0000-0000-0000-000000000340",
+        "id": "00000000-0000-0000-0000-000000000341",
         "viewFieldGroups": {
           "general": {
-            "id": "00000000-0000-0000-0000-000000000338",
-          },
-          "other": {
             "id": "00000000-0000-0000-0000-000000000339",
           },
+          "system": {
+            "id": "00000000-0000-0000-0000-000000000340",
+          },
         },
         "viewFields": {
           "company": {
-            "id": "00000000-0000-0000-0000-000000000330",
-          },
-          "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000336",
-          },
-          "createdBy": {
-            "id": "00000000-0000-0000-0000-000000000337",
-          },
-          "dashboard": {
-            "id": "00000000-0000-0000-0000-000000000334",
-          },
-          "favoriteFolder": {
-            "id": "00000000-0000-0000-0000-000000000335",
-          },
-          "forWorkspaceMember": {
-            "id": "00000000-0000-0000-0000-000000000328",
-          },
-          "note": {
-            "id": "00000000-0000-0000-0000-000000000333",
-          },
-          "opportunity": {
             "id": "00000000-0000-0000-0000-000000000331",
           },
-          "person": {
+          "createdAt": {
+            "id": "00000000-0000-0000-0000-000000000337",
+          },
+          "createdBy": {
+            "id": "00000000-0000-0000-0000-000000000338",
+          },
+          "dashboard": {
+            "id": "00000000-0000-0000-0000-000000000335",
+          },
+          "favoriteFolder": {
+            "id": "00000000-0000-0000-0000-000000000336",
+          },
+          "forWorkspaceMember": {
             "id": "00000000-0000-0000-0000-000000000329",
           },
-          "task": {
+          "note": {
+            "id": "00000000-0000-0000-0000-000000000334",
+          },
+          "opportunity": {
             "id": "00000000-0000-0000-0000-000000000332",
           },
+          "person": {
+            "id": "00000000-0000-0000-0000-000000000330",
+          },
+          "task": {
+            "id": "00000000-0000-0000-0000-000000000333",
+          },
         },
         "viewGroups": {},
       },
@@ -1143,67 +1146,67 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
   "favoriteFolder": {
     "fields": {
       "createdAt": {
-        "id": "00000000-0000-0000-0000-000000000343",
-      },
-      "createdBy": {
-        "id": "00000000-0000-0000-0000-000000000349",
-      },
-      "deletedAt": {
-        "id": "00000000-0000-0000-0000-000000000345",
-      },
-      "favorites": {
-        "id": "00000000-0000-0000-0000-000000000348",
-      },
-      "id": {
-        "id": "00000000-0000-0000-0000-000000000342",
-      },
-      "name": {
-        "id": "00000000-0000-0000-0000-000000000347",
-      },
-      "position": {
-        "id": "00000000-0000-0000-0000-000000000346",
-      },
-      "searchVector": {
-        "id": "00000000-0000-0000-0000-000000000351",
-      },
-      "updatedAt": {
         "id": "00000000-0000-0000-0000-000000000344",
       },
-      "updatedBy": {
+      "createdBy": {
         "id": "00000000-0000-0000-0000-000000000350",
       },
+      "deletedAt": {
+        "id": "00000000-0000-0000-0000-000000000346",
+      },
+      "favorites": {
+        "id": "00000000-0000-0000-0000-000000000349",
+      },
+      "id": {
+        "id": "00000000-0000-0000-0000-000000000343",
+      },
+      "name": {
+        "id": "00000000-0000-0000-0000-000000000348",
+      },
+      "position": {
+        "id": "00000000-0000-0000-0000-000000000347",
+      },
+      "searchVector": {
+        "id": "00000000-0000-0000-0000-000000000352",
+      },
+      "updatedAt": {
+        "id": "00000000-0000-0000-0000-000000000345",
+      },
+      "updatedBy": {
+        "id": "00000000-0000-0000-0000-000000000351",
+      },
     },
-    "id": "00000000-0000-0000-0000-000000000360",
+    "id": "00000000-0000-0000-0000-000000000361",
     "views": {
       "allFavoriteFolders": {
-        "id": "00000000-0000-0000-0000-000000000354",
+        "id": "00000000-0000-0000-0000-000000000355",
         "viewFieldGroups": {},
         "viewFields": {
           "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000353",
+            "id": "00000000-0000-0000-0000-000000000354",
           },
           "name": {
-            "id": "00000000-0000-0000-0000-000000000352",
+            "id": "00000000-0000-0000-0000-000000000353",
           },
         },
         "viewGroups": {},
       },
       "favoriteFolderRecordPageFields": {
-        "id": "00000000-0000-0000-0000-000000000359",
+        "id": "00000000-0000-0000-0000-000000000360",
         "viewFieldGroups": {
           "general": {
-            "id": "00000000-0000-0000-0000-000000000357",
-          },
-          "other": {
             "id": "00000000-0000-0000-0000-000000000358",
           },
+          "system": {
+            "id": "00000000-0000-0000-0000-000000000359",
+          },
         },
         "viewFields": {
           "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000355",
+            "id": "00000000-0000-0000-0000-000000000356",
           },
           "createdBy": {
-            "id": "00000000-0000-0000-0000-000000000356",
+            "id": "00000000-0000-0000-0000-000000000357",
           },
         },
         "viewGroups": {},
@@ -1213,80 +1216,80 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
   "message": {
     "fields": {
       "createdAt": {
-        "id": "00000000-0000-0000-0000-000000000541",
-      },
-      "createdBy": {
-        "id": "00000000-0000-0000-0000-000000000552",
-      },
-      "deletedAt": {
-        "id": "00000000-0000-0000-0000-000000000543",
-      },
-      "direction": {
-        "id": "00000000-0000-0000-0000-000000000546",
-      },
-      "headerMessageId": {
-        "id": "00000000-0000-0000-0000-000000000544",
-      },
-      "id": {
-        "id": "00000000-0000-0000-0000-000000000540",
-      },
-      "messageChannelMessageAssociations": {
-        "id": "00000000-0000-0000-0000-000000000551",
-      },
-      "messageParticipants": {
-        "id": "00000000-0000-0000-0000-000000000550",
-      },
-      "messageThread": {
-        "id": "00000000-0000-0000-0000-000000000545",
-      },
-      "position": {
-        "id": "00000000-0000-0000-0000-000000000554",
-      },
-      "receivedAt": {
-        "id": "00000000-0000-0000-0000-000000000549",
-      },
-      "searchVector": {
-        "id": "00000000-0000-0000-0000-000000000555",
-      },
-      "subject": {
-        "id": "00000000-0000-0000-0000-000000000547",
-      },
-      "text": {
-        "id": "00000000-0000-0000-0000-000000000548",
-      },
-      "updatedAt": {
         "id": "00000000-0000-0000-0000-000000000542",
       },
-      "updatedBy": {
+      "createdBy": {
         "id": "00000000-0000-0000-0000-000000000553",
       },
+      "deletedAt": {
+        "id": "00000000-0000-0000-0000-000000000544",
+      },
+      "direction": {
+        "id": "00000000-0000-0000-0000-000000000547",
+      },
+      "headerMessageId": {
+        "id": "00000000-0000-0000-0000-000000000545",
+      },
+      "id": {
+        "id": "00000000-0000-0000-0000-000000000541",
+      },
+      "messageChannelMessageAssociations": {
+        "id": "00000000-0000-0000-0000-000000000552",
+      },
+      "messageParticipants": {
+        "id": "00000000-0000-0000-0000-000000000551",
+      },
+      "messageThread": {
+        "id": "00000000-0000-0000-0000-000000000546",
+      },
+      "position": {
+        "id": "00000000-0000-0000-0000-000000000555",
+      },
+      "receivedAt": {
+        "id": "00000000-0000-0000-0000-000000000550",
+      },
+      "searchVector": {
+        "id": "00000000-0000-0000-0000-000000000556",
+      },
+      "subject": {
+        "id": "00000000-0000-0000-0000-000000000548",
+      },
+      "text": {
+        "id": "00000000-0000-0000-0000-000000000549",
+      },
+      "updatedAt": {
+        "id": "00000000-0000-0000-0000-000000000543",
+      },
+      "updatedBy": {
+        "id": "00000000-0000-0000-0000-000000000554",
+      },
     },
-    "id": "00000000-0000-0000-0000-000000000564",
+    "id": "00000000-0000-0000-0000-000000000565",
     "views": {
       "allMessages": {
-        "id": "00000000-0000-0000-0000-000000000563",
+        "id": "00000000-0000-0000-0000-000000000564",
         "viewFieldGroups": {},
         "viewFields": {
           "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000562",
+            "id": "00000000-0000-0000-0000-000000000563",
           },
           "headerMessageId": {
-            "id": "00000000-0000-0000-0000-000000000560",
+            "id": "00000000-0000-0000-0000-000000000561",
           },
           "messageParticipants": {
-            "id": "00000000-0000-0000-0000-000000000558",
-          },
-          "messageThread": {
-            "id": "00000000-0000-0000-0000-000000000557",
-          },
-          "receivedAt": {
             "id": "00000000-0000-0000-0000-000000000559",
           },
+          "messageThread": {
+            "id": "00000000-0000-0000-0000-000000000558",
+          },
+          "receivedAt": {
+            "id": "00000000-0000-0000-0000-000000000560",
+          },
           "subject": {
-            "id": "00000000-0000-0000-0000-000000000556",
+            "id": "00000000-0000-0000-0000-000000000557",
           },
           "text": {
-            "id": "00000000-0000-0000-0000-000000000561",
+            "id": "00000000-0000-0000-0000-000000000562",
           },
         },
         "viewGroups": {},
@@ -1296,146 +1299,146 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
   "messageChannel": {
     "fields": {
       "connectedAccount": {
-        "id": "00000000-0000-0000-0000-000000000420",
-      },
-      "contactAutoCreationPolicy": {
-        "id": "00000000-0000-0000-0000-000000000423",
-      },
-      "createdAt": {
-        "id": "00000000-0000-0000-0000-000000000415",
-      },
-      "createdBy": {
-        "id": "00000000-0000-0000-0000-000000000436",
-      },
-      "deletedAt": {
-        "id": "00000000-0000-0000-0000-000000000417",
-      },
-      "excludeGroupEmails": {
-        "id": "00000000-0000-0000-0000-000000000425",
-      },
-      "excludeNonProfessionalEmails": {
-        "id": "00000000-0000-0000-0000-000000000424",
-      },
-      "handle": {
-        "id": "00000000-0000-0000-0000-000000000419",
-      },
-      "id": {
-        "id": "00000000-0000-0000-0000-000000000414",
-      },
-      "isContactAutoCreationEnabled": {
-        "id": "00000000-0000-0000-0000-000000000422",
-      },
-      "isSyncEnabled": {
-        "id": "00000000-0000-0000-0000-000000000428",
-      },
-      "messageFolderImportPolicy": {
-        "id": "00000000-0000-0000-0000-000000000426",
-      },
-      "pendingGroupEmailsAction": {
-        "id": "00000000-0000-0000-0000-000000000427",
-      },
-      "position": {
-        "id": "00000000-0000-0000-0000-000000000438",
-      },
-      "searchVector": {
-        "id": "00000000-0000-0000-0000-000000000439",
-      },
-      "syncCursor": {
-        "id": "00000000-0000-0000-0000-000000000429",
-      },
-      "syncStage": {
-        "id": "00000000-0000-0000-0000-000000000432",
-      },
-      "syncStageStartedAt": {
-        "id": "00000000-0000-0000-0000-000000000433",
-      },
-      "syncStatus": {
-        "id": "00000000-0000-0000-0000-000000000431",
-      },
-      "syncedAt": {
-        "id": "00000000-0000-0000-0000-000000000430",
-      },
-      "throttleFailureCount": {
-        "id": "00000000-0000-0000-0000-000000000434",
-      },
-      "throttleRetryAfter": {
-        "id": "00000000-0000-0000-0000-000000000435",
-      },
-      "type": {
         "id": "00000000-0000-0000-0000-000000000421",
       },
-      "updatedAt": {
+      "contactAutoCreationPolicy": {
+        "id": "00000000-0000-0000-0000-000000000424",
+      },
+      "createdAt": {
         "id": "00000000-0000-0000-0000-000000000416",
       },
-      "updatedBy": {
+      "createdBy": {
         "id": "00000000-0000-0000-0000-000000000437",
       },
-      "visibility": {
+      "deletedAt": {
         "id": "00000000-0000-0000-0000-000000000418",
       },
+      "excludeGroupEmails": {
+        "id": "00000000-0000-0000-0000-000000000426",
+      },
+      "excludeNonProfessionalEmails": {
+        "id": "00000000-0000-0000-0000-000000000425",
+      },
+      "handle": {
+        "id": "00000000-0000-0000-0000-000000000420",
+      },
+      "id": {
+        "id": "00000000-0000-0000-0000-000000000415",
+      },
+      "isContactAutoCreationEnabled": {
+        "id": "00000000-0000-0000-0000-000000000423",
+      },
+      "isSyncEnabled": {
+        "id": "00000000-0000-0000-0000-000000000429",
+      },
+      "messageFolderImportPolicy": {
+        "id": "00000000-0000-0000-0000-000000000427",
+      },
+      "pendingGroupEmailsAction": {
+        "id": "00000000-0000-0000-0000-000000000428",
+      },
+      "position": {
+        "id": "00000000-0000-0000-0000-000000000439",
+      },
+      "searchVector": {
+        "id": "00000000-0000-0000-0000-000000000440",
+      },
+      "syncCursor": {
+        "id": "00000000-0000-0000-0000-000000000430",
+      },
+      "syncStage": {
+        "id": "00000000-0000-0000-0000-000000000433",
+      },
+      "syncStageStartedAt": {
+        "id": "00000000-0000-0000-0000-000000000434",
+      },
+      "syncStatus": {
+        "id": "00000000-0000-0000-0000-000000000432",
+      },
+      "syncedAt": {
+        "id": "00000000-0000-0000-0000-000000000431",
+      },
+      "throttleFailureCount": {
+        "id": "00000000-0000-0000-0000-000000000435",
+      },
+      "throttleRetryAfter": {
+        "id": "00000000-0000-0000-0000-000000000436",
+      },
+      "type": {
+        "id": "00000000-0000-0000-0000-000000000422",
+      },
+      "updatedAt": {
+        "id": "00000000-0000-0000-0000-000000000417",
+      },
+      "updatedBy": {
+        "id": "00000000-0000-0000-0000-000000000438",
+      },
+      "visibility": {
+        "id": "00000000-0000-0000-0000-000000000419",
+      },
     },
-    "id": "00000000-0000-0000-0000-000000000458",
+    "id": "00000000-0000-0000-0000-000000000459",
     "views": {
       "allMessageChannels": {
-        "id": "00000000-0000-0000-0000-000000000447",
+        "id": "00000000-0000-0000-0000-000000000448",
         "viewFieldGroups": {},
         "viewFields": {
           "connectedAccount": {
-            "id": "00000000-0000-0000-0000-000000000441",
-          },
-          "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000446",
-          },
-          "handle": {
-            "id": "00000000-0000-0000-0000-000000000440",
-          },
-          "isSyncEnabled": {
-            "id": "00000000-0000-0000-0000-000000000444",
-          },
-          "syncStatus": {
-            "id": "00000000-0000-0000-0000-000000000445",
-          },
-          "type": {
             "id": "00000000-0000-0000-0000-000000000442",
           },
-          "visibility": {
+          "createdAt": {
+            "id": "00000000-0000-0000-0000-000000000447",
+          },
+          "handle": {
+            "id": "00000000-0000-0000-0000-000000000441",
+          },
+          "isSyncEnabled": {
+            "id": "00000000-0000-0000-0000-000000000445",
+          },
+          "syncStatus": {
+            "id": "00000000-0000-0000-0000-000000000446",
+          },
+          "type": {
             "id": "00000000-0000-0000-0000-000000000443",
           },
+          "visibility": {
+            "id": "00000000-0000-0000-0000-000000000444",
+          },
         },
         "viewGroups": {},
       },
       "messageChannelRecordPageFields": {
-        "id": "00000000-0000-0000-0000-000000000457",
+        "id": "00000000-0000-0000-0000-000000000458",
         "viewFieldGroups": {
           "general": {
-            "id": "00000000-0000-0000-0000-000000000455",
-          },
-          "other": {
             "id": "00000000-0000-0000-0000-000000000456",
           },
+          "system": {
+            "id": "00000000-0000-0000-0000-000000000457",
+          },
         },
         "viewFields": {
           "connectedAccount": {
-            "id": "00000000-0000-0000-0000-000000000448",
-          },
-          "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000453",
-          },
-          "createdBy": {
-            "id": "00000000-0000-0000-0000-000000000454",
-          },
-          "isSyncEnabled": {
-            "id": "00000000-0000-0000-0000-000000000451",
-          },
-          "syncStatus": {
-            "id": "00000000-0000-0000-0000-000000000452",
-          },
-          "type": {
             "id": "00000000-0000-0000-0000-000000000449",
           },
-          "visibility": {
+          "createdAt": {
+            "id": "00000000-0000-0000-0000-000000000454",
+          },
+          "createdBy": {
+            "id": "00000000-0000-0000-0000-000000000455",
+          },
+          "isSyncEnabled": {
+            "id": "00000000-0000-0000-0000-000000000452",
+          },
+          "syncStatus": {
+            "id": "00000000-0000-0000-0000-000000000453",
+          },
+          "type": {
             "id": "00000000-0000-0000-0000-000000000450",
           },
+          "visibility": {
+            "id": "00000000-0000-0000-0000-000000000451",
+          },
         },
         "viewGroups": {},
       },
@@ -1444,103 +1447,103 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
   "messageChannelMessageAssociation": {
     "fields": {
       "createdAt": {
-        "id": "00000000-0000-0000-0000-000000000362",
-      },
-      "createdBy": {
-        "id": "00000000-0000-0000-0000-000000000371",
-      },
-      "deletedAt": {
-        "id": "00000000-0000-0000-0000-000000000364",
-      },
-      "direction": {
-        "id": "00000000-0000-0000-0000-000000000370",
-      },
-      "id": {
-        "id": "00000000-0000-0000-0000-000000000361",
-      },
-      "message": {
-        "id": "00000000-0000-0000-0000-000000000366",
-      },
-      "messageChannelId": {
-        "id": "00000000-0000-0000-0000-000000000365",
-      },
-      "messageExternalId": {
-        "id": "00000000-0000-0000-0000-000000000367",
-      },
-      "messageFolders": {
-        "id": "00000000-0000-0000-0000-000000000375",
-      },
-      "messageThread": {
-        "id": "00000000-0000-0000-0000-000000000368",
-      },
-      "messageThreadExternalId": {
-        "id": "00000000-0000-0000-0000-000000000369",
-      },
-      "position": {
-        "id": "00000000-0000-0000-0000-000000000373",
-      },
-      "searchVector": {
-        "id": "00000000-0000-0000-0000-000000000374",
-      },
-      "updatedAt": {
         "id": "00000000-0000-0000-0000-000000000363",
       },
-      "updatedBy": {
+      "createdBy": {
         "id": "00000000-0000-0000-0000-000000000372",
       },
+      "deletedAt": {
+        "id": "00000000-0000-0000-0000-000000000365",
+      },
+      "direction": {
+        "id": "00000000-0000-0000-0000-000000000371",
+      },
+      "id": {
+        "id": "00000000-0000-0000-0000-000000000362",
+      },
+      "message": {
+        "id": "00000000-0000-0000-0000-000000000367",
+      },
+      "messageChannelId": {
+        "id": "00000000-0000-0000-0000-000000000366",
+      },
+      "messageExternalId": {
+        "id": "00000000-0000-0000-0000-000000000368",
+      },
+      "messageFolders": {
+        "id": "00000000-0000-0000-0000-000000000376",
+      },
+      "messageThread": {
+        "id": "00000000-0000-0000-0000-000000000369",
+      },
+      "messageThreadExternalId": {
+        "id": "00000000-0000-0000-0000-000000000370",
+      },
+      "position": {
+        "id": "00000000-0000-0000-0000-000000000374",
+      },
+      "searchVector": {
+        "id": "00000000-0000-0000-0000-000000000375",
+      },
+      "updatedAt": {
+        "id": "00000000-0000-0000-0000-000000000364",
+      },
+      "updatedBy": {
+        "id": "00000000-0000-0000-0000-000000000373",
+      },
     },
-    "id": "00000000-0000-0000-0000-000000000391",
+    "id": "00000000-0000-0000-0000-000000000392",
     "views": {
       "allMessageChannelMessageAssociations": {
-        "id": "00000000-0000-0000-0000-000000000381",
+        "id": "00000000-0000-0000-0000-000000000382",
         "viewFieldGroups": {},
         "viewFields": {
           "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000380",
+            "id": "00000000-0000-0000-0000-000000000381",
           },
           "direction": {
-            "id": "00000000-0000-0000-0000-000000000379",
+            "id": "00000000-0000-0000-0000-000000000380",
           },
           "message": {
-            "id": "00000000-0000-0000-0000-000000000377",
+            "id": "00000000-0000-0000-0000-000000000378",
           },
           "messageChannelId": {
-            "id": "00000000-0000-0000-0000-000000000376",
+            "id": "00000000-0000-0000-0000-000000000377",
           },
           "messageExternalId": {
-            "id": "00000000-0000-0000-0000-000000000378",
+            "id": "00000000-0000-0000-0000-000000000379",
           },
         },
         "viewGroups": {},
       },
       "messageChannelMessageAssociationRecordPageFields": {
-        "id": "00000000-0000-0000-0000-000000000390",
+        "id": "00000000-0000-0000-0000-000000000391",
         "viewFieldGroups": {
           "general": {
-            "id": "00000000-0000-0000-0000-000000000388",
-          },
-          "other": {
             "id": "00000000-0000-0000-0000-000000000389",
           },
+          "system": {
+            "id": "00000000-0000-0000-0000-000000000390",
+          },
         },
         "viewFields": {
           "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000386",
-          },
-          "createdBy": {
             "id": "00000000-0000-0000-0000-000000000387",
           },
+          "createdBy": {
+            "id": "00000000-0000-0000-0000-000000000388",
+          },
           "direction": {
-            "id": "00000000-0000-0000-0000-000000000385",
+            "id": "00000000-0000-0000-0000-000000000386",
           },
           "message": {
-            "id": "00000000-0000-0000-0000-000000000383",
+            "id": "00000000-0000-0000-0000-000000000384",
           },
           "messageChannelId": {
-            "id": "00000000-0000-0000-0000-000000000382",
+            "id": "00000000-0000-0000-0000-000000000383",
           },
           "messageExternalId": {
-            "id": "00000000-0000-0000-0000-000000000384",
+            "id": "00000000-0000-0000-0000-000000000385",
           },
         },
         "viewGroups": {},
@@ -1550,76 +1553,76 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
   "messageChannelMessageAssociationMessageFolder": {
     "fields": {
       "createdAt": {
-        "id": "00000000-0000-0000-0000-000000000393",
-      },
-      "createdBy": {
-        "id": "00000000-0000-0000-0000-000000000396",
-      },
-      "deletedAt": {
-        "id": "00000000-0000-0000-0000-000000000395",
-      },
-      "id": {
-        "id": "00000000-0000-0000-0000-000000000392",
-      },
-      "messageChannelMessageAssociation": {
-        "id": "00000000-0000-0000-0000-000000000400",
-      },
-      "messageFolderId": {
-        "id": "00000000-0000-0000-0000-000000000401",
-      },
-      "position": {
-        "id": "00000000-0000-0000-0000-000000000398",
-      },
-      "searchVector": {
-        "id": "00000000-0000-0000-0000-000000000399",
-      },
-      "updatedAt": {
         "id": "00000000-0000-0000-0000-000000000394",
       },
-      "updatedBy": {
+      "createdBy": {
         "id": "00000000-0000-0000-0000-000000000397",
       },
+      "deletedAt": {
+        "id": "00000000-0000-0000-0000-000000000396",
+      },
+      "id": {
+        "id": "00000000-0000-0000-0000-000000000393",
+      },
+      "messageChannelMessageAssociation": {
+        "id": "00000000-0000-0000-0000-000000000401",
+      },
+      "messageFolderId": {
+        "id": "00000000-0000-0000-0000-000000000402",
+      },
+      "position": {
+        "id": "00000000-0000-0000-0000-000000000399",
+      },
+      "searchVector": {
+        "id": "00000000-0000-0000-0000-000000000400",
+      },
+      "updatedAt": {
+        "id": "00000000-0000-0000-0000-000000000395",
+      },
+      "updatedBy": {
+        "id": "00000000-0000-0000-0000-000000000398",
+      },
     },
-    "id": "00000000-0000-0000-0000-000000000413",
+    "id": "00000000-0000-0000-0000-000000000414",
     "views": {
       "allMessageChannelMessageAssociationMessageFolders": {
-        "id": "00000000-0000-0000-0000-000000000405",
+        "id": "00000000-0000-0000-0000-000000000406",
         "viewFieldGroups": {},
         "viewFields": {
           "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000404",
+            "id": "00000000-0000-0000-0000-000000000405",
           },
           "messageChannelMessageAssociation": {
-            "id": "00000000-0000-0000-0000-000000000402",
+            "id": "00000000-0000-0000-0000-000000000403",
           },
           "messageFolderId": {
-            "id": "00000000-0000-0000-0000-000000000403",
+            "id": "00000000-0000-0000-0000-000000000404",
           },
         },
         "viewGroups": {},
       },
       "messageChannelMessageAssociationMessageFolderRecordPageFields": {
-        "id": "00000000-0000-0000-0000-000000000412",
+        "id": "00000000-0000-0000-0000-000000000413",
         "viewFieldGroups": {
           "general": {
-            "id": "00000000-0000-0000-0000-000000000410",
-          },
-          "other": {
             "id": "00000000-0000-0000-0000-000000000411",
           },
+          "system": {
+            "id": "00000000-0000-0000-0000-000000000412",
+          },
         },
         "viewFields": {
           "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000408",
-          },
-          "createdBy": {
             "id": "00000000-0000-0000-0000-000000000409",
           },
+          "createdBy": {
+            "id": "00000000-0000-0000-0000-000000000410",
+          },
           "messageChannelMessageAssociation": {
-            "id": "00000000-0000-0000-0000-000000000406",
+            "id": "00000000-0000-0000-0000-000000000407",
           },
           "messageFolderId": {
-            "id": "00000000-0000-0000-0000-000000000407",
+            "id": "00000000-0000-0000-0000-000000000408",
           },
         },
         "viewGroups": {},
@@ -1629,103 +1632,103 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
   "messageFolder": {
     "fields": {
       "createdAt": {
-        "id": "00000000-0000-0000-0000-000000000460",
-      },
-      "createdBy": {
-        "id": "00000000-0000-0000-0000-000000000471",
-      },
-      "deletedAt": {
-        "id": "00000000-0000-0000-0000-000000000462",
-      },
-      "externalId": {
-        "id": "00000000-0000-0000-0000-000000000469",
-      },
-      "id": {
-        "id": "00000000-0000-0000-0000-000000000459",
-      },
-      "isSentFolder": {
-        "id": "00000000-0000-0000-0000-000000000467",
-      },
-      "isSynced": {
-        "id": "00000000-0000-0000-0000-000000000468",
-      },
-      "messageChannelId": {
-        "id": "00000000-0000-0000-0000-000000000465",
-      },
-      "name": {
-        "id": "00000000-0000-0000-0000-000000000463",
-      },
-      "parentFolderId": {
-        "id": "00000000-0000-0000-0000-000000000464",
-      },
-      "pendingSyncAction": {
-        "id": "00000000-0000-0000-0000-000000000470",
-      },
-      "position": {
-        "id": "00000000-0000-0000-0000-000000000473",
-      },
-      "searchVector": {
-        "id": "00000000-0000-0000-0000-000000000474",
-      },
-      "syncCursor": {
-        "id": "00000000-0000-0000-0000-000000000466",
-      },
-      "updatedAt": {
         "id": "00000000-0000-0000-0000-000000000461",
       },
-      "updatedBy": {
+      "createdBy": {
         "id": "00000000-0000-0000-0000-000000000472",
       },
+      "deletedAt": {
+        "id": "00000000-0000-0000-0000-000000000463",
+      },
+      "externalId": {
+        "id": "00000000-0000-0000-0000-000000000470",
+      },
+      "id": {
+        "id": "00000000-0000-0000-0000-000000000460",
+      },
+      "isSentFolder": {
+        "id": "00000000-0000-0000-0000-000000000468",
+      },
+      "isSynced": {
+        "id": "00000000-0000-0000-0000-000000000469",
+      },
+      "messageChannelId": {
+        "id": "00000000-0000-0000-0000-000000000466",
+      },
+      "name": {
+        "id": "00000000-0000-0000-0000-000000000464",
+      },
+      "parentFolderId": {
+        "id": "00000000-0000-0000-0000-000000000465",
+      },
+      "pendingSyncAction": {
+        "id": "00000000-0000-0000-0000-000000000471",
+      },
+      "position": {
+        "id": "00000000-0000-0000-0000-000000000474",
+      },
+      "searchVector": {
+        "id": "00000000-0000-0000-0000-000000000475",
+      },
+      "syncCursor": {
+        "id": "00000000-0000-0000-0000-000000000467",
+      },
+      "updatedAt": {
+        "id": "00000000-0000-0000-0000-000000000462",
+      },
+      "updatedBy": {
+        "id": "00000000-0000-0000-0000-000000000473",
+      },
     },
-    "id": "00000000-0000-0000-0000-000000000489",
+    "id": "00000000-0000-0000-0000-000000000490",
     "views": {
       "allMessageFolders": {
-        "id": "00000000-0000-0000-0000-000000000480",
+        "id": "00000000-0000-0000-0000-000000000481",
         "viewFieldGroups": {},
         "viewFields": {
           "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000479",
+            "id": "00000000-0000-0000-0000-000000000480",
           },
           "isSentFolder": {
-            "id": "00000000-0000-0000-0000-000000000477",
-          },
-          "isSynced": {
             "id": "00000000-0000-0000-0000-000000000478",
           },
+          "isSynced": {
+            "id": "00000000-0000-0000-0000-000000000479",
+          },
           "messageChannelId": {
-            "id": "00000000-0000-0000-0000-000000000476",
+            "id": "00000000-0000-0000-0000-000000000477",
           },
           "name": {
-            "id": "00000000-0000-0000-0000-000000000475",
+            "id": "00000000-0000-0000-0000-000000000476",
           },
         },
         "viewGroups": {},
       },
       "messageFolderRecordPageFields": {
-        "id": "00000000-0000-0000-0000-000000000488",
+        "id": "00000000-0000-0000-0000-000000000489",
         "viewFieldGroups": {
           "general": {
-            "id": "00000000-0000-0000-0000-000000000486",
-          },
-          "other": {
             "id": "00000000-0000-0000-0000-000000000487",
           },
+          "system": {
+            "id": "00000000-0000-0000-0000-000000000488",
+          },
         },
         "viewFields": {
           "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000484",
-          },
-          "createdBy": {
             "id": "00000000-0000-0000-0000-000000000485",
           },
-          "isSentFolder": {
-            "id": "00000000-0000-0000-0000-000000000482",
+          "createdBy": {
+            "id": "00000000-0000-0000-0000-000000000486",
           },
-          "isSynced": {
+          "isSentFolder": {
             "id": "00000000-0000-0000-0000-000000000483",
           },
+          "isSynced": {
+            "id": "00000000-0000-0000-0000-000000000484",
+          },
           "messageChannelId": {
-            "id": "00000000-0000-0000-0000-000000000481",
+            "id": "00000000-0000-0000-0000-000000000482",
           },
         },
         "viewGroups": {},
@@ -1735,110 +1738,110 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
   "messageParticipant": {
     "fields": {
       "createdAt": {
-        "id": "00000000-0000-0000-0000-000000000491",
-      },
-      "createdBy": {
-        "id": "00000000-0000-0000-0000-000000000500",
-      },
-      "deletedAt": {
-        "id": "00000000-0000-0000-0000-000000000493",
-      },
-      "displayName": {
-        "id": "00000000-0000-0000-0000-000000000497",
-      },
-      "handle": {
-        "id": "00000000-0000-0000-0000-000000000496",
-      },
-      "id": {
-        "id": "00000000-0000-0000-0000-000000000490",
-      },
-      "message": {
-        "id": "00000000-0000-0000-0000-000000000494",
-      },
-      "person": {
-        "id": "00000000-0000-0000-0000-000000000498",
-      },
-      "position": {
-        "id": "00000000-0000-0000-0000-000000000502",
-      },
-      "role": {
-        "id": "00000000-0000-0000-0000-000000000495",
-      },
-      "searchVector": {
-        "id": "00000000-0000-0000-0000-000000000503",
-      },
-      "updatedAt": {
         "id": "00000000-0000-0000-0000-000000000492",
       },
-      "updatedBy": {
+      "createdBy": {
         "id": "00000000-0000-0000-0000-000000000501",
       },
-      "workspaceMember": {
+      "deletedAt": {
+        "id": "00000000-0000-0000-0000-000000000494",
+      },
+      "displayName": {
+        "id": "00000000-0000-0000-0000-000000000498",
+      },
+      "handle": {
+        "id": "00000000-0000-0000-0000-000000000497",
+      },
+      "id": {
+        "id": "00000000-0000-0000-0000-000000000491",
+      },
+      "message": {
+        "id": "00000000-0000-0000-0000-000000000495",
+      },
+      "person": {
         "id": "00000000-0000-0000-0000-000000000499",
       },
+      "position": {
+        "id": "00000000-0000-0000-0000-000000000503",
+      },
+      "role": {
+        "id": "00000000-0000-0000-0000-000000000496",
+      },
+      "searchVector": {
+        "id": "00000000-0000-0000-0000-000000000504",
+      },
+      "updatedAt": {
+        "id": "00000000-0000-0000-0000-000000000493",
+      },
+      "updatedBy": {
+        "id": "00000000-0000-0000-0000-000000000502",
+      },
+      "workspaceMember": {
+        "id": "00000000-0000-0000-0000-000000000500",
+      },
     },
-    "id": "00000000-0000-0000-0000-000000000522",
+    "id": "00000000-0000-0000-0000-000000000523",
     "views": {
       "allMessageParticipants": {
-        "id": "00000000-0000-0000-0000-000000000511",
+        "id": "00000000-0000-0000-0000-000000000512",
         "viewFieldGroups": {},
         "viewFields": {
           "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000510",
+            "id": "00000000-0000-0000-0000-000000000511",
           },
           "displayName": {
-            "id": "00000000-0000-0000-0000-000000000507",
-          },
-          "handle": {
-            "id": "00000000-0000-0000-0000-000000000506",
-          },
-          "message": {
-            "id": "00000000-0000-0000-0000-000000000504",
-          },
-          "person": {
             "id": "00000000-0000-0000-0000-000000000508",
           },
-          "role": {
+          "handle": {
+            "id": "00000000-0000-0000-0000-000000000507",
+          },
+          "message": {
             "id": "00000000-0000-0000-0000-000000000505",
           },
-          "workspaceMember": {
+          "person": {
             "id": "00000000-0000-0000-0000-000000000509",
           },
+          "role": {
+            "id": "00000000-0000-0000-0000-000000000506",
+          },
+          "workspaceMember": {
+            "id": "00000000-0000-0000-0000-000000000510",
+          },
         },
         "viewGroups": {},
       },
       "messageParticipantRecordPageFields": {
-        "id": "00000000-0000-0000-0000-000000000521",
+        "id": "00000000-0000-0000-0000-000000000522",
         "viewFieldGroups": {
           "general": {
-            "id": "00000000-0000-0000-0000-000000000519",
-          },
-          "other": {
             "id": "00000000-0000-0000-0000-000000000520",
           },
+          "system": {
+            "id": "00000000-0000-0000-0000-000000000521",
+          },
         },
         "viewFields": {
           "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000517",
-          },
-          "createdBy": {
             "id": "00000000-0000-0000-0000-000000000518",
           },
+          "createdBy": {
+            "id": "00000000-0000-0000-0000-000000000519",
+          },
           "displayName": {
-            "id": "00000000-0000-0000-0000-000000000514",
-          },
-          "message": {
-            "id": "00000000-0000-0000-0000-000000000512",
-          },
-          "person": {
             "id": "00000000-0000-0000-0000-000000000515",
           },
-          "role": {
+          "message": {
             "id": "00000000-0000-0000-0000-000000000513",
           },
-          "workspaceMember": {
+          "person": {
             "id": "00000000-0000-0000-0000-000000000516",
           },
+          "role": {
+            "id": "00000000-0000-0000-0000-000000000514",
+          },
+          "workspaceMember": {
+            "id": "00000000-0000-0000-0000-000000000517",
+          },
         },
         "viewGroups": {},
       },
@@ -1847,56 +1850,56 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
   "messageThread": {
     "fields": {
       "createdAt": {
-        "id": "00000000-0000-0000-0000-000000000524",
-      },
-      "createdBy": {
-        "id": "00000000-0000-0000-0000-000000000529",
-      },
-      "deletedAt": {
-        "id": "00000000-0000-0000-0000-000000000526",
-      },
-      "id": {
-        "id": "00000000-0000-0000-0000-000000000523",
-      },
-      "messageChannelMessageAssociations": {
-        "id": "00000000-0000-0000-0000-000000000528",
-      },
-      "messages": {
-        "id": "00000000-0000-0000-0000-000000000527",
-      },
-      "position": {
-        "id": "00000000-0000-0000-0000-000000000531",
-      },
-      "searchVector": {
-        "id": "00000000-0000-0000-0000-000000000532",
-      },
-      "subject": {
-        "id": "00000000-0000-0000-0000-000000000533",
-      },
-      "updatedAt": {
         "id": "00000000-0000-0000-0000-000000000525",
       },
-      "updatedBy": {
+      "createdBy": {
         "id": "00000000-0000-0000-0000-000000000530",
       },
+      "deletedAt": {
+        "id": "00000000-0000-0000-0000-000000000527",
+      },
+      "id": {
+        "id": "00000000-0000-0000-0000-000000000524",
+      },
+      "messageChannelMessageAssociations": {
+        "id": "00000000-0000-0000-0000-000000000529",
+      },
+      "messages": {
+        "id": "00000000-0000-0000-0000-000000000528",
+      },
+      "position": {
+        "id": "00000000-0000-0000-0000-000000000532",
+      },
+      "searchVector": {
+        "id": "00000000-0000-0000-0000-000000000533",
+      },
+      "subject": {
+        "id": "00000000-0000-0000-0000-000000000534",
+      },
+      "updatedAt": {
+        "id": "00000000-0000-0000-0000-000000000526",
+      },
+      "updatedBy": {
+        "id": "00000000-0000-0000-0000-000000000531",
+      },
     },
-    "id": "00000000-0000-0000-0000-000000000539",
+    "id": "00000000-0000-0000-0000-000000000540",
     "views": {
       "allMessageThreads": {
-        "id": "00000000-0000-0000-0000-000000000538",
+        "id": "00000000-0000-0000-0000-000000000539",
         "viewFieldGroups": {},
         "viewFields": {
           "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000537",
+            "id": "00000000-0000-0000-0000-000000000538",
           },
           "messages": {
-            "id": "00000000-0000-0000-0000-000000000535",
+            "id": "00000000-0000-0000-0000-000000000536",
           },
           "subject": {
-            "id": "00000000-0000-0000-0000-000000000534",
+            "id": "00000000-0000-0000-0000-000000000535",
           },
           "updatedAt": {
-            "id": "00000000-0000-0000-0000-000000000536",
+            "id": "00000000-0000-0000-0000-000000000537",
           },
         },
         "viewGroups": {},
@@ -1906,68 +1909,68 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
   "note": {
     "fields": {
       "attachments": {
-        "id": "00000000-0000-0000-0000-000000000575",
-      },
-      "bodyV2": {
-        "id": "00000000-0000-0000-0000-000000000571",
-      },
-      "createdAt": {
-        "id": "00000000-0000-0000-0000-000000000566",
-      },
-      "createdBy": {
-        "id": "00000000-0000-0000-0000-000000000572",
-      },
-      "deletedAt": {
-        "id": "00000000-0000-0000-0000-000000000568",
-      },
-      "favorites": {
-        "id": "00000000-0000-0000-0000-000000000577",
-      },
-      "id": {
-        "id": "00000000-0000-0000-0000-000000000565",
-      },
-      "noteTargets": {
-        "id": "00000000-0000-0000-0000-000000000574",
-      },
-      "position": {
-        "id": "00000000-0000-0000-0000-000000000569",
-      },
-      "searchVector": {
-        "id": "00000000-0000-0000-0000-000000000578",
-      },
-      "timelineActivities": {
         "id": "00000000-0000-0000-0000-000000000576",
       },
-      "title": {
-        "id": "00000000-0000-0000-0000-000000000570",
+      "bodyV2": {
+        "id": "00000000-0000-0000-0000-000000000572",
       },
-      "updatedAt": {
+      "createdAt": {
         "id": "00000000-0000-0000-0000-000000000567",
       },
-      "updatedBy": {
+      "createdBy": {
         "id": "00000000-0000-0000-0000-000000000573",
       },
+      "deletedAt": {
+        "id": "00000000-0000-0000-0000-000000000569",
+      },
+      "favorites": {
+        "id": "00000000-0000-0000-0000-000000000578",
+      },
+      "id": {
+        "id": "00000000-0000-0000-0000-000000000566",
+      },
+      "noteTargets": {
+        "id": "00000000-0000-0000-0000-000000000575",
+      },
+      "position": {
+        "id": "00000000-0000-0000-0000-000000000570",
+      },
+      "searchVector": {
+        "id": "00000000-0000-0000-0000-000000000579",
+      },
+      "timelineActivities": {
+        "id": "00000000-0000-0000-0000-000000000577",
+      },
+      "title": {
+        "id": "00000000-0000-0000-0000-000000000571",
+      },
+      "updatedAt": {
+        "id": "00000000-0000-0000-0000-000000000568",
+      },
+      "updatedBy": {
+        "id": "00000000-0000-0000-0000-000000000574",
+      },
     },
     "id": "00000000-0000-0000-0000-000000000598",
     "views": {
       "allNotes": {
-        "id": "00000000-0000-0000-0000-000000000584",
+        "id": "00000000-0000-0000-0000-000000000585",
         "viewFieldGroups": {},
         "viewFields": {
           "bodyV2": {
-            "id": "00000000-0000-0000-0000-000000000581",
-          },
-          "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000583",
-          },
-          "createdBy": {
             "id": "00000000-0000-0000-0000-000000000582",
           },
+          "createdAt": {
+            "id": "00000000-0000-0000-0000-000000000584",
+          },
+          "createdBy": {
+            "id": "00000000-0000-0000-0000-000000000583",
+          },
           "noteTargets": {
-            "id": "00000000-0000-0000-0000-000000000580",
+            "id": "00000000-0000-0000-0000-000000000581",
           },
           "title": {
-            "id": "00000000-0000-0000-0000-000000000579",
+            "id": "00000000-0000-0000-0000-000000000580",
           },
         },
         "viewGroups": {},
@@ -1975,44 +1978,41 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
       "noteRecordPageFields": {
         "id": "00000000-0000-0000-0000-000000000597",
         "viewFieldGroups": {
-          "additional": {
+          "general": {
             "id": "00000000-0000-0000-0000-000000000595",
           },
-          "general": {
-            "id": "00000000-0000-0000-0000-000000000594",
-          },
-          "other": {
+          "system": {
             "id": "00000000-0000-0000-0000-000000000596",
           },
         },
         "viewFields": {
           "attachments": {
-            "id": "00000000-0000-0000-0000-000000000591",
-          },
-          "bodyV2": {
-            "id": "00000000-0000-0000-0000-000000000588",
-          },
-          "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000585",
-          },
-          "createdBy": {
-            "id": "00000000-0000-0000-0000-000000000586",
-          },
-          "favorites": {
-            "id": "00000000-0000-0000-0000-000000000593",
-          },
-          "noteTargets": {
-            "id": "00000000-0000-0000-0000-000000000587",
-          },
-          "timelineActivities": {
             "id": "00000000-0000-0000-0000-000000000592",
           },
-          "updatedAt": {
+          "bodyV2": {
             "id": "00000000-0000-0000-0000-000000000589",
           },
-          "updatedBy": {
+          "createdAt": {
+            "id": "00000000-0000-0000-0000-000000000586",
+          },
+          "createdBy": {
+            "id": "00000000-0000-0000-0000-000000000587",
+          },
+          "favorites": {
+            "id": "00000000-0000-0000-0000-000000000594",
+          },
+          "noteTargets": {
+            "id": "00000000-0000-0000-0000-000000000588",
+          },
+          "timelineActivities": {
+            "id": "00000000-0000-0000-0000-000000000593",
+          },
+          "updatedAt": {
             "id": "00000000-0000-0000-0000-000000000590",
           },
+          "updatedBy": {
+            "id": "00000000-0000-0000-0000-000000000591",
+          },
         },
         "viewGroups": {},
       },
@@ -2217,13 +2217,13 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
       "opportunityRecordPageFields": {
         "id": "00000000-0000-0000-0000-000000000675",
         "viewFieldGroups": {
-          "additional": {
-            "id": "00000000-0000-0000-0000-000000000673",
-          },
-          "general": {
+          "deal": {
             "id": "00000000-0000-0000-0000-000000000672",
           },
-          "other": {
+          "relations": {
+            "id": "00000000-0000-0000-0000-000000000673",
+          },
+          "system": {
             "id": "00000000-0000-0000-0000-000000000674",
           },
         },
@@ -2359,7 +2359,7 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
         "id": "00000000-0000-0000-0000-000000000684",
       },
     },
-    "id": "00000000-0000-0000-0000-000000000739",
+    "id": "00000000-0000-0000-0000-000000000740",
     "views": {
       "allPeople": {
         "id": "00000000-0000-0000-0000-000000000713",
@@ -2399,17 +2399,20 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
         "viewGroups": {},
       },
       "personRecordPageFields": {
-        "id": "00000000-0000-0000-0000-000000000738",
+        "id": "00000000-0000-0000-0000-000000000739",
         "viewFieldGroups": {
-          "additional": {
-            "id": "00000000-0000-0000-0000-000000000736",
-          },
           "general": {
             "id": "00000000-0000-0000-0000-000000000735",
           },
-          "other": {
+          "social": {
             "id": "00000000-0000-0000-0000-000000000737",
           },
+          "system": {
+            "id": "00000000-0000-0000-0000-000000000738",
+          },
+          "work": {
+            "id": "00000000-0000-0000-0000-000000000736",
+          },
         },
         "viewFields": {
           "attachments": {
@@ -2483,213 +2486,210 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
   "task": {
     "fields": {
       "assignee": {
-        "id": "00000000-0000-0000-0000-000000000753",
-      },
-      "attachments": {
-        "id": "00000000-0000-0000-0000-000000000752",
-      },
-      "bodyV2": {
-        "id": "00000000-0000-0000-0000-000000000746",
-      },
-      "createdAt": {
-        "id": "00000000-0000-0000-0000-000000000741",
-      },
-      "createdBy": {
-        "id": "00000000-0000-0000-0000-000000000749",
-      },
-      "deletedAt": {
-        "id": "00000000-0000-0000-0000-000000000743",
-      },
-      "dueAt": {
-        "id": "00000000-0000-0000-0000-000000000747",
-      },
-      "favorites": {
-        "id": "00000000-0000-0000-0000-000000000755",
-      },
-      "id": {
-        "id": "00000000-0000-0000-0000-000000000740",
-      },
-      "position": {
-        "id": "00000000-0000-0000-0000-000000000744",
-      },
-      "searchVector": {
-        "id": "00000000-0000-0000-0000-000000000756",
-      },
-      "status": {
-        "id": "00000000-0000-0000-0000-000000000748",
-      },
-      "taskTargets": {
-        "id": "00000000-0000-0000-0000-000000000751",
-      },
-      "timelineActivities": {
         "id": "00000000-0000-0000-0000-000000000754",
       },
-      "title": {
-        "id": "00000000-0000-0000-0000-000000000745",
+      "attachments": {
+        "id": "00000000-0000-0000-0000-000000000753",
       },
-      "updatedAt": {
+      "bodyV2": {
+        "id": "00000000-0000-0000-0000-000000000747",
+      },
+      "createdAt": {
         "id": "00000000-0000-0000-0000-000000000742",
       },
-      "updatedBy": {
+      "createdBy": {
         "id": "00000000-0000-0000-0000-000000000750",
       },
+      "deletedAt": {
+        "id": "00000000-0000-0000-0000-000000000744",
+      },
+      "dueAt": {
+        "id": "00000000-0000-0000-0000-000000000748",
+      },
+      "favorites": {
+        "id": "00000000-0000-0000-0000-000000000756",
+      },
+      "id": {
+        "id": "00000000-0000-0000-0000-000000000741",
+      },
+      "position": {
+        "id": "00000000-0000-0000-0000-000000000745",
+      },
+      "searchVector": {
+        "id": "00000000-0000-0000-0000-000000000757",
+      },
+      "status": {
+        "id": "00000000-0000-0000-0000-000000000749",
+      },
+      "taskTargets": {
+        "id": "00000000-0000-0000-0000-000000000752",
+      },
+      "timelineActivities": {
+        "id": "00000000-0000-0000-0000-000000000755",
+      },
+      "title": {
+        "id": "00000000-0000-0000-0000-000000000746",
+      },
+      "updatedAt": {
+        "id": "00000000-0000-0000-0000-000000000743",
+      },
+      "updatedBy": {
+        "id": "00000000-0000-0000-0000-000000000751",
+      },
     },
     "id": "00000000-0000-0000-0000-000000000803",
     "views": {
       "allTasks": {
-        "id": "00000000-0000-0000-0000-000000000765",
+        "id": "00000000-0000-0000-0000-000000000766",
         "viewFieldGroups": {},
         "viewFields": {
           "assignee": {
-            "id": "00000000-0000-0000-0000-000000000762",
-          },
-          "bodyV2": {
             "id": "00000000-0000-0000-0000-000000000763",
           },
-          "createdAt": {
+          "bodyV2": {
             "id": "00000000-0000-0000-0000-000000000764",
           },
-          "createdBy": {
-            "id": "00000000-0000-0000-0000-000000000760",
+          "createdAt": {
+            "id": "00000000-0000-0000-0000-000000000765",
           },
-          "dueAt": {
+          "createdBy": {
             "id": "00000000-0000-0000-0000-000000000761",
           },
-          "status": {
-            "id": "00000000-0000-0000-0000-000000000758",
+          "dueAt": {
+            "id": "00000000-0000-0000-0000-000000000762",
           },
-          "taskTargets": {
+          "status": {
             "id": "00000000-0000-0000-0000-000000000759",
           },
+          "taskTargets": {
+            "id": "00000000-0000-0000-0000-000000000760",
+          },
           "title": {
-            "id": "00000000-0000-0000-0000-000000000757",
+            "id": "00000000-0000-0000-0000-000000000758",
           },
         },
         "viewGroups": {},
       },
       "assignedToMe": {
-        "id": "00000000-0000-0000-0000-000000000777",
+        "id": "00000000-0000-0000-0000-000000000778",
         "viewFieldGroups": {},
         "viewFields": {
           "assignee": {
-            "id": "00000000-0000-0000-0000-000000000770",
-          },
-          "bodyV2": {
             "id": "00000000-0000-0000-0000-000000000771",
           },
-          "createdAt": {
+          "bodyV2": {
             "id": "00000000-0000-0000-0000-000000000772",
           },
-          "createdBy": {
-            "id": "00000000-0000-0000-0000-000000000768",
+          "createdAt": {
+            "id": "00000000-0000-0000-0000-000000000773",
           },
-          "dueAt": {
+          "createdBy": {
             "id": "00000000-0000-0000-0000-000000000769",
           },
+          "dueAt": {
+            "id": "00000000-0000-0000-0000-000000000770",
+          },
           "taskTargets": {
-            "id": "00000000-0000-0000-0000-000000000767",
+            "id": "00000000-0000-0000-0000-000000000768",
           },
           "title": {
-            "id": "00000000-0000-0000-0000-000000000766",
+            "id": "00000000-0000-0000-0000-000000000767",
           },
         },
         "viewGroups": {
           "done": {
-            "id": "00000000-0000-0000-0000-000000000775",
-          },
-          "empty": {
             "id": "00000000-0000-0000-0000-000000000776",
           },
+          "empty": {
+            "id": "00000000-0000-0000-0000-000000000777",
+          },
           "inProgress": {
-            "id": "00000000-0000-0000-0000-000000000774",
+            "id": "00000000-0000-0000-0000-000000000775",
           },
           "todo": {
-            "id": "00000000-0000-0000-0000-000000000773",
+            "id": "00000000-0000-0000-0000-000000000774",
           },
         },
       },
       "byStatus": {
-        "id": "00000000-0000-0000-0000-000000000786",
+        "id": "00000000-0000-0000-0000-000000000787",
         "viewFieldGroups": {},
         "viewFields": {
           "assignee": {
-            "id": "00000000-0000-0000-0000-000000000781",
-          },
-          "createdAt": {
             "id": "00000000-0000-0000-0000-000000000782",
           },
+          "createdAt": {
+            "id": "00000000-0000-0000-0000-000000000783",
+          },
           "dueAt": {
-            "id": "00000000-0000-0000-0000-000000000780",
+            "id": "00000000-0000-0000-0000-000000000781",
           },
           "status": {
-            "id": "00000000-0000-0000-0000-000000000779",
+            "id": "00000000-0000-0000-0000-000000000780",
           },
           "title": {
-            "id": "00000000-0000-0000-0000-000000000778",
+            "id": "00000000-0000-0000-0000-000000000779",
           },
         },
         "viewGroups": {
           "done": {
-            "id": "00000000-0000-0000-0000-000000000785",
+            "id": "00000000-0000-0000-0000-000000000786",
           },
           "inProgress": {
-            "id": "00000000-0000-0000-0000-000000000784",
+            "id": "00000000-0000-0000-0000-000000000785",
           },
           "todo": {
-            "id": "00000000-0000-0000-0000-000000000783",
+            "id": "00000000-0000-0000-0000-000000000784",
           },
         },
       },
       "taskRecordPageFields": {
         "id": "00000000-0000-0000-0000-000000000802",
         "viewFieldGroups": {
-          "additional": {
+          "general": {
             "id": "00000000-0000-0000-0000-000000000800",
           },
-          "general": {
-            "id": "00000000-0000-0000-0000-000000000799",
-          },
-          "other": {
+          "system": {
             "id": "00000000-0000-0000-0000-000000000801",
           },
         },
         "viewFields": {
           "assignee": {
-            "id": "00000000-0000-0000-0000-000000000789",
-          },
-          "attachments": {
-            "id": "00000000-0000-0000-0000-000000000796",
-          },
-          "bodyV2": {
-            "id": "00000000-0000-0000-0000-000000000793",
-          },
-          "createdAt": {
             "id": "00000000-0000-0000-0000-000000000790",
           },
-          "createdBy": {
-            "id": "00000000-0000-0000-0000-000000000791",
-          },
-          "dueAt": {
-            "id": "00000000-0000-0000-0000-000000000787",
-          },
-          "favorites": {
-            "id": "00000000-0000-0000-0000-000000000798",
-          },
-          "status": {
-            "id": "00000000-0000-0000-0000-000000000788",
-          },
-          "taskTargets": {
-            "id": "00000000-0000-0000-0000-000000000792",
-          },
-          "timelineActivities": {
+          "attachments": {
             "id": "00000000-0000-0000-0000-000000000797",
           },
-          "updatedAt": {
+          "bodyV2": {
             "id": "00000000-0000-0000-0000-000000000794",
           },
-          "updatedBy": {
+          "createdAt": {
+            "id": "00000000-0000-0000-0000-000000000791",
+          },
+          "createdBy": {
+            "id": "00000000-0000-0000-0000-000000000792",
+          },
+          "dueAt": {
+            "id": "00000000-0000-0000-0000-000000000788",
+          },
+          "favorites": {
+            "id": "00000000-0000-0000-0000-000000000799",
+          },
+          "status": {
+            "id": "00000000-0000-0000-0000-000000000789",
+          },
+          "taskTargets": {
+            "id": "00000000-0000-0000-0000-000000000793",
+          },
+          "timelineActivities": {
+            "id": "00000000-0000-0000-0000-000000000798",
+          },
+          "updatedAt": {
             "id": "00000000-0000-0000-0000-000000000795",
           },
+          "updatedBy": {
+            "id": "00000000-0000-0000-0000-000000000796",
+          },
         },
         "viewGroups": {},
       },
@@ -3031,7 +3031,7 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
           "general": {
             "id": "00000000-0000-0000-0000-000000000907",
           },
-          "other": {
+          "system": {
             "id": "00000000-0000-0000-0000-000000000908",
           },
         },
@@ -3110,7 +3110,7 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
         "id": "00000000-0000-0000-0000-000000000916",
       },
     },
-    "id": "00000000-0000-0000-0000-000000000953",
+    "id": "00000000-0000-0000-0000-000000000952",
     "views": {
       "allWorkflowRuns": {
         "id": "00000000-0000-0000-0000-000000000935",
@@ -3138,16 +3138,13 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
         "viewGroups": {},
       },
       "workflowRunRecordPageFields": {
-        "id": "00000000-0000-0000-0000-000000000952",
+        "id": "00000000-0000-0000-0000-000000000951",
         "viewFieldGroups": {
-          "additional": {
-            "id": "00000000-0000-0000-0000-000000000950",
-          },
           "general": {
             "id": "00000000-0000-0000-0000-000000000949",
           },
-          "other": {
-            "id": "00000000-0000-0000-0000-000000000951",
+          "system": {
+            "id": "00000000-0000-0000-0000-000000000950",
           },
         },
         "viewFields": {
@@ -3198,125 +3195,122 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
   "workflowVersion": {
     "fields": {
       "createdAt": {
-        "id": "00000000-0000-0000-0000-000000000955",
-      },
-      "createdBy": {
-        "id": "00000000-0000-0000-0000-000000000968",
-      },
-      "deletedAt": {
-        "id": "00000000-0000-0000-0000-000000000957",
-      },
-      "favorites": {
-        "id": "00000000-0000-0000-0000-000000000965",
-      },
-      "id": {
         "id": "00000000-0000-0000-0000-000000000954",
       },
-      "name": {
-        "id": "00000000-0000-0000-0000-000000000958",
-      },
-      "position": {
-        "id": "00000000-0000-0000-0000-000000000962",
-      },
-      "runs": {
-        "id": "00000000-0000-0000-0000-000000000963",
-      },
-      "searchVector": {
+      "createdBy": {
         "id": "00000000-0000-0000-0000-000000000967",
       },
-      "status": {
-        "id": "00000000-0000-0000-0000-000000000961",
-      },
-      "steps": {
-        "id": "00000000-0000-0000-0000-000000000964",
-      },
-      "timelineActivities": {
-        "id": "00000000-0000-0000-0000-000000000966",
-      },
-      "trigger": {
-        "id": "00000000-0000-0000-0000-000000000960",
-      },
-      "updatedAt": {
+      "deletedAt": {
         "id": "00000000-0000-0000-0000-000000000956",
       },
-      "updatedBy": {
-        "id": "00000000-0000-0000-0000-000000000969",
+      "favorites": {
+        "id": "00000000-0000-0000-0000-000000000964",
       },
-      "workflow": {
+      "id": {
+        "id": "00000000-0000-0000-0000-000000000953",
+      },
+      "name": {
+        "id": "00000000-0000-0000-0000-000000000957",
+      },
+      "position": {
+        "id": "00000000-0000-0000-0000-000000000961",
+      },
+      "runs": {
+        "id": "00000000-0000-0000-0000-000000000962",
+      },
+      "searchVector": {
+        "id": "00000000-0000-0000-0000-000000000966",
+      },
+      "status": {
+        "id": "00000000-0000-0000-0000-000000000960",
+      },
+      "steps": {
+        "id": "00000000-0000-0000-0000-000000000963",
+      },
+      "timelineActivities": {
+        "id": "00000000-0000-0000-0000-000000000965",
+      },
+      "trigger": {
         "id": "00000000-0000-0000-0000-000000000959",
       },
+      "updatedAt": {
+        "id": "00000000-0000-0000-0000-000000000955",
+      },
+      "updatedBy": {
+        "id": "00000000-0000-0000-0000-000000000968",
+      },
+      "workflow": {
+        "id": "00000000-0000-0000-0000-000000000958",
+      },
     },
-    "id": "00000000-0000-0000-0000-000000000991",
+    "id": "00000000-0000-0000-0000-000000000989",
     "views": {
       "allWorkflowVersions": {
-        "id": "00000000-0000-0000-0000-000000000975",
+        "id": "00000000-0000-0000-0000-000000000974",
         "viewFieldGroups": {},
         "viewFields": {
           "name": {
-            "id": "00000000-0000-0000-0000-000000000970",
+            "id": "00000000-0000-0000-0000-000000000969",
           },
           "runs": {
-            "id": "00000000-0000-0000-0000-000000000974",
-          },
-          "status": {
-            "id": "00000000-0000-0000-0000-000000000972",
-          },
-          "updatedAt": {
             "id": "00000000-0000-0000-0000-000000000973",
           },
-          "workflow": {
+          "status": {
             "id": "00000000-0000-0000-0000-000000000971",
           },
+          "updatedAt": {
+            "id": "00000000-0000-0000-0000-000000000972",
+          },
+          "workflow": {
+            "id": "00000000-0000-0000-0000-000000000970",
+          },
         },
         "viewGroups": {},
       },
       "workflowVersionRecordPageFields": {
-        "id": "00000000-0000-0000-0000-000000000990",
+        "id": "00000000-0000-0000-0000-000000000988",
         "viewFieldGroups": {
-          "additional": {
-            "id": "00000000-0000-0000-0000-000000000988",
-          },
           "general": {
-            "id": "00000000-0000-0000-0000-000000000987",
+            "id": "00000000-0000-0000-0000-000000000986",
           },
-          "other": {
-            "id": "00000000-0000-0000-0000-000000000989",
+          "system": {
+            "id": "00000000-0000-0000-0000-000000000987",
           },
         },
         "viewFields": {
           "createdAt": {
-            "id": "00000000-0000-0000-0000-000000000979",
-          },
-          "createdBy": {
-            "id": "00000000-0000-0000-0000-000000000981",
-          },
-          "favorites": {
-            "id": "00000000-0000-0000-0000-000000000985",
-          },
-          "runs": {
-            "id": "00000000-0000-0000-0000-000000000984",
-          },
-          "status": {
-            "id": "00000000-0000-0000-0000-000000000976",
-          },
-          "steps": {
-            "id": "00000000-0000-0000-0000-000000000980",
-          },
-          "timelineActivities": {
-            "id": "00000000-0000-0000-0000-000000000986",
-          },
-          "trigger": {
             "id": "00000000-0000-0000-0000-000000000978",
           },
-          "updatedAt": {
-            "id": "00000000-0000-0000-0000-000000000982",
+          "createdBy": {
+            "id": "00000000-0000-0000-0000-000000000980",
           },
-          "updatedBy": {
+          "favorites": {
+            "id": "00000000-0000-0000-0000-000000000984",
+          },
+          "runs": {
             "id": "00000000-0000-0000-0000-000000000983",
           },
-          "workflow": {
+          "status": {
+            "id": "00000000-0000-0000-0000-000000000975",
+          },
+          "steps": {
+            "id": "00000000-0000-0000-0000-000000000979",
+          },
+          "timelineActivities": {
+            "id": "00000000-0000-0000-0000-000000000985",
+          },
+          "trigger": {
             "id": "00000000-0000-0000-0000-000000000977",
           },
+          "updatedAt": {
+            "id": "00000000-0000-0000-0000-000000000981",
+          },
+          "updatedBy": {
+            "id": "00000000-0000-0000-0000-000000000982",
+          },
+          "workflow": {
+            "id": "00000000-0000-0000-0000-000000000976",
+          },
         },
         "viewGroups": {},
       },
@@ -3325,128 +3319,128 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
   "workspaceMember": {
     "fields": {
       "accountOwnerForCompanies": {
-        "id": "00000000-0000-0000-0000-000000001006",
-      },
-      "assignedTasks": {
-        "id": "00000000-0000-0000-0000-000000001003",
-      },
-      "avatarUrl": {
-        "id": "00000000-0000-0000-0000-000000001000",
-      },
-      "blocklist": {
-        "id": "00000000-0000-0000-0000-000000001009",
-      },
-      "calendarEventParticipants": {
-        "id": "00000000-0000-0000-0000-000000001010",
-      },
-      "calendarStartDay": {
-        "id": "00000000-0000-0000-0000-000000001016",
-      },
-      "colorScheme": {
-        "id": "00000000-0000-0000-0000-000000000998",
-      },
-      "connectedAccounts": {
-        "id": "00000000-0000-0000-0000-000000001007",
-      },
-      "createdAt": {
-        "id": "00000000-0000-0000-0000-000000000993",
-      },
-      "createdBy": {
-        "id": "00000000-0000-0000-0000-000000001018",
-      },
-      "dateFormat": {
-        "id": "00000000-0000-0000-0000-000000001013",
-      },
-      "deletedAt": {
-        "id": "00000000-0000-0000-0000-000000000995",
-      },
-      "favorites": {
-        "id": "00000000-0000-0000-0000-000000001005",
-      },
-      "id": {
-        "id": "00000000-0000-0000-0000-000000000992",
-      },
-      "locale": {
-        "id": "00000000-0000-0000-0000-000000000999",
-      },
-      "messageParticipants": {
-        "id": "00000000-0000-0000-0000-000000001008",
-      },
-      "name": {
-        "id": "00000000-0000-0000-0000-000000000997",
-      },
-      "numberFormat": {
-        "id": "00000000-0000-0000-0000-000000001017",
-      },
-      "ownedOpportunities": {
         "id": "00000000-0000-0000-0000-000000001004",
       },
-      "position": {
-        "id": "00000000-0000-0000-0000-000000000996",
-      },
-      "searchVector": {
-        "id": "00000000-0000-0000-0000-000000001015",
-      },
-      "timeFormat": {
-        "id": "00000000-0000-0000-0000-000000001014",
-      },
-      "timeZone": {
-        "id": "00000000-0000-0000-0000-000000001012",
-      },
-      "timelineActivities": {
-        "id": "00000000-0000-0000-0000-000000001011",
-      },
-      "updatedAt": {
-        "id": "00000000-0000-0000-0000-000000000994",
-      },
-      "updatedBy": {
-        "id": "00000000-0000-0000-0000-000000001019",
-      },
-      "userEmail": {
+      "assignedTasks": {
         "id": "00000000-0000-0000-0000-000000001001",
       },
-      "userId": {
+      "avatarUrl": {
+        "id": "00000000-0000-0000-0000-000000000998",
+      },
+      "blocklist": {
+        "id": "00000000-0000-0000-0000-000000001007",
+      },
+      "calendarEventParticipants": {
+        "id": "00000000-0000-0000-0000-000000001008",
+      },
+      "calendarStartDay": {
+        "id": "00000000-0000-0000-0000-000000001014",
+      },
+      "colorScheme": {
+        "id": "00000000-0000-0000-0000-000000000996",
+      },
+      "connectedAccounts": {
+        "id": "00000000-0000-0000-0000-000000001005",
+      },
+      "createdAt": {
+        "id": "00000000-0000-0000-0000-000000000991",
+      },
+      "createdBy": {
+        "id": "00000000-0000-0000-0000-000000001016",
+      },
+      "dateFormat": {
+        "id": "00000000-0000-0000-0000-000000001011",
+      },
+      "deletedAt": {
+        "id": "00000000-0000-0000-0000-000000000993",
+      },
+      "favorites": {
+        "id": "00000000-0000-0000-0000-000000001003",
+      },
+      "id": {
+        "id": "00000000-0000-0000-0000-000000000990",
+      },
+      "locale": {
+        "id": "00000000-0000-0000-0000-000000000997",
+      },
+      "messageParticipants": {
+        "id": "00000000-0000-0000-0000-000000001006",
+      },
+      "name": {
+        "id": "00000000-0000-0000-0000-000000000995",
+      },
+      "numberFormat": {
+        "id": "00000000-0000-0000-0000-000000001015",
+      },
+      "ownedOpportunities": {
         "id": "00000000-0000-0000-0000-000000001002",
       },
+      "position": {
+        "id": "00000000-0000-0000-0000-000000000994",
+      },
+      "searchVector": {
+        "id": "00000000-0000-0000-0000-000000001013",
+      },
+      "timeFormat": {
+        "id": "00000000-0000-0000-0000-000000001012",
+      },
+      "timeZone": {
+        "id": "00000000-0000-0000-0000-000000001010",
+      },
+      "timelineActivities": {
+        "id": "00000000-0000-0000-0000-000000001009",
+      },
+      "updatedAt": {
+        "id": "00000000-0000-0000-0000-000000000992",
+      },
+      "updatedBy": {
+        "id": "00000000-0000-0000-0000-000000001017",
+      },
+      "userEmail": {
+        "id": "00000000-0000-0000-0000-000000000999",
+      },
+      "userId": {
+        "id": "00000000-0000-0000-0000-000000001000",
+      },
     },
-    "id": "00000000-0000-0000-0000-000000001032",
+    "id": "00000000-0000-0000-0000-000000001030",
     "views": {
       "allWorkspaceMembers": {
-        "id": "00000000-0000-0000-0000-000000001031",
+        "id": "00000000-0000-0000-0000-000000001029",
         "viewFieldGroups": {},
         "viewFields": {
           "assignedTasks": {
-            "id": "00000000-0000-0000-0000-000000001030",
-          },
-          "avatarUrl": {
-            "id": "00000000-0000-0000-0000-000000001022",
-          },
-          "colorScheme": {
-            "id": "00000000-0000-0000-0000-000000001023",
-          },
-          "createdAt": {
             "id": "00000000-0000-0000-0000-000000001028",
           },
-          "dateFormat": {
-            "id": "00000000-0000-0000-0000-000000001026",
-          },
-          "locale": {
-            "id": "00000000-0000-0000-0000-000000001024",
-          },
-          "name": {
+          "avatarUrl": {
             "id": "00000000-0000-0000-0000-000000001020",
           },
-          "ownedOpportunities": {
-            "id": "00000000-0000-0000-0000-000000001029",
+          "colorScheme": {
+            "id": "00000000-0000-0000-0000-000000001021",
           },
-          "timeFormat": {
+          "createdAt": {
+            "id": "00000000-0000-0000-0000-000000001026",
+          },
+          "dateFormat": {
+            "id": "00000000-0000-0000-0000-000000001024",
+          },
+          "locale": {
+            "id": "00000000-0000-0000-0000-000000001022",
+          },
+          "name": {
+            "id": "00000000-0000-0000-0000-000000001018",
+          },
+          "ownedOpportunities": {
             "id": "00000000-0000-0000-0000-000000001027",
           },
-          "timeZone": {
+          "timeFormat": {
             "id": "00000000-0000-0000-0000-000000001025",
           },
+          "timeZone": {
+            "id": "00000000-0000-0000-0000-000000001023",
+          },
           "userEmail": {
-            "id": "00000000-0000-0000-0000-000000001021",
+            "id": "00000000-0000-0000-0000-000000001019",
           },
         },
         "viewGroups": {},
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-blocklist-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-blocklist-view-field-groups.util.ts
index e8abb4aa4c..ebbbe35c32 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-blocklist-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-blocklist-view-field-groups.util.ts
@@ -19,13 +19,13 @@ export const computeStandardBlocklistViewFieldGroups = (
         isVisible: true,
       },
     }),
-    blocklistRecordPageFieldsOther: createStandardViewFieldGroupFlatMetadata({
+    blocklistRecordPageFieldsSystem: createStandardViewFieldGroupFlatMetadata({
       ...args,
       objectName: 'blocklist',
       context: {
         viewName: 'blocklistRecordPageFields',
-        viewFieldGroupName: 'other',
-        name: 'Other',
+        viewFieldGroupName: 'system',
+        name: 'System',
         position: 1,
         isVisible: true,
       },
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-calendar-channel-event-association-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-calendar-channel-event-association-view-field-groups.util.ts
index ac2203bafe..ac0849423e 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-calendar-channel-event-association-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-calendar-channel-event-association-view-field-groups.util.ts
@@ -23,14 +23,14 @@ export const computeStandardCalendarChannelEventAssociationViewFieldGroups = (
           isVisible: true,
         },
       }),
-    calendarChannelEventAssociationRecordPageFieldsOther:
+    calendarChannelEventAssociationRecordPageFieldsSystem:
       createStandardViewFieldGroupFlatMetadata({
         ...args,
         objectName: 'calendarChannelEventAssociation',
         context: {
           viewName: 'calendarChannelEventAssociationRecordPageFields',
-          viewFieldGroupName: 'other',
-          name: 'Other',
+          viewFieldGroupName: 'system',
+          name: 'System',
           position: 1,
           isVisible: true,
         },
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-calendar-channel-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-calendar-channel-view-field-groups.util.ts
index 33a88480c6..fe83f5ea5c 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-calendar-channel-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-calendar-channel-view-field-groups.util.ts
@@ -20,14 +20,14 @@ export const computeStandardCalendarChannelViewFieldGroups = (
           isVisible: true,
         },
       }),
-    calendarChannelRecordPageFieldsOther:
+    calendarChannelRecordPageFieldsSystem:
       createStandardViewFieldGroupFlatMetadata({
         ...args,
         objectName: 'calendarChannel',
         context: {
           viewName: 'calendarChannelRecordPageFields',
-          viewFieldGroupName: 'other',
-          name: 'Other',
+          viewFieldGroupName: 'system',
+          name: 'System',
           position: 1,
           isVisible: true,
         },
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-calendar-event-participant-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-calendar-event-participant-view-field-groups.util.ts
index aa70fa1074..082b39bc88 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-calendar-event-participant-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-calendar-event-participant-view-field-groups.util.ts
@@ -23,14 +23,14 @@ export const computeStandardCalendarEventParticipantViewFieldGroups = (
           isVisible: true,
         },
       }),
-    calendarEventParticipantRecordPageFieldsOther:
+    calendarEventParticipantRecordPageFieldsSystem:
       createStandardViewFieldGroupFlatMetadata({
         ...args,
         objectName: 'calendarEventParticipant',
         context: {
           viewName: 'calendarEventParticipantRecordPageFields',
-          viewFieldGroupName: 'other',
-          name: 'Other',
+          viewFieldGroupName: 'system',
+          name: 'System',
           position: 1,
           isVisible: true,
         },
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-company-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-company-view-field-groups.util.ts
index 0d191a3e74..386f08c254 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-company-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-company-view-field-groups.util.ts
@@ -19,29 +19,38 @@ export const computeStandardCompanyViewFieldGroups = (
         isVisible: true,
       },
     }),
-    companyRecordPageFieldsAdditional: createStandardViewFieldGroupFlatMetadata(
-      {
-        ...args,
-        objectName: 'company',
-        context: {
-          viewName: 'companyRecordPageFields',
-          viewFieldGroupName: 'additional',
-          name: 'Additional',
-          position: 1,
-          isVisible: true,
-        },
-      },
-    ),
-    companyRecordPageFieldsOther: createStandardViewFieldGroupFlatMetadata({
+    companyRecordPageFieldsBusiness: createStandardViewFieldGroupFlatMetadata({
       ...args,
       objectName: 'company',
       context: {
         viewName: 'companyRecordPageFields',
-        viewFieldGroupName: 'other',
-        name: 'Other',
+        viewFieldGroupName: 'business',
+        name: 'Business',
+        position: 1,
+        isVisible: true,
+      },
+    }),
+    companyRecordPageFieldsContact: createStandardViewFieldGroupFlatMetadata({
+      ...args,
+      objectName: 'company',
+      context: {
+        viewName: 'companyRecordPageFields',
+        viewFieldGroupName: 'contact',
+        name: 'Contact',
         position: 2,
         isVisible: true,
       },
     }),
+    companyRecordPageFieldsSystem: createStandardViewFieldGroupFlatMetadata({
+      ...args,
+      objectName: 'company',
+      context: {
+        viewName: 'companyRecordPageFields',
+        viewFieldGroupName: 'system',
+        name: 'System',
+        position: 3,
+        isVisible: true,
+      },
+    }),
   };
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-connected-account-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-connected-account-view-field-groups.util.ts
index 3e439c55a3..035695f8e9 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-connected-account-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-connected-account-view-field-groups.util.ts
@@ -20,14 +20,14 @@ export const computeStandardConnectedAccountViewFieldGroups = (
           isVisible: true,
         },
       }),
-    connectedAccountRecordPageFieldsOther:
+    connectedAccountRecordPageFieldsSystem:
       createStandardViewFieldGroupFlatMetadata({
         ...args,
         objectName: 'connectedAccount',
         context: {
           viewName: 'connectedAccountRecordPageFields',
-          viewFieldGroupName: 'other',
-          name: 'Other',
+          viewFieldGroupName: 'system',
+          name: 'System',
           position: 1,
           isVisible: true,
         },
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-favorite-folder-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-favorite-folder-view-field-groups.util.ts
index edead6a2eb..1a9e540530 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-favorite-folder-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-favorite-folder-view-field-groups.util.ts
@@ -20,14 +20,14 @@ export const computeStandardFavoriteFolderViewFieldGroups = (
           isVisible: true,
         },
       }),
-    favoriteFolderRecordPageFieldsOther:
+    favoriteFolderRecordPageFieldsSystem:
       createStandardViewFieldGroupFlatMetadata({
         ...args,
         objectName: 'favoriteFolder',
         context: {
           viewName: 'favoriteFolderRecordPageFields',
-          viewFieldGroupName: 'other',
-          name: 'Other',
+          viewFieldGroupName: 'system',
+          name: 'System',
           position: 1,
           isVisible: true,
         },
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-favorite-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-favorite-view-field-groups.util.ts
index 582914bee8..b54bc35c8f 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-favorite-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-favorite-view-field-groups.util.ts
@@ -19,13 +19,13 @@ export const computeStandardFavoriteViewFieldGroups = (
         isVisible: true,
       },
     }),
-    favoriteRecordPageFieldsOther: createStandardViewFieldGroupFlatMetadata({
+    favoriteRecordPageFieldsSystem: createStandardViewFieldGroupFlatMetadata({
       ...args,
       objectName: 'favorite',
       context: {
         viewName: 'favoriteRecordPageFields',
-        viewFieldGroupName: 'other',
-        name: 'Other',
+        viewFieldGroupName: 'system',
+        name: 'System',
         position: 1,
         isVisible: true,
       },
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-channel-message-association-message-folder-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-channel-message-association-message-folder-view-field-groups.util.ts
index 5d39b24519..9c422ada5c 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-channel-message-association-message-folder-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-channel-message-association-message-folder-view-field-groups.util.ts
@@ -25,15 +25,15 @@ export const computeStandardMessageChannelMessageAssociationMessageFolderViewFie
             isVisible: true,
           },
         }),
-      messageChannelMessageAssociationMessageFolderRecordPageFieldsOther:
+      messageChannelMessageAssociationMessageFolderRecordPageFieldsSystem:
         createStandardViewFieldGroupFlatMetadata({
           ...args,
           objectName: 'messageChannelMessageAssociationMessageFolder',
           context: {
             viewName:
               'messageChannelMessageAssociationMessageFolderRecordPageFields',
-            viewFieldGroupName: 'other',
-            name: 'Other',
+            viewFieldGroupName: 'system',
+            name: 'System',
             position: 1,
             isVisible: true,
           },
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-channel-message-association-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-channel-message-association-view-field-groups.util.ts
index a128341003..ed74b86e26 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-channel-message-association-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-channel-message-association-view-field-groups.util.ts
@@ -23,14 +23,14 @@ export const computeStandardMessageChannelMessageAssociationViewFieldGroups = (
           isVisible: true,
         },
       }),
-    messageChannelMessageAssociationRecordPageFieldsOther:
+    messageChannelMessageAssociationRecordPageFieldsSystem:
       createStandardViewFieldGroupFlatMetadata({
         ...args,
         objectName: 'messageChannelMessageAssociation',
         context: {
           viewName: 'messageChannelMessageAssociationRecordPageFields',
-          viewFieldGroupName: 'other',
-          name: 'Other',
+          viewFieldGroupName: 'system',
+          name: 'System',
           position: 1,
           isVisible: true,
         },
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-channel-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-channel-view-field-groups.util.ts
index 1c7d3042ab..4ee77fee67 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-channel-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-channel-view-field-groups.util.ts
@@ -20,14 +20,14 @@ export const computeStandardMessageChannelViewFieldGroups = (
           isVisible: true,
         },
       }),
-    messageChannelRecordPageFieldsOther:
+    messageChannelRecordPageFieldsSystem:
       createStandardViewFieldGroupFlatMetadata({
         ...args,
         objectName: 'messageChannel',
         context: {
           viewName: 'messageChannelRecordPageFields',
-          viewFieldGroupName: 'other',
-          name: 'Other',
+          viewFieldGroupName: 'system',
+          name: 'System',
           position: 1,
           isVisible: true,
         },
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-folder-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-folder-view-field-groups.util.ts
index 00b7222e3e..fc4d12aa7a 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-folder-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-folder-view-field-groups.util.ts
@@ -20,14 +20,14 @@ export const computeStandardMessageFolderViewFieldGroups = (
           isVisible: true,
         },
       }),
-    messageFolderRecordPageFieldsOther:
+    messageFolderRecordPageFieldsSystem:
       createStandardViewFieldGroupFlatMetadata({
         ...args,
         objectName: 'messageFolder',
         context: {
           viewName: 'messageFolderRecordPageFields',
-          viewFieldGroupName: 'other',
-          name: 'Other',
+          viewFieldGroupName: 'system',
+          name: 'System',
           position: 1,
           isVisible: true,
         },
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-participant-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-participant-view-field-groups.util.ts
index 0d4496c7d6..e4037f88f6 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-participant-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-message-participant-view-field-groups.util.ts
@@ -20,14 +20,14 @@ export const computeStandardMessageParticipantViewFieldGroups = (
           isVisible: true,
         },
       }),
-    messageParticipantRecordPageFieldsOther:
+    messageParticipantRecordPageFieldsSystem:
       createStandardViewFieldGroupFlatMetadata({
         ...args,
         objectName: 'messageParticipant',
         context: {
           viewName: 'messageParticipantRecordPageFields',
-          viewFieldGroupName: 'other',
-          name: 'Other',
+          viewFieldGroupName: 'system',
+          name: 'System',
           position: 1,
           isVisible: true,
         },
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-note-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-note-view-field-groups.util.ts
index 194bc65110..a4cf0dfd6a 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-note-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-note-view-field-groups.util.ts
@@ -19,27 +19,16 @@ export const computeStandardNoteViewFieldGroups = (
         isVisible: true,
       },
     }),
-    noteRecordPageFieldsAdditional: createStandardViewFieldGroupFlatMetadata({
+    noteRecordPageFieldsSystem: createStandardViewFieldGroupFlatMetadata({
       ...args,
       objectName: 'note',
       context: {
         viewName: 'noteRecordPageFields',
-        viewFieldGroupName: 'additional',
-        name: 'Additional',
+        viewFieldGroupName: 'system',
+        name: 'System',
         position: 1,
         isVisible: true,
       },
     }),
-    noteRecordPageFieldsOther: createStandardViewFieldGroupFlatMetadata({
-      ...args,
-      objectName: 'note',
-      context: {
-        viewName: 'noteRecordPageFields',
-        viewFieldGroupName: 'other',
-        name: 'Other',
-        position: 2,
-        isVisible: true,
-      },
-    }),
   };
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-opportunity-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-opportunity-view-field-groups.util.ts
index 1073e63c94..425892f914 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-opportunity-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-opportunity-view-field-groups.util.ts
@@ -8,40 +8,41 @@ export const computeStandardOpportunityViewFieldGroups = (
   args: Omit<CreateStandardViewFieldGroupArgs<'opportunity'>, 'context'>,
 ): Record<string, FlatViewFieldGroup> => {
   return {
-    opportunityRecordPageFieldsGeneral:
-      createStandardViewFieldGroupFlatMetadata({
-        ...args,
-        objectName: 'opportunity',
-        context: {
-          viewName: 'opportunityRecordPageFields',
-          viewFieldGroupName: 'general',
-          name: 'General',
-          position: 0,
-          isVisible: true,
-        },
-      }),
-    opportunityRecordPageFieldsAdditional:
-      createStandardViewFieldGroupFlatMetadata({
-        ...args,
-        objectName: 'opportunity',
-        context: {
-          viewName: 'opportunityRecordPageFields',
-          viewFieldGroupName: 'additional',
-          name: 'Additional',
-          position: 1,
-          isVisible: true,
-        },
-      }),
-    opportunityRecordPageFieldsOther: createStandardViewFieldGroupFlatMetadata({
+    opportunityRecordPageFieldsDeal: createStandardViewFieldGroupFlatMetadata({
       ...args,
       objectName: 'opportunity',
       context: {
         viewName: 'opportunityRecordPageFields',
-        viewFieldGroupName: 'other',
-        name: 'Other',
-        position: 2,
+        viewFieldGroupName: 'deal',
+        name: 'Deal',
+        position: 0,
         isVisible: true,
       },
     }),
+    opportunityRecordPageFieldsRelations:
+      createStandardViewFieldGroupFlatMetadata({
+        ...args,
+        objectName: 'opportunity',
+        context: {
+          viewName: 'opportunityRecordPageFields',
+          viewFieldGroupName: 'relations',
+          name: 'Relations',
+          position: 1,
+          isVisible: true,
+        },
+      }),
+    opportunityRecordPageFieldsSystem: createStandardViewFieldGroupFlatMetadata(
+      {
+        ...args,
+        objectName: 'opportunity',
+        context: {
+          viewName: 'opportunityRecordPageFields',
+          viewFieldGroupName: 'system',
+          name: 'System',
+          position: 2,
+          isVisible: true,
+        },
+      },
+    ),
   };
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-person-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-person-view-field-groups.util.ts
index 6bde611a71..6a477293f4 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-person-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-person-view-field-groups.util.ts
@@ -19,27 +19,38 @@ export const computeStandardPersonViewFieldGroups = (
         isVisible: true,
       },
     }),
-    personRecordPageFieldsAdditional: createStandardViewFieldGroupFlatMetadata({
+    personRecordPageFieldsWork: createStandardViewFieldGroupFlatMetadata({
       ...args,
       objectName: 'person',
       context: {
         viewName: 'personRecordPageFields',
-        viewFieldGroupName: 'additional',
-        name: 'Additional',
+        viewFieldGroupName: 'work',
+        name: 'Work',
         position: 1,
         isVisible: true,
       },
     }),
-    personRecordPageFieldsOther: createStandardViewFieldGroupFlatMetadata({
+    personRecordPageFieldsSocial: createStandardViewFieldGroupFlatMetadata({
       ...args,
       objectName: 'person',
       context: {
         viewName: 'personRecordPageFields',
-        viewFieldGroupName: 'other',
-        name: 'Other',
+        viewFieldGroupName: 'social',
+        name: 'Social',
         position: 2,
         isVisible: true,
       },
     }),
+    personRecordPageFieldsSystem: createStandardViewFieldGroupFlatMetadata({
+      ...args,
+      objectName: 'person',
+      context: {
+        viewName: 'personRecordPageFields',
+        viewFieldGroupName: 'system',
+        name: 'System',
+        position: 3,
+        isVisible: true,
+      },
+    }),
   };
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-task-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-task-view-field-groups.util.ts
index 5633926886..41512cb142 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-task-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-task-view-field-groups.util.ts
@@ -19,27 +19,16 @@ export const computeStandardTaskViewFieldGroups = (
         isVisible: true,
       },
     }),
-    taskRecordPageFieldsAdditional: createStandardViewFieldGroupFlatMetadata({
+    taskRecordPageFieldsSystem: createStandardViewFieldGroupFlatMetadata({
       ...args,
       objectName: 'task',
       context: {
         viewName: 'taskRecordPageFields',
-        viewFieldGroupName: 'additional',
-        name: 'Additional',
+        viewFieldGroupName: 'system',
+        name: 'System',
         position: 1,
         isVisible: true,
       },
     }),
-    taskRecordPageFieldsOther: createStandardViewFieldGroupFlatMetadata({
-      ...args,
-      objectName: 'task',
-      context: {
-        viewName: 'taskRecordPageFields',
-        viewFieldGroupName: 'other',
-        name: 'Other',
-        position: 2,
-        isVisible: true,
-      },
-    }),
   };
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-workflow-automated-trigger-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-workflow-automated-trigger-view-field-groups.util.ts
index 5020a904f6..1a4f212afa 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-workflow-automated-trigger-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-workflow-automated-trigger-view-field-groups.util.ts
@@ -23,14 +23,14 @@ export const computeStandardWorkflowAutomatedTriggerViewFieldGroups = (
           isVisible: true,
         },
       }),
-    workflowAutomatedTriggerRecordPageFieldsOther:
+    workflowAutomatedTriggerRecordPageFieldsSystem:
       createStandardViewFieldGroupFlatMetadata({
         ...args,
         objectName: 'workflowAutomatedTrigger',
         context: {
           viewName: 'workflowAutomatedTriggerRecordPageFields',
-          viewFieldGroupName: 'other',
-          name: 'Other',
+          viewFieldGroupName: 'system',
+          name: 'System',
           position: 1,
           isVisible: true,
         },
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-workflow-run-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-workflow-run-view-field-groups.util.ts
index 45fe2352ca..a060621727 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-workflow-run-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-workflow-run-view-field-groups.util.ts
@@ -20,28 +20,18 @@ export const computeStandardWorkflowRunViewFieldGroups = (
           isVisible: true,
         },
       }),
-    workflowRunRecordPageFieldsAdditional:
-      createStandardViewFieldGroupFlatMetadata({
+    workflowRunRecordPageFieldsSystem: createStandardViewFieldGroupFlatMetadata(
+      {
         ...args,
         objectName: 'workflowRun',
         context: {
           viewName: 'workflowRunRecordPageFields',
-          viewFieldGroupName: 'additional',
-          name: 'Additional',
+          viewFieldGroupName: 'system',
+          name: 'System',
           position: 1,
           isVisible: true,
         },
-      }),
-    workflowRunRecordPageFieldsOther: createStandardViewFieldGroupFlatMetadata({
-      ...args,
-      objectName: 'workflowRun',
-      context: {
-        viewName: 'workflowRunRecordPageFields',
-        viewFieldGroupName: 'other',
-        name: 'Other',
-        position: 2,
-        isVisible: true,
       },
-    }),
+    ),
   };
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-workflow-version-view-field-groups.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-workflow-version-view-field-groups.util.ts
index ac9d5d7e71..bf7b35ea88 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-workflow-version-view-field-groups.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field-group/compute-standard-workflow-version-view-field-groups.util.ts
@@ -20,29 +20,17 @@ export const computeStandardWorkflowVersionViewFieldGroups = (
           isVisible: true,
         },
       }),
-    workflowVersionRecordPageFieldsAdditional:
+    workflowVersionRecordPageFieldsSystem:
       createStandardViewFieldGroupFlatMetadata({
         ...args,
         objectName: 'workflowVersion',
         context: {
           viewName: 'workflowVersionRecordPageFields',
-          viewFieldGroupName: 'additional',
-          name: 'Additional',
+          viewFieldGroupName: 'system',
+          name: 'System',
           position: 1,
           isVisible: true,
         },
       }),
-    workflowVersionRecordPageFieldsOther:
-      createStandardViewFieldGroupFlatMetadata({
-        ...args,
-        objectName: 'workflowVersion',
-        context: {
-          viewName: 'workflowVersionRecordPageFields',
-          viewFieldGroupName: 'other',
-          name: 'Other',
-          position: 2,
-          isVisible: true,
-        },
-      }),
   };
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-blocklist-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-blocklist-view-fields.util.ts
index e62660c636..cac37ecb5a 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-blocklist-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-blocklist-view-fields.util.ts
@@ -69,7 +69,7 @@ export const computeStandardBlocklistViewFields = (
         position: 0,
         isVisible: true,
         size: 150,
-        viewFieldGroupName: 'other',
+        viewFieldGroupName: 'system',
       },
     }),
     blocklistRecordPageFieldsCreatedBy: createStandardViewFieldFlatMetadata({
@@ -82,7 +82,7 @@ export const computeStandardBlocklistViewFields = (
         position: 1,
         isVisible: true,
         size: 150,
-        viewFieldGroupName: 'other',
+        viewFieldGroupName: 'system',
       },
     }),
   };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-calendar-channel-event-association-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-calendar-channel-event-association-view-fields.util.ts
index 99bbb62908..5fcbf670a2 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-calendar-channel-event-association-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-calendar-channel-event-association-view-fields.util.ts
@@ -117,7 +117,7 @@ export const computeStandardCalendarChannelEventAssociationViewFields = (
           position: 0,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
     calendarChannelEventAssociationRecordPageFieldsCreatedBy:
@@ -131,7 +131,7 @@ export const computeStandardCalendarChannelEventAssociationViewFields = (
           position: 1,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
   };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-calendar-channel-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-calendar-channel-view-fields.util.ts
index fc019af19d..f56bff725c 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-calendar-channel-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-calendar-channel-view-fields.util.ts
@@ -148,7 +148,7 @@ export const computeStandardCalendarChannelViewFields = (
           position: 0,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
     calendarChannelRecordPageFieldsCreatedBy:
@@ -162,7 +162,7 @@ export const computeStandardCalendarChannelViewFields = (
           position: 1,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
   };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-calendar-event-participant-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-calendar-event-participant-view-fields.util.ts
index 987957a408..e860bfc21f 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-calendar-event-participant-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-calendar-event-participant-view-fields.util.ts
@@ -222,7 +222,7 @@ export const computeStandardCalendarEventParticipantViewFields = (
           position: 0,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
     calendarEventParticipantRecordPageFieldsCreatedBy:
@@ -236,7 +236,7 @@ export const computeStandardCalendarEventParticipantViewFields = (
           position: 1,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
   };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-company-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-company-view-fields.util.ts
index dcef868f4a..1cd76ac131 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-company-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-company-view-fields.util.ts
@@ -139,138 +139,6 @@ export const computeStandardCompanyViewFields = (
         viewFieldGroupName: 'general',
       },
     }),
-    companyRecordPageFieldsAnnualRecurringRevenue:
-      createStandardViewFieldFlatMetadata({
-        ...args,
-        objectName: 'company',
-        context: {
-          viewName: 'companyRecordPageFields',
-          viewFieldName: 'annualRecurringRevenue',
-          fieldName: 'annualRecurringRevenue',
-          position: 2,
-          isVisible: true,
-          size: 150,
-          viewFieldGroupName: 'general',
-        },
-      }),
-    companyRecordPageFieldsIdealCustomerProfile:
-      createStandardViewFieldFlatMetadata({
-        ...args,
-        objectName: 'company',
-        context: {
-          viewName: 'companyRecordPageFields',
-          viewFieldName: 'idealCustomerProfile',
-          fieldName: 'idealCustomerProfile',
-          position: 0,
-          isVisible: false,
-          size: 150,
-          viewFieldGroupName: 'additional',
-        },
-      }),
-    companyRecordPageFieldsEmployees: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'company',
-      context: {
-        viewName: 'companyRecordPageFields',
-        viewFieldName: 'employees',
-        fieldName: 'employees',
-        position: 0,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    companyRecordPageFieldsLinkedinLink: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'company',
-      context: {
-        viewName: 'companyRecordPageFields',
-        viewFieldName: 'linkedinLink',
-        fieldName: 'linkedinLink',
-        position: 1,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    companyRecordPageFieldsXLink: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'company',
-      context: {
-        viewName: 'companyRecordPageFields',
-        viewFieldName: 'xLink',
-        fieldName: 'xLink',
-        position: 2,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    companyRecordPageFieldsAddress: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'company',
-      context: {
-        viewName: 'companyRecordPageFields',
-        viewFieldName: 'address',
-        fieldName: 'address',
-        position: 3,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    companyRecordPageFieldsCreatedAt: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'company',
-      context: {
-        viewName: 'companyRecordPageFields',
-        viewFieldName: 'createdAt',
-        fieldName: 'createdAt',
-        position: 4,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    companyRecordPageFieldsCreatedBy: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'company',
-      context: {
-        viewName: 'companyRecordPageFields',
-        viewFieldName: 'createdBy',
-        fieldName: 'createdBy',
-        position: 5,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    companyRecordPageFieldsUpdatedAt: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'company',
-      context: {
-        viewName: 'companyRecordPageFields',
-        viewFieldName: 'updatedAt',
-        fieldName: 'updatedAt',
-        position: 6,
-        isVisible: false,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    companyRecordPageFieldsUpdatedBy: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'company',
-      context: {
-        viewName: 'companyRecordPageFields',
-        viewFieldName: 'updatedBy',
-        fieldName: 'updatedBy',
-        position: 7,
-        isVisible: false,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
     companyRecordPageFieldsPeople: createStandardViewFieldFlatMetadata({
       ...args,
       objectName: 'company',
@@ -278,7 +146,7 @@ export const computeStandardCompanyViewFields = (
         viewName: 'companyRecordPageFields',
         viewFieldName: 'people',
         fieldName: 'people',
-        position: 4,
+        position: 2,
         isVisible: false,
         size: 150,
         viewFieldGroupName: 'general',
@@ -291,7 +159,7 @@ export const computeStandardCompanyViewFields = (
         viewName: 'companyRecordPageFields',
         viewFieldName: 'taskTargets',
         fieldName: 'taskTargets',
-        position: 5,
+        position: 3,
         isVisible: false,
         size: 150,
         viewFieldGroupName: 'general',
@@ -304,7 +172,7 @@ export const computeStandardCompanyViewFields = (
         viewName: 'companyRecordPageFields',
         viewFieldName: 'noteTargets',
         fieldName: 'noteTargets',
-        position: 6,
+        position: 4,
         isVisible: false,
         size: 150,
         viewFieldGroupName: 'general',
@@ -317,7 +185,7 @@ export const computeStandardCompanyViewFields = (
         viewName: 'companyRecordPageFields',
         viewFieldName: 'opportunities',
         fieldName: 'opportunities',
-        position: 7,
+        position: 5,
         isVisible: false,
         size: 150,
         viewFieldGroupName: 'general',
@@ -330,7 +198,7 @@ export const computeStandardCompanyViewFields = (
         viewName: 'companyRecordPageFields',
         viewFieldName: 'favorites',
         fieldName: 'favorites',
-        position: 8,
+        position: 6,
         isVisible: false,
         size: 150,
         viewFieldGroupName: 'general',
@@ -343,7 +211,7 @@ export const computeStandardCompanyViewFields = (
         viewName: 'companyRecordPageFields',
         viewFieldName: 'attachments',
         fieldName: 'attachments',
-        position: 9,
+        position: 7,
         isVisible: false,
         size: 150,
         viewFieldGroupName: 'general',
@@ -357,11 +225,146 @@ export const computeStandardCompanyViewFields = (
           viewName: 'companyRecordPageFields',
           viewFieldName: 'timelineActivities',
           fieldName: 'timelineActivities',
-          position: 10,
+          position: 8,
           isVisible: false,
           size: 150,
           viewFieldGroupName: 'general',
         },
       }),
+    // Business group
+    companyRecordPageFieldsAnnualRecurringRevenue:
+      createStandardViewFieldFlatMetadata({
+        ...args,
+        objectName: 'company',
+        context: {
+          viewName: 'companyRecordPageFields',
+          viewFieldName: 'annualRecurringRevenue',
+          fieldName: 'annualRecurringRevenue',
+          position: 0,
+          isVisible: true,
+          size: 150,
+          viewFieldGroupName: 'business',
+        },
+      }),
+    companyRecordPageFieldsEmployees: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'company',
+      context: {
+        viewName: 'companyRecordPageFields',
+        viewFieldName: 'employees',
+        fieldName: 'employees',
+        position: 1,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'business',
+      },
+    }),
+    companyRecordPageFieldsIdealCustomerProfile:
+      createStandardViewFieldFlatMetadata({
+        ...args,
+        objectName: 'company',
+        context: {
+          viewName: 'companyRecordPageFields',
+          viewFieldName: 'idealCustomerProfile',
+          fieldName: 'idealCustomerProfile',
+          position: 2,
+          isVisible: true,
+          size: 150,
+          viewFieldGroupName: 'business',
+        },
+      }),
+    // Contact group
+    companyRecordPageFieldsAddress: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'company',
+      context: {
+        viewName: 'companyRecordPageFields',
+        viewFieldName: 'address',
+        fieldName: 'address',
+        position: 0,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'contact',
+      },
+    }),
+    companyRecordPageFieldsLinkedinLink: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'company',
+      context: {
+        viewName: 'companyRecordPageFields',
+        viewFieldName: 'linkedinLink',
+        fieldName: 'linkedinLink',
+        position: 1,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'contact',
+      },
+    }),
+    companyRecordPageFieldsXLink: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'company',
+      context: {
+        viewName: 'companyRecordPageFields',
+        viewFieldName: 'xLink',
+        fieldName: 'xLink',
+        position: 2,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'contact',
+      },
+    }),
+    // System group
+    companyRecordPageFieldsCreatedAt: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'company',
+      context: {
+        viewName: 'companyRecordPageFields',
+        viewFieldName: 'createdAt',
+        fieldName: 'createdAt',
+        position: 0,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'system',
+      },
+    }),
+    companyRecordPageFieldsCreatedBy: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'company',
+      context: {
+        viewName: 'companyRecordPageFields',
+        viewFieldName: 'createdBy',
+        fieldName: 'createdBy',
+        position: 1,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'system',
+      },
+    }),
+    companyRecordPageFieldsUpdatedAt: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'company',
+      context: {
+        viewName: 'companyRecordPageFields',
+        viewFieldName: 'updatedAt',
+        fieldName: 'updatedAt',
+        position: 2,
+        isVisible: false,
+        size: 150,
+        viewFieldGroupName: 'system',
+      },
+    }),
+    companyRecordPageFieldsUpdatedBy: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'company',
+      context: {
+        viewName: 'companyRecordPageFields',
+        viewFieldName: 'updatedBy',
+        fieldName: 'updatedBy',
+        position: 3,
+        isVisible: false,
+        size: 150,
+        viewFieldGroupName: 'system',
+      },
+    }),
   };
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-connected-account-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-connected-account-view-fields.util.ts
index 2f580a432c..c0301c9148 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-connected-account-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-connected-account-view-fields.util.ts
@@ -122,7 +122,7 @@ export const computeStandardConnectedAccountViewFields = (
           position: 0,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
     connectedAccountRecordPageFieldsCreatedBy:
@@ -136,7 +136,7 @@ export const computeStandardConnectedAccountViewFields = (
           position: 1,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
   };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-favorite-folder-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-favorite-folder-view-fields.util.ts
index b6afe41d93..e4cfcfc6ce 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-favorite-folder-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-favorite-folder-view-fields.util.ts
@@ -44,7 +44,7 @@ export const computeStandardFavoriteFolderViewFields = (
           position: 0,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
     favoriteFolderRecordPageFieldsCreatedBy:
@@ -58,7 +58,7 @@ export const computeStandardFavoriteFolderViewFields = (
           position: 1,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
   };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-favorite-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-favorite-view-fields.util.ts
index 9abfd9dc10..61fcc29d1f 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-favorite-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-favorite-view-fields.util.ts
@@ -234,7 +234,7 @@ export const computeStandardFavoriteViewFields = (
         position: 0,
         isVisible: true,
         size: 150,
-        viewFieldGroupName: 'other',
+        viewFieldGroupName: 'system',
       },
     }),
     favoriteRecordPageFieldsCreatedBy: createStandardViewFieldFlatMetadata({
@@ -247,7 +247,7 @@ export const computeStandardFavoriteViewFields = (
         position: 1,
         isVisible: true,
         size: 150,
-        viewFieldGroupName: 'other',
+        viewFieldGroupName: 'system',
       },
     }),
   };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-channel-message-association-message-folder-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-channel-message-association-message-folder-view-fields.util.ts
index 634f54ac29..1a5c12eb58 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-channel-message-association-message-folder-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-channel-message-association-message-folder-view-fields.util.ts
@@ -94,7 +94,7 @@ export const computeStandardMessageChannelMessageAssociationMessageFolderViewFie
             position: 0,
             isVisible: true,
             size: 150,
-            viewFieldGroupName: 'other',
+            viewFieldGroupName: 'system',
           },
         }),
       messageChannelMessageAssociationMessageFolderRecordPageFieldsCreatedBy:
@@ -109,7 +109,7 @@ export const computeStandardMessageChannelMessageAssociationMessageFolderViewFie
             position: 1,
             isVisible: true,
             size: 150,
-            viewFieldGroupName: 'other',
+            viewFieldGroupName: 'system',
           },
         }),
     };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-channel-message-association-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-channel-message-association-view-fields.util.ts
index a8e5c18c71..ac7d9e03b8 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-channel-message-association-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-channel-message-association-view-fields.util.ts
@@ -144,7 +144,7 @@ export const computeStandardMessageChannelMessageAssociationViewFields = (
           position: 0,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
     messageChannelMessageAssociationRecordPageFieldsCreatedBy:
@@ -158,7 +158,7 @@ export const computeStandardMessageChannelMessageAssociationViewFields = (
           position: 1,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
   };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-channel-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-channel-view-fields.util.ts
index f4841aa78e..187486e45f 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-channel-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-channel-view-fields.util.ts
@@ -173,7 +173,7 @@ export const computeStandardMessageChannelViewFields = (
           position: 0,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
     messageChannelRecordPageFieldsCreatedBy:
@@ -187,7 +187,7 @@ export const computeStandardMessageChannelViewFields = (
           position: 1,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
   };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-folder-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-folder-view-fields.util.ts
index 5a00060e7e..0f2a3ab359 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-folder-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-folder-view-fields.util.ts
@@ -121,7 +121,7 @@ export const computeStandardMessageFolderViewFields = (
           position: 0,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       },
     ),
@@ -136,7 +136,7 @@ export const computeStandardMessageFolderViewFields = (
           position: 1,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       },
     ),
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-participant-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-participant-view-fields.util.ts
index 1425677dae..0b6f868944 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-participant-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-participant-view-fields.util.ts
@@ -175,7 +175,7 @@ export const computeStandardMessageParticipantViewFields = (
           position: 0,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
     messageParticipantRecordPageFieldsCreatedBy:
@@ -189,7 +189,7 @@ export const computeStandardMessageParticipantViewFields = (
           position: 1,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
   };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-note-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-note-view-fields.util.ts
index 6f75111de4..0f6686a0eb 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-note-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-note-view-fields.util.ts
@@ -70,6 +70,20 @@ export const computeStandardNoteViewFields = (
     }),
 
     // noteRecordPageFields view fields
+    // General group
+    noteRecordPageFieldsBodyV2: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'note',
+      context: {
+        viewName: 'noteRecordPageFields',
+        viewFieldName: 'bodyV2',
+        fieldName: 'bodyV2',
+        position: 0,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'general',
+      },
+    }),
     noteRecordPageFieldsNoteTargets: createStandardViewFieldFlatMetadata({
       ...args,
       objectName: 'note',
@@ -83,71 +97,6 @@ export const computeStandardNoteViewFields = (
         viewFieldGroupName: 'general',
       },
     }),
-    noteRecordPageFieldsCreatedAt: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'note',
-      context: {
-        viewName: 'noteRecordPageFields',
-        viewFieldName: 'createdAt',
-        fieldName: 'createdAt',
-        position: 0,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    noteRecordPageFieldsCreatedBy: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'note',
-      context: {
-        viewName: 'noteRecordPageFields',
-        viewFieldName: 'createdBy',
-        fieldName: 'createdBy',
-        position: 1,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    noteRecordPageFieldsBodyV2: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'note',
-      context: {
-        viewName: 'noteRecordPageFields',
-        viewFieldName: 'bodyV2',
-        fieldName: 'bodyV2',
-        position: 0,
-        isVisible: false,
-        size: 150,
-        viewFieldGroupName: 'additional',
-      },
-    }),
-    noteRecordPageFieldsUpdatedAt: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'note',
-      context: {
-        viewName: 'noteRecordPageFields',
-        viewFieldName: 'updatedAt',
-        fieldName: 'updatedAt',
-        position: 2,
-        isVisible: false,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    noteRecordPageFieldsUpdatedBy: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'note',
-      context: {
-        viewName: 'noteRecordPageFields',
-        viewFieldName: 'updatedBy',
-        fieldName: 'updatedBy',
-        position: 3,
-        isVisible: false,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
     noteRecordPageFieldsAttachments: createStandardViewFieldFlatMetadata({
       ...args,
       objectName: 'note',
@@ -189,5 +138,58 @@ export const computeStandardNoteViewFields = (
         viewFieldGroupName: 'general',
       },
     }),
+    // System group
+    noteRecordPageFieldsCreatedAt: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'note',
+      context: {
+        viewName: 'noteRecordPageFields',
+        viewFieldName: 'createdAt',
+        fieldName: 'createdAt',
+        position: 0,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'system',
+      },
+    }),
+    noteRecordPageFieldsCreatedBy: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'note',
+      context: {
+        viewName: 'noteRecordPageFields',
+        viewFieldName: 'createdBy',
+        fieldName: 'createdBy',
+        position: 1,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'system',
+      },
+    }),
+    noteRecordPageFieldsUpdatedAt: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'note',
+      context: {
+        viewName: 'noteRecordPageFields',
+        viewFieldName: 'updatedAt',
+        fieldName: 'updatedAt',
+        position: 2,
+        isVisible: false,
+        size: 150,
+        viewFieldGroupName: 'system',
+      },
+    }),
+    noteRecordPageFieldsUpdatedBy: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'note',
+      context: {
+        viewName: 'noteRecordPageFields',
+        viewFieldName: 'updatedBy',
+        fieldName: 'updatedBy',
+        position: 3,
+        isVisible: false,
+        size: 150,
+        viewFieldGroupName: 'system',
+      },
+    }),
   };
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-opportunity-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-opportunity-view-fields.util.ts
index 17e9f2a783..e635ceed30 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-opportunity-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-opportunity-view-fields.util.ts
@@ -161,6 +161,7 @@ export const computeStandardOpportunityViewFields = (
     }),
 
     // opportunityRecordPageFields view fields
+    // Deal group
     opportunityRecordPageFieldsAmount: createStandardViewFieldFlatMetadata({
       ...args,
       objectName: 'opportunity',
@@ -171,20 +172,7 @@ export const computeStandardOpportunityViewFields = (
         position: 0,
         isVisible: true,
         size: 150,
-        viewFieldGroupName: 'general',
-      },
-    }),
-    opportunityRecordPageFieldsCloseDate: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'opportunity',
-      context: {
-        viewName: 'opportunityRecordPageFields',
-        viewFieldName: 'closeDate',
-        fieldName: 'closeDate',
-        position: 1,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'general',
+        viewFieldGroupName: 'deal',
       },
     }),
     opportunityRecordPageFieldsStage: createStandardViewFieldFlatMetadata({
@@ -194,12 +182,98 @@ export const computeStandardOpportunityViewFields = (
         viewName: 'opportunityRecordPageFields',
         viewFieldName: 'stage',
         fieldName: 'stage',
+        position: 1,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'deal',
+      },
+    }),
+    opportunityRecordPageFieldsCloseDate: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'opportunity',
+      context: {
+        viewName: 'opportunityRecordPageFields',
+        viewFieldName: 'closeDate',
+        fieldName: 'closeDate',
         position: 2,
         isVisible: true,
         size: 150,
-        viewFieldGroupName: 'general',
+        viewFieldGroupName: 'deal',
       },
     }),
+    opportunityRecordPageFieldsFavorites: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'opportunity',
+      context: {
+        viewName: 'opportunityRecordPageFields',
+        viewFieldName: 'favorites',
+        fieldName: 'favorites',
+        position: 3,
+        isVisible: false,
+        size: 150,
+        viewFieldGroupName: 'deal',
+      },
+    }),
+    opportunityRecordPageFieldsTaskTargets: createStandardViewFieldFlatMetadata(
+      {
+        ...args,
+        objectName: 'opportunity',
+        context: {
+          viewName: 'opportunityRecordPageFields',
+          viewFieldName: 'taskTargets',
+          fieldName: 'taskTargets',
+          position: 4,
+          isVisible: false,
+          size: 150,
+          viewFieldGroupName: 'deal',
+        },
+      },
+    ),
+    opportunityRecordPageFieldsNoteTargets: createStandardViewFieldFlatMetadata(
+      {
+        ...args,
+        objectName: 'opportunity',
+        context: {
+          viewName: 'opportunityRecordPageFields',
+          viewFieldName: 'noteTargets',
+          fieldName: 'noteTargets',
+          position: 5,
+          isVisible: false,
+          size: 150,
+          viewFieldGroupName: 'deal',
+        },
+      },
+    ),
+    opportunityRecordPageFieldsAttachments: createStandardViewFieldFlatMetadata(
+      {
+        ...args,
+        objectName: 'opportunity',
+        context: {
+          viewName: 'opportunityRecordPageFields',
+          viewFieldName: 'attachments',
+          fieldName: 'attachments',
+          position: 6,
+          isVisible: false,
+          size: 150,
+          viewFieldGroupName: 'deal',
+        },
+      },
+    ),
+    opportunityRecordPageFieldsTimelineActivities:
+      createStandardViewFieldFlatMetadata({
+        ...args,
+        objectName: 'opportunity',
+        context: {
+          viewName: 'opportunityRecordPageFields',
+          viewFieldName: 'timelineActivities',
+          fieldName: 'timelineActivities',
+          position: 7,
+          isVisible: false,
+          size: 150,
+          viewFieldGroupName: 'deal',
+        },
+      }),
+    // Relations group
     opportunityRecordPageFieldsCompany: createStandardViewFieldFlatMetadata({
       ...args,
       objectName: 'opportunity',
@@ -207,10 +281,10 @@ export const computeStandardOpportunityViewFields = (
         viewName: 'opportunityRecordPageFields',
         viewFieldName: 'company',
         fieldName: 'company',
-        position: 3,
+        position: 0,
         isVisible: true,
         size: 150,
-        viewFieldGroupName: 'general',
+        viewFieldGroupName: 'relations',
       },
     }),
     opportunityRecordPageFieldsPointOfContact:
@@ -221,10 +295,10 @@ export const computeStandardOpportunityViewFields = (
           viewName: 'opportunityRecordPageFields',
           viewFieldName: 'pointOfContact',
           fieldName: 'pointOfContact',
-          position: 0,
+          position: 1,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'additional',
+          viewFieldGroupName: 'relations',
         },
       }),
     opportunityRecordPageFieldsOwner: createStandardViewFieldFlatMetadata({
@@ -234,12 +308,13 @@ export const computeStandardOpportunityViewFields = (
         viewName: 'opportunityRecordPageFields',
         viewFieldName: 'owner',
         fieldName: 'owner',
-        position: 1,
+        position: 2,
         isVisible: true,
         size: 150,
-        viewFieldGroupName: 'additional',
+        viewFieldGroupName: 'relations',
       },
     }),
+    // System group
     opportunityRecordPageFieldsCreatedAt: createStandardViewFieldFlatMetadata({
       ...args,
       objectName: 'opportunity',
@@ -250,7 +325,7 @@ export const computeStandardOpportunityViewFields = (
         position: 0,
         isVisible: true,
         size: 150,
-        viewFieldGroupName: 'other',
+        viewFieldGroupName: 'system',
       },
     }),
     opportunityRecordPageFieldsCreatedBy: createStandardViewFieldFlatMetadata({
@@ -263,7 +338,7 @@ export const computeStandardOpportunityViewFields = (
         position: 1,
         isVisible: true,
         size: 150,
-        viewFieldGroupName: 'other',
+        viewFieldGroupName: 'system',
       },
     }),
     opportunityRecordPageFieldsUpdatedAt: createStandardViewFieldFlatMetadata({
@@ -276,7 +351,7 @@ export const computeStandardOpportunityViewFields = (
         position: 2,
         isVisible: false,
         size: 150,
-        viewFieldGroupName: 'other',
+        viewFieldGroupName: 'system',
       },
     }),
     opportunityRecordPageFieldsUpdatedBy: createStandardViewFieldFlatMetadata({
@@ -289,80 +364,8 @@ export const computeStandardOpportunityViewFields = (
         position: 3,
         isVisible: false,
         size: 150,
-        viewFieldGroupName: 'other',
+        viewFieldGroupName: 'system',
       },
     }),
-    opportunityRecordPageFieldsFavorites: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'opportunity',
-      context: {
-        viewName: 'opportunityRecordPageFields',
-        viewFieldName: 'favorites',
-        fieldName: 'favorites',
-        position: 5,
-        isVisible: false,
-        size: 150,
-        viewFieldGroupName: 'general',
-      },
-    }),
-    opportunityRecordPageFieldsTaskTargets: createStandardViewFieldFlatMetadata(
-      {
-        ...args,
-        objectName: 'opportunity',
-        context: {
-          viewName: 'opportunityRecordPageFields',
-          viewFieldName: 'taskTargets',
-          fieldName: 'taskTargets',
-          position: 6,
-          isVisible: false,
-          size: 150,
-          viewFieldGroupName: 'general',
-        },
-      },
-    ),
-    opportunityRecordPageFieldsNoteTargets: createStandardViewFieldFlatMetadata(
-      {
-        ...args,
-        objectName: 'opportunity',
-        context: {
-          viewName: 'opportunityRecordPageFields',
-          viewFieldName: 'noteTargets',
-          fieldName: 'noteTargets',
-          position: 7,
-          isVisible: false,
-          size: 150,
-          viewFieldGroupName: 'general',
-        },
-      },
-    ),
-    opportunityRecordPageFieldsAttachments: createStandardViewFieldFlatMetadata(
-      {
-        ...args,
-        objectName: 'opportunity',
-        context: {
-          viewName: 'opportunityRecordPageFields',
-          viewFieldName: 'attachments',
-          fieldName: 'attachments',
-          position: 8,
-          isVisible: false,
-          size: 150,
-          viewFieldGroupName: 'general',
-        },
-      },
-    ),
-    opportunityRecordPageFieldsTimelineActivities:
-      createStandardViewFieldFlatMetadata({
-        ...args,
-        objectName: 'opportunity',
-        context: {
-          viewName: 'opportunityRecordPageFields',
-          viewFieldName: 'timelineActivities',
-          fieldName: 'timelineActivities',
-          position: 9,
-          isVisible: false,
-          size: 150,
-          viewFieldGroupName: 'general',
-        },
-      }),
   };
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-person-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-person-view-fields.util.ts
index 263ac51994..215fdb614e 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-person-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-person-view-fields.util.ts
@@ -136,6 +136,7 @@ export const computeStandardPersonViewFields = (
     }),
 
     // personRecordPageFields view fields
+    // General group
     personRecordPageFieldsEmails: createStandardViewFieldFlatMetadata({
       ...args,
       objectName: 'person',
@@ -162,58 +163,6 @@ export const computeStandardPersonViewFields = (
         viewFieldGroupName: 'general',
       },
     }),
-    personRecordPageFieldsCompany: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'person',
-      context: {
-        viewName: 'personRecordPageFields',
-        viewFieldName: 'company',
-        fieldName: 'company',
-        position: 2,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'general',
-      },
-    }),
-    personRecordPageFieldsJobTitle: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'person',
-      context: {
-        viewName: 'personRecordPageFields',
-        viewFieldName: 'jobTitle',
-        fieldName: 'jobTitle',
-        position: 3,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'general',
-      },
-    }),
-    personRecordPageFieldsLinkedinLink: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'person',
-      context: {
-        viewName: 'personRecordPageFields',
-        viewFieldName: 'linkedinLink',
-        fieldName: 'linkedinLink',
-        position: 0,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'additional',
-      },
-    }),
-    personRecordPageFieldsXLink: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'person',
-      context: {
-        viewName: 'personRecordPageFields',
-        viewFieldName: 'xLink',
-        fieldName: 'xLink',
-        position: 1,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'additional',
-      },
-    }),
     personRecordPageFieldsCity: createStandardViewFieldFlatMetadata({
       ...args,
       objectName: 'person',
@@ -221,88 +170,10 @@ export const computeStandardPersonViewFields = (
         viewName: 'personRecordPageFields',
         viewFieldName: 'city',
         fieldName: 'city',
-        position: 0,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    personRecordPageFieldsAvatarUrl: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'person',
-      context: {
-        viewName: 'personRecordPageFields',
-        viewFieldName: 'avatarUrl',
-        fieldName: 'avatarUrl',
-        position: 1,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    personRecordPageFieldsCreatedAt: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'person',
-      context: {
-        viewName: 'personRecordPageFields',
-        viewFieldName: 'createdAt',
-        fieldName: 'createdAt',
         position: 2,
         isVisible: true,
         size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    personRecordPageFieldsCreatedBy: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'person',
-      context: {
-        viewName: 'personRecordPageFields',
-        viewFieldName: 'createdBy',
-        fieldName: 'createdBy',
-        position: 3,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    personRecordPageFieldsUpdatedAt: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'person',
-      context: {
-        viewName: 'personRecordPageFields',
-        viewFieldName: 'updatedAt',
-        fieldName: 'updatedAt',
-        position: 4,
-        isVisible: false,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    personRecordPageFieldsUpdatedBy: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'person',
-      context: {
-        viewName: 'personRecordPageFields',
-        viewFieldName: 'updatedBy',
-        fieldName: 'updatedBy',
-        position: 5,
-        isVisible: false,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    personRecordPageFieldsAvatarFile: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'person',
-      context: {
-        viewName: 'personRecordPageFields',
-        viewFieldName: 'avatarFile',
-        fieldName: 'avatarFile',
-        position: 0,
-        isVisible: false,
-        size: 150,
-        viewFieldGroupName: 'additional',
+        viewFieldGroupName: 'general',
       },
     }),
     personRecordPageFieldsPointOfContactForOpportunities:
@@ -313,7 +184,7 @@ export const computeStandardPersonViewFields = (
           viewName: 'personRecordPageFields',
           viewFieldName: 'pointOfContactForOpportunities',
           fieldName: 'pointOfContactForOpportunities',
-          position: 5,
+          position: 3,
           isVisible: false,
           size: 150,
           viewFieldGroupName: 'general',
@@ -326,7 +197,7 @@ export const computeStandardPersonViewFields = (
         viewName: 'personRecordPageFields',
         viewFieldName: 'taskTargets',
         fieldName: 'taskTargets',
-        position: 6,
+        position: 4,
         isVisible: false,
         size: 150,
         viewFieldGroupName: 'general',
@@ -339,7 +210,7 @@ export const computeStandardPersonViewFields = (
         viewName: 'personRecordPageFields',
         viewFieldName: 'noteTargets',
         fieldName: 'noteTargets',
-        position: 7,
+        position: 5,
         isVisible: false,
         size: 150,
         viewFieldGroupName: 'general',
@@ -352,7 +223,7 @@ export const computeStandardPersonViewFields = (
         viewName: 'personRecordPageFields',
         viewFieldName: 'favorites',
         fieldName: 'favorites',
-        position: 8,
+        position: 6,
         isVisible: false,
         size: 150,
         viewFieldGroupName: 'general',
@@ -365,7 +236,7 @@ export const computeStandardPersonViewFields = (
         viewName: 'personRecordPageFields',
         viewFieldName: 'attachments',
         fieldName: 'attachments',
-        position: 9,
+        position: 7,
         isVisible: false,
         size: 150,
         viewFieldGroupName: 'general',
@@ -379,7 +250,7 @@ export const computeStandardPersonViewFields = (
           viewName: 'personRecordPageFields',
           viewFieldName: 'messageParticipants',
           fieldName: 'messageParticipants',
-          position: 10,
+          position: 8,
           isVisible: false,
           size: 150,
           viewFieldGroupName: 'general',
@@ -393,7 +264,7 @@ export const computeStandardPersonViewFields = (
           viewName: 'personRecordPageFields',
           viewFieldName: 'calendarEventParticipants',
           fieldName: 'calendarEventParticipants',
-          position: 11,
+          position: 9,
           isVisible: false,
           size: 150,
           viewFieldGroupName: 'general',
@@ -407,11 +278,144 @@ export const computeStandardPersonViewFields = (
           viewName: 'personRecordPageFields',
           viewFieldName: 'timelineActivities',
           fieldName: 'timelineActivities',
-          position: 12,
+          position: 10,
           isVisible: false,
           size: 150,
           viewFieldGroupName: 'general',
         },
       }),
+    personRecordPageFieldsAvatarFile: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'person',
+      context: {
+        viewName: 'personRecordPageFields',
+        viewFieldName: 'avatarFile',
+        fieldName: 'avatarFile',
+        position: 11,
+        isVisible: false,
+        size: 150,
+        viewFieldGroupName: 'general',
+      },
+    }),
+    personRecordPageFieldsAvatarUrl: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'person',
+      context: {
+        viewName: 'personRecordPageFields',
+        viewFieldName: 'avatarUrl',
+        fieldName: 'avatarUrl',
+        position: 12,
+        isVisible: false,
+        size: 150,
+        viewFieldGroupName: 'general',
+      },
+    }),
+    // Work group
+    personRecordPageFieldsCompany: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'person',
+      context: {
+        viewName: 'personRecordPageFields',
+        viewFieldName: 'company',
+        fieldName: 'company',
+        position: 0,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'work',
+      },
+    }),
+    personRecordPageFieldsJobTitle: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'person',
+      context: {
+        viewName: 'personRecordPageFields',
+        viewFieldName: 'jobTitle',
+        fieldName: 'jobTitle',
+        position: 1,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'work',
+      },
+    }),
+    // Social group
+    personRecordPageFieldsLinkedinLink: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'person',
+      context: {
+        viewName: 'personRecordPageFields',
+        viewFieldName: 'linkedinLink',
+        fieldName: 'linkedinLink',
+        position: 0,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'social',
+      },
+    }),
+    personRecordPageFieldsXLink: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'person',
+      context: {
+        viewName: 'personRecordPageFields',
+        viewFieldName: 'xLink',
+        fieldName: 'xLink',
+        position: 1,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'social',
+      },
+    }),
+    // System group
+    personRecordPageFieldsCreatedAt: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'person',
+      context: {
+        viewName: 'personRecordPageFields',
+        viewFieldName: 'createdAt',
+        fieldName: 'createdAt',
+        position: 0,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'system',
+      },
+    }),
+    personRecordPageFieldsCreatedBy: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'person',
+      context: {
+        viewName: 'personRecordPageFields',
+        viewFieldName: 'createdBy',
+        fieldName: 'createdBy',
+        position: 1,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'system',
+      },
+    }),
+    personRecordPageFieldsUpdatedAt: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'person',
+      context: {
+        viewName: 'personRecordPageFields',
+        viewFieldName: 'updatedAt',
+        fieldName: 'updatedAt',
+        position: 2,
+        isVisible: false,
+        size: 150,
+        viewFieldGroupName: 'system',
+      },
+    }),
+    personRecordPageFieldsUpdatedBy: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'person',
+      context: {
+        viewName: 'personRecordPageFields',
+        viewFieldName: 'updatedBy',
+        fieldName: 'updatedBy',
+        position: 3,
+        isVisible: false,
+        size: 150,
+        viewFieldGroupName: 'system',
+      },
+    }),
   };
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-task-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-task-view-fields.util.ts
index 9938300d55..9904f23615 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-task-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-task-view-fields.util.ts
@@ -255,6 +255,7 @@ export const computeStandardTaskViewFields = (
     }),
 
     // taskRecordPageFields view fields
+    // General group
     taskRecordPageFieldsDueAt: createStandardViewFieldFlatMetadata({
       ...args,
       objectName: 'task',
@@ -262,7 +263,7 @@ export const computeStandardTaskViewFields = (
         viewName: 'taskRecordPageFields',
         viewFieldName: 'dueAt',
         fieldName: 'dueAt',
-        position: 1,
+        position: 0,
         isVisible: true,
         size: 150,
         viewFieldGroupName: 'general',
@@ -275,7 +276,7 @@ export const computeStandardTaskViewFields = (
         viewName: 'taskRecordPageFields',
         viewFieldName: 'status',
         fieldName: 'status',
-        position: 2,
+        position: 1,
         isVisible: true,
         size: 150,
         viewFieldGroupName: 'general',
@@ -288,6 +289,19 @@ export const computeStandardTaskViewFields = (
         viewName: 'taskRecordPageFields',
         viewFieldName: 'assignee',
         fieldName: 'assignee',
+        position: 2,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'general',
+      },
+    }),
+    taskRecordPageFieldsBodyV2: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'task',
+      context: {
+        viewName: 'taskRecordPageFields',
+        viewFieldName: 'bodyV2',
+        fieldName: 'bodyV2',
         position: 3,
         isVisible: true,
         size: 150,
@@ -307,71 +321,6 @@ export const computeStandardTaskViewFields = (
         viewFieldGroupName: 'general',
       },
     }),
-    taskRecordPageFieldsCreatedAt: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'task',
-      context: {
-        viewName: 'taskRecordPageFields',
-        viewFieldName: 'createdAt',
-        fieldName: 'createdAt',
-        position: 0,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    taskRecordPageFieldsCreatedBy: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'task',
-      context: {
-        viewName: 'taskRecordPageFields',
-        viewFieldName: 'createdBy',
-        fieldName: 'createdBy',
-        position: 1,
-        isVisible: true,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    taskRecordPageFieldsBodyV2: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'task',
-      context: {
-        viewName: 'taskRecordPageFields',
-        viewFieldName: 'bodyV2',
-        fieldName: 'bodyV2',
-        position: 0,
-        isVisible: false,
-        size: 150,
-        viewFieldGroupName: 'additional',
-      },
-    }),
-    taskRecordPageFieldsUpdatedAt: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'task',
-      context: {
-        viewName: 'taskRecordPageFields',
-        viewFieldName: 'updatedAt',
-        fieldName: 'updatedAt',
-        position: 2,
-        isVisible: false,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
-    taskRecordPageFieldsUpdatedBy: createStandardViewFieldFlatMetadata({
-      ...args,
-      objectName: 'task',
-      context: {
-        viewName: 'taskRecordPageFields',
-        viewFieldName: 'updatedBy',
-        fieldName: 'updatedBy',
-        position: 3,
-        isVisible: false,
-        size: 150,
-        viewFieldGroupName: 'other',
-      },
-    }),
     taskRecordPageFieldsAttachments: createStandardViewFieldFlatMetadata({
       ...args,
       objectName: 'task',
@@ -413,5 +362,58 @@ export const computeStandardTaskViewFields = (
         viewFieldGroupName: 'general',
       },
     }),
+    // System group
+    taskRecordPageFieldsCreatedAt: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'task',
+      context: {
+        viewName: 'taskRecordPageFields',
+        viewFieldName: 'createdAt',
+        fieldName: 'createdAt',
+        position: 0,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'system',
+      },
+    }),
+    taskRecordPageFieldsCreatedBy: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'task',
+      context: {
+        viewName: 'taskRecordPageFields',
+        viewFieldName: 'createdBy',
+        fieldName: 'createdBy',
+        position: 1,
+        isVisible: true,
+        size: 150,
+        viewFieldGroupName: 'system',
+      },
+    }),
+    taskRecordPageFieldsUpdatedAt: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'task',
+      context: {
+        viewName: 'taskRecordPageFields',
+        viewFieldName: 'updatedAt',
+        fieldName: 'updatedAt',
+        position: 2,
+        isVisible: false,
+        size: 150,
+        viewFieldGroupName: 'system',
+      },
+    }),
+    taskRecordPageFieldsUpdatedBy: createStandardViewFieldFlatMetadata({
+      ...args,
+      objectName: 'task',
+      context: {
+        viewName: 'taskRecordPageFields',
+        viewFieldName: 'updatedBy',
+        fieldName: 'updatedBy',
+        position: 3,
+        isVisible: false,
+        size: 150,
+        viewFieldGroupName: 'system',
+      },
+    }),
   };
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-workflow-automated-trigger-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-workflow-automated-trigger-view-fields.util.ts
index a0ae428b5c..baa5110761 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-workflow-automated-trigger-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-workflow-automated-trigger-view-fields.util.ts
@@ -87,7 +87,7 @@ export const computeStandardWorkflowAutomatedTriggerViewFields = (
           position: 0,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
     workflowAutomatedTriggerRecordPageFieldsCreatedBy:
@@ -101,7 +101,7 @@ export const computeStandardWorkflowAutomatedTriggerViewFields = (
           position: 1,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
   };
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-workflow-run-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-workflow-run-view-fields.util.ts
index 11870367f6..cee0673555 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-workflow-run-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-workflow-run-view-fields.util.ts
@@ -122,7 +122,7 @@ export const computeStandardWorkflowRunViewFields = (
         position: 0,
         isVisible: true,
         size: 150,
-        viewFieldGroupName: 'other',
+        viewFieldGroupName: 'system',
       },
     }),
     workflowRunRecordPageFieldsCreatedBy: createStandardViewFieldFlatMetadata({
@@ -135,7 +135,7 @@ export const computeStandardWorkflowRunViewFields = (
         position: 1,
         isVisible: true,
         size: 150,
-        viewFieldGroupName: 'other',
+        viewFieldGroupName: 'system',
       },
     }),
     workflowRunRecordPageFieldsEnqueuedAt: createStandardViewFieldFlatMetadata({
@@ -145,10 +145,10 @@ export const computeStandardWorkflowRunViewFields = (
         viewName: 'workflowRunRecordPageFields',
         viewFieldName: 'enqueuedAt',
         fieldName: 'enqueuedAt',
-        position: 0,
+        position: 9,
         isVisible: false,
         size: 150,
-        viewFieldGroupName: 'additional',
+        viewFieldGroupName: 'general',
       },
     }),
     workflowRunRecordPageFieldsState: createStandardViewFieldFlatMetadata({
@@ -174,7 +174,7 @@ export const computeStandardWorkflowRunViewFields = (
         position: 2,
         isVisible: false,
         size: 150,
-        viewFieldGroupName: 'other',
+        viewFieldGroupName: 'system',
       },
     }),
     workflowRunRecordPageFieldsUpdatedBy: createStandardViewFieldFlatMetadata({
@@ -187,7 +187,7 @@ export const computeStandardWorkflowRunViewFields = (
         position: 3,
         isVisible: false,
         size: 150,
-        viewFieldGroupName: 'other',
+        viewFieldGroupName: 'system',
       },
     }),
     workflowRunRecordPageFieldsFavorites: createStandardViewFieldFlatMetadata({
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-workflow-version-view-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-workflow-version-view-fields.util.ts
index 2ec02e5c40..1cb3dc75cf 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-workflow-version-view-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-workflow-version-view-fields.util.ts
@@ -123,7 +123,7 @@ export const computeStandardWorkflowVersionViewFields = (
           position: 0,
           isVisible: true,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
     workflowVersionRecordPageFieldsSteps: createStandardViewFieldFlatMetadata({
@@ -133,10 +133,10 @@ export const computeStandardWorkflowVersionViewFields = (
         viewName: 'workflowVersionRecordPageFields',
         viewFieldName: 'steps',
         fieldName: 'steps',
-        position: 0,
+        position: 7,
         isVisible: false,
         size: 150,
-        viewFieldGroupName: 'additional',
+        viewFieldGroupName: 'general',
       },
     }),
     workflowVersionRecordPageFieldsCreatedBy:
@@ -150,7 +150,7 @@ export const computeStandardWorkflowVersionViewFields = (
           position: 1,
           isVisible: false,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
     workflowVersionRecordPageFieldsUpdatedAt:
@@ -164,7 +164,7 @@ export const computeStandardWorkflowVersionViewFields = (
           position: 2,
           isVisible: false,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
     workflowVersionRecordPageFieldsUpdatedBy:
@@ -178,7 +178,7 @@ export const computeStandardWorkflowVersionViewFields = (
           position: 3,
           isVisible: false,
           size: 150,
-          viewFieldGroupName: 'other',
+          viewFieldGroupName: 'system',
         },
       }),
     workflowVersionRecordPageFieldsRuns: createStandardViewFieldFlatMetadata({
diff --git a/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts b/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts
index 41ba766a83..398c574bf9 100644
--- a/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts
+++ b/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts
@@ -183,7 +183,7 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: '94009e34-52fb-4534-89ce-6c6d0a774056',
           },
-          other: {
+          system: {
             universalIdentifier: '35dace44-6e63-4cdb-b761-a92bcf126a7e',
           },
         },
@@ -273,7 +273,7 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: '9c27f771-9f85-492f-b1f1-9bc7a175f6f3',
           },
-          other: {
+          system: {
             universalIdentifier: 'c7b18e05-dd60-4ee4-911a-290790e8c425',
           },
         },
@@ -394,7 +394,7 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: 'e015afb4-bb6b-44ab-8077-01196c70bd1b',
           },
-          other: {
+          system: {
             universalIdentifier: 'a7e61a73-68b3-46a2-8624-54a4f0a81710',
           },
         },
@@ -517,7 +517,7 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: '3d842777-436e-467d-90ae-9e1fa0aa7e9c',
           },
-          other: {
+          system: {
             universalIdentifier: '098836d8-15c1-44c1-a58e-2ff7fd6a05f9',
           },
         },
@@ -761,12 +761,15 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: '20202020-a001-4a01-8a01-c0aba11c1101',
           },
-          additional: {
+          business: {
             universalIdentifier: '20202020-a001-4a01-8a01-c0aba11c1102',
           },
-          other: {
+          contact: {
             universalIdentifier: '20202020-a001-4a01-8a01-c0aba11c1103',
           },
+          system: {
+            universalIdentifier: '20202020-a001-4a01-8a01-c0aba11c1104',
+          },
         },
         viewFields: {
           domainName: {
@@ -927,7 +930,7 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: '428a9949-71f4-4ebf-9160-1da43f1113ff',
           },
-          other: {
+          system: {
             universalIdentifier: 'ce9f7f72-583e-4415-a82f-e1f4b2cc8e2f',
           },
         },
@@ -1135,7 +1138,7 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: 'd08267ae-eb74-4ed5-884e-4015d16d962d',
           },
-          other: {
+          system: {
             universalIdentifier: 'bbbca990-4876-4802-bf7e-94f685bd5f52',
           },
         },
@@ -1223,7 +1226,7 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: 'c0af3a9b-38bc-4c19-a79d-910f35d6f766',
           },
-          other: {
+          system: {
             universalIdentifier: 'a7db50c7-826a-41ed-a252-1a07d445b025',
           },
         },
@@ -1325,7 +1328,7 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: '86d7066c-ba38-4f6a-996f-77345bedd549',
           },
-          other: {
+          system: {
             universalIdentifier: '6044c58c-a63c-4f3f-a283-b8803553628f',
           },
         },
@@ -1418,7 +1421,7 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: '4928521b-ae24-4013-a69a-1392017d57af',
           },
-          other: {
+          system: {
             universalIdentifier: 'b76cebb3-39b2-477a-9212-8bf1190227a4',
           },
         },
@@ -1555,7 +1558,7 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: '96113215-6bf2-476c-ae69-c70274257913',
           },
-          other: {
+          system: {
             universalIdentifier: '2f08a624-e1a7-4f79-b5f7-1a8e92f4c07e',
           },
         },
@@ -1665,7 +1668,7 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: 'c55a9366-bb2c-4ae7-8345-115c790f56b1',
           },
-          other: {
+          system: {
             universalIdentifier: '51b6af5e-9f76-4fb2-811b-6193761d7702',
           },
         },
@@ -1777,7 +1780,7 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: '41c18430-34c3-430f-b86b-fc3963281277',
           },
-          other: {
+          system: {
             universalIdentifier: 'add21830-a7c6-4cde-9eed-430afbcbf557',
           },
         },
@@ -2013,10 +2016,7 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: '20202020-a005-4a05-8a05-a0be5a115101',
           },
-          additional: {
-            universalIdentifier: '20202020-a005-4a05-8a05-a0be5a115102',
-          },
-          other: {
+          system: {
             universalIdentifier: '20202020-a005-4a05-8a05-a0be5a115103',
           },
         },
@@ -2261,13 +2261,13 @@ export const STANDARD_OBJECTS = {
       opportunityRecordPageFields: {
         universalIdentifier: '20202020-a003-4a03-8a03-0aa0b1ca3001',
         viewFieldGroups: {
-          general: {
+          deal: {
             universalIdentifier: '20202020-a003-4a03-8a03-0aa0b1ca3101',
           },
-          additional: {
+          relations: {
             universalIdentifier: '20202020-a003-4a03-8a03-0aa0b1ca3102',
           },
-          other: {
+          system: {
             universalIdentifier: '20202020-a003-4a03-8a03-0aa0b1ca3103',
           },
         },
@@ -2438,12 +2438,15 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: '20202020-a002-4a02-8a02-ae0a1ea12101',
           },
-          additional: {
+          work: {
             universalIdentifier: '20202020-a002-4a02-8a02-ae0a1ea12102',
           },
-          other: {
+          social: {
             universalIdentifier: '20202020-a002-4a02-8a02-ae0a1ea12103',
           },
+          system: {
+            universalIdentifier: '20202020-a002-4a02-8a02-ae0a1ea12104',
+          },
         },
         viewFields: {
           emails: {
@@ -2674,10 +2677,7 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: '20202020-a006-4a06-8a06-ba5ca11a6101',
           },
-          additional: {
-            universalIdentifier: '20202020-a006-4a06-8a06-ba5ca11a6102',
-          },
-          other: {
+          system: {
             universalIdentifier: '20202020-a006-4a06-8a06-ba5ca11a6103',
           },
         },
@@ -3092,7 +3092,7 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: 'c5261eae-f2fe-416e-8ef9-eda5d377f8ca',
           },
-          other: {
+          system: {
             universalIdentifier: 'e6da0410-7f63-41b7-b977-421fc37d67f5',
           },
         },
@@ -3243,10 +3243,7 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: '20202020-a011-4a11-8a11-a0bcf10abcf2',
           },
-          additional: {
-            universalIdentifier: '20202020-a011-4a11-8a11-a0bcf10abcf3',
-          },
-          other: {
+          system: {
             universalIdentifier: '20202020-a011-4a11-8a11-a0bcf10abcf4',
           },
         },
@@ -3367,10 +3364,7 @@ export const STANDARD_OBJECTS = {
           general: {
             universalIdentifier: '20202020-a010-4a10-8a10-a0bcf10aaef2',
           },
-          additional: {
-            universalIdentifier: '20202020-a010-4a10-8a10-a0bcf10aaef3',
-          },
-          other: {
+          system: {
             universalIdentifier: '20202020-a010-4a10-8a10-a0bcf10aaef4',
           },
         },