diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
index c024cd4967f..e32faaab724 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
@@ -2790,6 +2790,34 @@ type ConnectedAccountDTO {
   updatedAt: DateTime!
 }
 
+type PublicConnectionParametersOutput {
+  host: String!
+  port: Float!
+  username: String
+  secure: Boolean
+}
+
+type PublicImapSmtpCaldavConnectionParameters {
+  IMAP: PublicConnectionParametersOutput
+  SMTP: PublicConnectionParametersOutput
+  CALDAV: PublicConnectionParametersOutput
+}
+
+type ConnectedAccountPublicDTO {
+  id: UUID!
+  handle: String!
+  provider: String!
+  lastCredentialsRefreshedAt: DateTime
+  authFailedAt: DateTime
+  handleAliases: [String!]
+  scopes: [String!]
+  lastSignedInAt: DateTime
+  userWorkspaceId: UUID!
+  createdAt: DateTime!
+  updatedAt: DateTime!
+  connectionParameters: PublicImapSmtpCaldavConnectionParameters
+}
+
 type SendEmailOutput {
   success: Boolean!
   error: String
@@ -3208,6 +3236,7 @@ type Query {
   myMessageFolders(messageChannelId: UUID): [MessageFolder!]!
   myMessageChannels(connectedAccountId: UUID): [MessageChannel!]!
   myConnectedAccounts: [ConnectedAccountDTO!]!
+  connectedAccountById(id: UUID!): ConnectedAccountPublicDTO
   connectedAccounts: [ConnectedAccountDTO!]!
   myCalendarChannels(connectedAccountId: UUID): [CalendarChannel!]!
   webhooks: [Webhook!]!
@@ -3997,6 +4026,7 @@ input CreatePageLayoutWidgetInput {
 }
 
 input UpdatePageLayoutWidgetInput {
+  pageLayoutTabId: UUID
   title: String
   type: WidgetType
   objectMetadataId: UUID
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
index f0dec3e0adb..a289fd73a96 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
@@ -2449,6 +2449,37 @@ export interface ConnectedAccountDTO {
     __typename: 'ConnectedAccountDTO'
 }
 
+export interface PublicConnectionParametersOutput {
+    host: Scalars['String']
+    port: Scalars['Float']
+    username?: Scalars['String']
+    secure?: Scalars['Boolean']
+    __typename: 'PublicConnectionParametersOutput'
+}
+
+export interface PublicImapSmtpCaldavConnectionParameters {
+    IMAP?: PublicConnectionParametersOutput
+    SMTP?: PublicConnectionParametersOutput
+    CALDAV?: PublicConnectionParametersOutput
+    __typename: 'PublicImapSmtpCaldavConnectionParameters'
+}
+
+export interface ConnectedAccountPublicDTO {
+    id: Scalars['UUID']
+    handle: Scalars['String']
+    provider: Scalars['String']
+    lastCredentialsRefreshedAt?: Scalars['DateTime']
+    authFailedAt?: Scalars['DateTime']
+    handleAliases?: Scalars['String'][]
+    scopes?: Scalars['String'][]
+    lastSignedInAt?: Scalars['DateTime']
+    userWorkspaceId: Scalars['UUID']
+    createdAt: Scalars['DateTime']
+    updatedAt: Scalars['DateTime']
+    connectionParameters?: PublicImapSmtpCaldavConnectionParameters
+    __typename: 'ConnectedAccountPublicDTO'
+}
+
 export interface SendEmailOutput {
     success: Scalars['Boolean']
     error?: Scalars['String']
@@ -2775,6 +2806,7 @@ export interface Query {
     myMessageFolders: MessageFolder[]
     myMessageChannels: MessageChannel[]
     myConnectedAccounts: ConnectedAccountDTO[]
+    connectedAccountById?: ConnectedAccountPublicDTO
     connectedAccounts: ConnectedAccountDTO[]
     myCalendarChannels: CalendarChannel[]
     webhooks: Webhook[]
@@ -5682,6 +5714,40 @@ export interface ConnectedAccountDTOGenqlSelection{
     __scalar?: boolean | number
 }
 
+export interface PublicConnectionParametersOutputGenqlSelection{
+    host?: boolean | number
+    port?: boolean | number
+    username?: boolean | number
+    secure?: boolean | number
+    __typename?: boolean | number
+    __scalar?: boolean | number
+}
+
+export interface PublicImapSmtpCaldavConnectionParametersGenqlSelection{
+    IMAP?: PublicConnectionParametersOutputGenqlSelection
+    SMTP?: PublicConnectionParametersOutputGenqlSelection
+    CALDAV?: PublicConnectionParametersOutputGenqlSelection
+    __typename?: boolean | number
+    __scalar?: boolean | number
+}
+
+export interface ConnectedAccountPublicDTOGenqlSelection{
+    id?: boolean | number
+    handle?: boolean | number
+    provider?: boolean | number
+    lastCredentialsRefreshedAt?: boolean | number
+    authFailedAt?: boolean | number
+    handleAliases?: boolean | number
+    scopes?: boolean | number
+    lastSignedInAt?: boolean | number
+    userWorkspaceId?: boolean | number
+    createdAt?: boolean | number
+    updatedAt?: boolean | number
+    connectionParameters?: PublicImapSmtpCaldavConnectionParametersGenqlSelection
+    __typename?: boolean | number
+    __scalar?: boolean | number
+}
+
 export interface SendEmailOutputGenqlSelection{
     success?: boolean | number
     error?: boolean | number
@@ -6024,6 +6090,7 @@ export interface QueryGenqlSelection{
     myMessageFolders?: (MessageFolderGenqlSelection & { __args?: {messageChannelId?: (Scalars['UUID'] | null)} })
     myMessageChannels?: (MessageChannelGenqlSelection & { __args?: {connectedAccountId?: (Scalars['UUID'] | null)} })
     myConnectedAccounts?: ConnectedAccountDTOGenqlSelection
+    connectedAccountById?: (ConnectedAccountPublicDTOGenqlSelection & { __args: {id: Scalars['UUID']} })
     connectedAccounts?: ConnectedAccountDTOGenqlSelection
     myCalendarChannels?: (CalendarChannelGenqlSelection & { __args?: {connectedAccountId?: (Scalars['UUID'] | null)} })
     webhooks?: WebhookGenqlSelection
@@ -6484,7 +6551,7 @@ export interface GridPositionInput {row: Scalars['Float'],column: Scalars['Float
 
 export interface CreatePageLayoutWidgetInput {pageLayoutTabId: Scalars['UUID'],title: Scalars['String'],type: WidgetType,objectMetadataId?: (Scalars['UUID'] | null),gridPosition: GridPositionInput,position?: (Scalars['JSON'] | null),configuration: Scalars['JSON']}
 
-export interface UpdatePageLayoutWidgetInput {title?: (Scalars['String'] | null),type?: (WidgetType | null),objectMetadataId?: (Scalars['UUID'] | null),gridPosition?: (GridPositionInput | null),position?: (Scalars['JSON'] | null),configuration?: (Scalars['JSON'] | null),conditionalDisplay?: (Scalars['JSON'] | null)}
+export interface UpdatePageLayoutWidgetInput {pageLayoutTabId?: (Scalars['UUID'] | null),title?: (Scalars['String'] | null),type?: (WidgetType | null),objectMetadataId?: (Scalars['UUID'] | null),gridPosition?: (GridPositionInput | null),position?: (Scalars['JSON'] | null),configuration?: (Scalars['JSON'] | null),conditionalDisplay?: (Scalars['JSON'] | null)}
 
 export interface CreateLogicFunctionFromSourceInput {id?: (Scalars['UUID'] | null),universalIdentifier?: (Scalars['UUID'] | null),name: Scalars['String'],description?: (Scalars['String'] | null),timeoutSeconds?: (Scalars['Float'] | null),toolInputSchema?: (Scalars['JSON'] | null),isTool?: (Scalars['Boolean'] | null),source?: (Scalars['JSON'] | null),cronTriggerSettings?: (Scalars['JSON'] | null),databaseEventTriggerSettings?: (Scalars['JSON'] | null),httpRouteTriggerSettings?: (Scalars['JSON'] | null)}
 
@@ -8593,6 +8660,30 @@ export interface LogicFunctionLogsInput {applicationId?: (Scalars['UUID'] | null
     
 
 
+    const PublicConnectionParametersOutput_possibleTypes: string[] = ['PublicConnectionParametersOutput']
+    export const isPublicConnectionParametersOutput = (obj?: { __typename?: any } | null): obj is PublicConnectionParametersOutput => {
+      if (!obj?.__typename) throw new Error('__typename is missing in "isPublicConnectionParametersOutput"')
+      return PublicConnectionParametersOutput_possibleTypes.includes(obj.__typename)
+    }
+    
+
+
+    const PublicImapSmtpCaldavConnectionParameters_possibleTypes: string[] = ['PublicImapSmtpCaldavConnectionParameters']
+    export const isPublicImapSmtpCaldavConnectionParameters = (obj?: { __typename?: any } | null): obj is PublicImapSmtpCaldavConnectionParameters => {
+      if (!obj?.__typename) throw new Error('__typename is missing in "isPublicImapSmtpCaldavConnectionParameters"')
+      return PublicImapSmtpCaldavConnectionParameters_possibleTypes.includes(obj.__typename)
+    }
+    
+
+
+    const ConnectedAccountPublicDTO_possibleTypes: string[] = ['ConnectedAccountPublicDTO']
+    export const isConnectedAccountPublicDTO = (obj?: { __typename?: any } | null): obj is ConnectedAccountPublicDTO => {
+      if (!obj?.__typename) throw new Error('__typename is missing in "isConnectedAccountPublicDTO"')
+      return ConnectedAccountPublicDTO_possibleTypes.includes(obj.__typename)
+    }
+    
+
+
     const SendEmailOutput_possibleTypes: string[] = ['SendEmailOutput']
     export const isSendEmailOutput = (obj?: { __typename?: any } | null): obj is SendEmailOutput => {
       if (!obj?.__typename) throw new Error('__typename is missing in "isSendEmailOutput"')
diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.ts
index e91ce5166e0..a262b4737de 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts
@@ -67,30 +67,30 @@ export default {
         286,
         296,
         297,
-        330,
-        331,
-        332,
         333,
+        334,
         335,
         336,
-        337,
         338,
         339,
         340,
         341,
+        342,
         343,
-        345,
-        353,
-        359,
-        360,
-        361,
+        344,
+        346,
+        348,
+        356,
+        362,
         363,
-        370,
-        377,
-        408,
-        489,
-        494,
-        495
+        364,
+        366,
+        373,
+        380,
+        411,
+        491,
+        496,
+        497
     ],
     "types": {
         "BillingProductDTO": {
@@ -5528,6 +5528,78 @@ export default {
                 1
             ]
         },
+        "PublicConnectionParametersOutput": {
+            "host": [
+                1
+            ],
+            "port": [
+                11
+            ],
+            "username": [
+                1
+            ],
+            "secure": [
+                6
+            ],
+            "__typename": [
+                1
+            ]
+        },
+        "PublicImapSmtpCaldavConnectionParameters": {
+            "IMAP": [
+                313
+            ],
+            "SMTP": [
+                313
+            ],
+            "CALDAV": [
+                313
+            ],
+            "__typename": [
+                1
+            ]
+        },
+        "ConnectedAccountPublicDTO": {
+            "id": [
+                3
+            ],
+            "handle": [
+                1
+            ],
+            "provider": [
+                1
+            ],
+            "lastCredentialsRefreshedAt": [
+                4
+            ],
+            "authFailedAt": [
+                4
+            ],
+            "handleAliases": [
+                1
+            ],
+            "scopes": [
+                1
+            ],
+            "lastSignedInAt": [
+                4
+            ],
+            "userWorkspaceId": [
+                3
+            ],
+            "createdAt": [
+                4
+            ],
+            "updatedAt": [
+                4
+            ],
+            "connectionParameters": [
+                314
+            ],
+            "__typename": [
+                1
+            ]
+        },
         "SendEmailOutput": {
             "success": [
                 6
@@ -5578,13 +5650,13 @@ export default {
         },
         "EventLogQueryResult": {
             "records": [
-                314
+                317
             ],
             "totalCount": [
                 21
             ],
             "pageInfo": [
-                315
+                318
             ],
             "__typename": [
                 1
@@ -5711,7 +5783,7 @@ export default {
         },
         "AISystemPromptPreview": {
             "sections": [
-                320
+                323
             ],
             "estimatedTokenCount": [
                 21
@@ -5758,7 +5830,7 @@ export default {
         },
         "AgentChatThreadEdge": {
             "node": [
-                318
+                321
             ],
             "cursor": [
                 40
@@ -5772,7 +5844,7 @@ export default {
                 235
             ],
             "edges": [
-                325
+                328
             ],
             "__typename": [
                 1
@@ -5809,10 +5881,10 @@ export default {
                 3
             ],
             "evaluations": [
-                327
+                330
             ],
             "messages": [
-                319
+                322
             ],
             "createdAt": [
                 4
@@ -5829,19 +5901,19 @@ export default {
                 1
             ],
             "syncStatus": [
-                330
+                333
             ],
             "syncStage": [
-                331
+                334
             ],
             "visibility": [
-                332
+                335
             ],
             "isContactAutoCreationEnabled": [
                 6
             ],
             "contactAutoCreationPolicy": [
-                333
+                336
             ],
             "isSyncEnabled": [
                 6
@@ -5877,22 +5949,22 @@ export default {
                 3
             ],
             "visibility": [
-                335
+                338
             ],
             "handle": [
                 1
             ],
             "type": [
-                336
+                339
             ],
             "isContactAutoCreationEnabled": [
                 6
             ],
             "contactAutoCreationPolicy": [
-                337
+                340
             ],
             "messageFolderImportPolicy": [
-                338
+                341
             ],
             "excludeNonProfessionalEmails": [
                 6
@@ -5901,7 +5973,7 @@ export default {
                 6
             ],
             "pendingGroupEmailsAction": [
-                339
+                342
             ],
             "isSyncEnabled": [
                 6
@@ -5910,10 +5982,10 @@ export default {
                 4
             ],
             "syncStatus": [
-                340
+                343
             ],
             "syncStage": [
-                341
+                344
             ],
             "syncStageStartedAt": [
                 4
@@ -5964,7 +6036,7 @@ export default {
                 1
             ],
             "pendingSyncAction": [
-                343
+                346
             ],
             "messageChannelId": [
                 3
@@ -5982,7 +6054,7 @@ export default {
         "MessageFolderPendingSyncAction": {},
         "CollectionHash": {
             "collectionName": [
-                345
+                348
             ],
             "hash": [
                 1
@@ -6049,13 +6121,13 @@ export default {
         },
         "MinimalMetadata": {
             "objectMetadataItems": [
-                346
+                349
             ],
             "views": [
-                347
+                350
             ],
             "collectionHashes": [
-                344
+                347
             ],
             "__typename": [
                 1
@@ -6221,7 +6293,7 @@ export default {
                 2,
                 {
                     "input": [
-                        351,
+                        354,
                         "GetApiKeyInput!"
                     ]
                 }
@@ -6325,7 +6397,7 @@ export default {
                 32,
                 {
                     "input": [
-                        352,
+                        355,
                         "LogicFunctionIdInput!"
                     ]
                 }
@@ -6337,7 +6409,7 @@ export default {
                 15,
                 {
                     "input": [
-                        352,
+                        355,
                         "LogicFunctionIdInput!"
                     ]
                 }
@@ -6346,7 +6418,7 @@ export default {
                 1,
                 {
                     "input": [
-                        352,
+                        355,
                         "LogicFunctionIdInput!"
                     ]
                 }
@@ -6429,7 +6501,7 @@ export default {
                 25,
                 {
                     "input": [
-                        354,
+                        357,
                         "AgentIdInput!"
                     ]
                 }
@@ -6489,7 +6561,7 @@ export default {
                 }
             ],
             "myMessageFolders": [
-                342,
+                345,
                 {
                     "messageChannelId": [
                         3
@@ -6497,7 +6569,7 @@ export default {
                 }
             ],
             "myMessageChannels": [
-                334,
+                337,
                 {
                     "connectedAccountId": [
                         3
@@ -6507,11 +6579,20 @@ export default {
             "myConnectedAccounts": [
                 312
             ],
+            "connectedAccountById": [
+                315,
+                {
+                    "id": [
+                        3,
+                        "UUID!"
+                    ]
+                }
+            ],
             "connectedAccounts": [
                 312
             ],
             "myCalendarChannels": [
-                329,
+                332,
                 {
                     "connectedAccountId": [
                         3
@@ -6519,10 +6600,10 @@ export default {
                 }
             ],
             "webhooks": [
-                349
+                352
             ],
             "webhook": [
-                349,
+                352,
                 {
                     "id": [
                         3,
@@ -6531,10 +6612,10 @@ export default {
                 }
             ],
             "minimalMetadata": [
-                348
+                351
             ],
             "chatThread": [
-                318,
+                321,
                 {
                     "id": [
                         3,
@@ -6543,15 +6624,6 @@ export default {
                 }
             ],
             "chatMessages": [
-                319,
-                {
-                    "threadId": [
-                        3,
-                        "UUID!"
-                    ]
-                }
-            ],
-            "chatStreamCatchupChunks": [
                 322,
                 {
                     "threadId": [
@@ -6560,14 +6632,23 @@ export default {
                     ]
                 }
             ],
+            "chatStreamCatchupChunks": [
+                325,
+                {
+                    "threadId": [
+                        3,
+                        "UUID!"
+                    ]
+                }
+            ],
             "getAISystemPromptPreview": [
-                321
+                324
             ],
             "skills": [
-                317
+                320
             ],
             "skill": [
-                317,
+                320,
                 {
                     "id": [
                         3,
@@ -6576,24 +6657,24 @@ export default {
                 }
             ],
             "chatThreads": [
-                326,
+                329,
                 {
                     "paging": [
                         39,
                         "CursorPaging!"
                     ],
                     "filter": [
-                        355,
+                        358,
                         "AgentChatThreadFilter!"
                     ],
                     "sorting": [
-                        358,
+                        361,
                         "[AgentChatThreadSort!]!"
                     ]
                 }
             ],
             "agentTurns": [
-                328,
+                331,
                 {
                     "agentId": [
                         3,
@@ -6602,10 +6683,10 @@ export default {
                 }
             ],
             "eventLogs": [
-                316,
+                319,
                 {
                     "input": [
-                        362,
+                        365,
                         "EventLogQueryInput!"
                     ]
                 }
@@ -6614,7 +6695,7 @@ export default {
                 310,
                 {
                     "input": [
-                        366,
+                        369,
                         "PieChartDataInput!"
                     ]
                 }
@@ -6623,7 +6704,7 @@ export default {
                 308,
                 {
                     "input": [
-                        367,
+                        370,
                         "LineChartDataInput!"
                     ]
                 }
@@ -6632,7 +6713,7 @@ export default {
                 305,
                 {
                     "input": [
-                        368,
+                        371,
                         "BarChartDataInput!"
                     ]
                 }
@@ -6888,7 +6969,7 @@ export default {
                 276,
                 {
                     "input": [
-                        369
+                        372
                     ]
                 }
             ],
@@ -6941,7 +7022,7 @@ export default {
         },
         "LogicFunctionIdInput": {
             "id": [
-                353
+                356
             ],
             "__typename": [
                 1
@@ -6958,16 +7039,16 @@ export default {
         },
         "AgentChatThreadFilter": {
             "and": [
-                355
+                358
             ],
             "or": [
-                355
+                358
             ],
             "id": [
                 42
             ],
             "updatedAt": [
-                356
+                359
             ],
             "__typename": [
                 1
@@ -7005,10 +7086,10 @@ export default {
                 4
             ],
             "between": [
-                357
+                360
             ],
             "notBetween": [
-                357
+                360
             ],
             "__typename": [
                 1
@@ -7027,13 +7108,13 @@ export default {
         },
         "AgentChatThreadSort": {
             "field": [
-                359
+                362
             ],
             "direction": [
-                360
+                363
             ],
             "nulls": [
-                361
+                364
             ],
             "__typename": [
                 1
@@ -7044,10 +7125,10 @@ export default {
         "SortNulls": {},
         "EventLogQueryInput": {
             "table": [
-                363
+                366
             ],
             "filters": [
-                364
+                367
             ],
             "first": [
                 21
@@ -7068,7 +7149,7 @@ export default {
                 1
             ],
             "dateRange": [
-                365
+                368
             ],
             "recordId": [
                 1
@@ -7135,7 +7216,7 @@ export default {
                 1
             ],
             "operationTypes": [
-                370
+                373
             ],
             "__typename": [
                 1
@@ -7147,7 +7228,7 @@ export default {
                 6,
                 {
                     "input": [
-                        372,
+                        375,
                         "AddQuerySubscriptionInput!"
                     ]
                 }
@@ -7156,7 +7237,7 @@ export default {
                 6,
                 {
                     "input": [
-                        373,
+                        376,
                         "RemoveQueryFromEventStreamInput!"
                     ]
                 }
@@ -7165,7 +7246,7 @@ export default {
                 146,
                 {
                     "inputs": [
-                        374,
+                        377,
                         "[CreateNavigationMenuItemInput!]!"
                     ]
                 }
@@ -7174,7 +7255,7 @@ export default {
                 146,
                 {
                     "input": [
-                        374,
+                        377,
                         "CreateNavigationMenuItemInput!"
                     ]
                 }
@@ -7183,7 +7264,7 @@ export default {
                 146,
                 {
                     "inputs": [
-                        375,
+                        378,
                         "[UpdateOneNavigationMenuItemInput!]!"
                     ]
                 }
@@ -7192,7 +7273,7 @@ export default {
                 146,
                 {
                     "input": [
-                        375,
+                        378,
                         "UpdateOneNavigationMenuItemInput!"
                     ]
                 }
@@ -7215,20 +7296,11 @@ export default {
                     ]
                 }
             ],
-            "uploadEmailAttachmentFile": [
-                142,
-                {
-                    "file": [
-                        377,
-                        "Upload!"
-                    ]
-                }
-            ],
             "uploadAIChatFile": [
                 142,
                 {
                     "file": [
-                        377,
+                        380,
                         "Upload!"
                     ]
                 }
@@ -7237,7 +7309,7 @@ export default {
                 142,
                 {
                     "file": [
-                        377,
+                        380,
                         "Upload!"
                     ]
                 }
@@ -7246,7 +7318,7 @@ export default {
                 142,
                 {
                     "file": [
-                        377,
+                        380,
                         "Upload!"
                     ]
                 }
@@ -7255,7 +7327,7 @@ export default {
                 142,
                 {
                     "file": [
-                        377,
+                        380,
                         "Upload!"
                     ]
                 }
@@ -7264,7 +7336,7 @@ export default {
                 142,
                 {
                     "file": [
-                        377,
+                        380,
                         "Upload!"
                     ],
                     "fieldMetadataId": [
@@ -7277,7 +7349,7 @@ export default {
                 142,
                 {
                     "file": [
-                        377,
+                        380,
                         "Upload!"
                     ],
                     "fieldMetadataUniversalIdentifier": [
@@ -7290,7 +7362,7 @@ export default {
                 52,
                 {
                     "input": [
-                        378,
+                        381,
                         "CreateViewFilterGroupInput!"
                     ]
                 }
@@ -7303,7 +7375,7 @@ export default {
                         "String!"
                     ],
                     "input": [
-                        379,
+                        382,
                         "UpdateViewFilterGroupInput!"
                     ]
                 }
@@ -7330,7 +7402,7 @@ export default {
                 54,
                 {
                     "input": [
-                        380,
+                        383,
                         "CreateViewFilterInput!"
                     ]
                 }
@@ -7339,7 +7411,7 @@ export default {
                 54,
                 {
                     "input": [
-                        381,
+                        384,
                         "UpdateViewFilterInput!"
                     ]
                 }
@@ -7348,7 +7420,7 @@ export default {
                 54,
                 {
                     "input": [
-                        383,
+                        386,
                         "DeleteViewFilterInput!"
                     ]
                 }
@@ -7357,7 +7429,7 @@ export default {
                 54,
                 {
                     "input": [
-                        384,
+                        387,
                         "DestroyViewFilterInput!"
                     ]
                 }
@@ -7366,7 +7438,7 @@ export default {
                 60,
                 {
                     "input": [
-                        385,
+                        388,
                         "CreateViewInput!"
                     ]
                 }
@@ -7379,7 +7451,7 @@ export default {
                         "String!"
                     ],
                     "input": [
-                        386,
+                        389,
                         "UpdateViewInput!"
                     ]
                 }
@@ -7406,7 +7478,7 @@ export default {
                 57,
                 {
                     "input": [
-                        387,
+                        390,
                         "CreateViewSortInput!"
                     ]
                 }
@@ -7415,7 +7487,7 @@ export default {
                 57,
                 {
                     "input": [
-                        388,
+                        391,
                         "UpdateViewSortInput!"
                     ]
                 }
@@ -7424,7 +7496,7 @@ export default {
                 6,
                 {
                     "input": [
-                        390,
+                        393,
                         "DeleteViewSortInput!"
                     ]
                 }
@@ -7433,7 +7505,7 @@ export default {
                 6,
                 {
                     "input": [
-                        391,
+                        394,
                         "DestroyViewSortInput!"
                     ]
                 }
@@ -7442,7 +7514,7 @@ export default {
                 50,
                 {
                     "input": [
-                        392,
+                        395,
                         "UpdateViewFieldInput!"
                     ]
                 }
@@ -7451,7 +7523,7 @@ export default {
                 50,
                 {
                     "input": [
-                        394,
+                        397,
                         "CreateViewFieldInput!"
                     ]
                 }
@@ -7460,7 +7532,7 @@ export default {
                 50,
                 {
                     "inputs": [
-                        394,
+                        397,
                         "[CreateViewFieldInput!]!"
                     ]
                 }
@@ -7469,7 +7541,7 @@ export default {
                 50,
                 {
                     "input": [
-                        395,
+                        398,
                         "DeleteViewFieldInput!"
                     ]
                 }
@@ -7478,7 +7550,7 @@ export default {
                 50,
                 {
                     "input": [
-                        396,
+                        399,
                         "DestroyViewFieldInput!"
                     ]
                 }
@@ -7487,7 +7559,7 @@ export default {
                 59,
                 {
                     "input": [
-                        397,
+                        400,
                         "UpdateViewFieldGroupInput!"
                     ]
                 }
@@ -7496,7 +7568,7 @@ export default {
                 59,
                 {
                     "input": [
-                        399,
+                        402,
                         "CreateViewFieldGroupInput!"
                     ]
                 }
@@ -7505,7 +7577,7 @@ export default {
                 59,
                 {
                     "inputs": [
-                        399,
+                        402,
                         "[CreateViewFieldGroupInput!]!"
                     ]
                 }
@@ -7514,7 +7586,7 @@ export default {
                 59,
                 {
                     "input": [
-                        400,
+                        403,
                         "DeleteViewFieldGroupInput!"
                     ]
                 }
@@ -7523,7 +7595,7 @@ export default {
                 59,
                 {
                     "input": [
-                        401,
+                        404,
                         "DestroyViewFieldGroupInput!"
                     ]
                 }
@@ -7532,7 +7604,7 @@ export default {
                 60,
                 {
                     "input": [
-                        402,
+                        405,
                         "UpsertFieldsWidgetInput!"
                     ]
                 }
@@ -7541,7 +7613,7 @@ export default {
                 2,
                 {
                     "input": [
-                        405,
+                        408,
                         "CreateApiKeyInput!"
                     ]
                 }
@@ -7550,7 +7622,7 @@ export default {
                 2,
                 {
                     "input": [
-                        406,
+                        409,
                         "UpdateApiKeyInput!"
                     ]
                 }
@@ -7559,7 +7631,7 @@ export default {
                 2,
                 {
                     "input": [
-                        407,
+                        410,
                         "RevokeApiKeyInput!"
                     ]
                 }
@@ -7601,7 +7673,7 @@ export default {
                 116,
                 {
                     "type": [
-                        408,
+                        411,
                         "AnalyticsType!"
                     ],
                     "name": [
@@ -7714,7 +7786,7 @@ export default {
                 141,
                 {
                     "input": [
-                        409,
+                        412,
                         "CreateApprovedAccessDomainInput!"
                     ]
                 }
@@ -7723,7 +7795,7 @@ export default {
                 6,
                 {
                     "input": [
-                        410,
+                        413,
                         "DeleteApprovedAccessDomainInput!"
                     ]
                 }
@@ -7732,7 +7804,7 @@ export default {
                 141,
                 {
                     "input": [
-                        411,
+                        414,
                         "ValidateApprovedAccessDomainInput!"
                     ]
                 }
@@ -7741,7 +7813,7 @@ export default {
                 113,
                 {
                     "input": [
-                        412,
+                        415,
                         "CreatePageLayoutTabInput!"
                     ]
                 }
@@ -7754,7 +7826,7 @@ export default {
                         "String!"
                     ],
                     "input": [
-                        413,
+                        416,
                         "UpdatePageLayoutTabInput!"
                     ]
                 }
@@ -7772,7 +7844,7 @@ export default {
                 114,
                 {
                     "input": [
-                        414,
+                        417,
                         "CreatePageLayoutInput!"
                     ]
                 }
@@ -7785,7 +7857,7 @@ export default {
                         "String!"
                     ],
                     "input": [
-                        415,
+                        418,
                         "UpdatePageLayoutInput!"
                     ]
                 }
@@ -7807,7 +7879,7 @@ export default {
                         "String!"
                     ],
                     "input": [
-                        416,
+                        419,
                         "UpdatePageLayoutWithTabsInput!"
                     ]
                 }
@@ -7834,7 +7906,7 @@ export default {
                 75,
                 {
                     "input": [
-                        420,
+                        423,
                         "CreatePageLayoutWidgetInput!"
                     ]
                 }
@@ -7847,7 +7919,7 @@ export default {
                         "String!"
                     ],
                     "input": [
-                        421,
+                        424,
                         "UpdatePageLayoutWidgetInput!"
                     ]
                 }
@@ -7865,7 +7937,7 @@ export default {
                 32,
                 {
                     "input": [
-                        352,
+                        355,
                         "LogicFunctionIdInput!"
                     ]
                 }
@@ -7874,7 +7946,7 @@ export default {
                 32,
                 {
                     "input": [
-                        422,
+                        425,
                         "CreateLogicFunctionFromSourceInput!"
                     ]
                 }
@@ -7883,7 +7955,7 @@ export default {
                 155,
                 {
                     "input": [
-                        423,
+                        426,
                         "ExecuteOneLogicFunctionInput!"
                     ]
                 }
@@ -7892,7 +7964,7 @@ export default {
                 6,
                 {
                     "input": [
-                        424,
+                        427,
                         "UpdateLogicFunctionFromSourceInput!"
                     ]
                 }
@@ -7901,7 +7973,7 @@ export default {
                 295,
                 {
                     "input": [
-                        426,
+                        429,
                         "CreateCommandMenuItemInput!"
                     ]
                 }
@@ -7910,7 +7982,7 @@ export default {
                 295,
                 {
                     "input": [
-                        427,
+                        430,
                         "UpdateCommandMenuItemInput!"
                     ]
                 }
@@ -7928,7 +8000,7 @@ export default {
                 252,
                 {
                     "input": [
-                        428,
+                        431,
                         "CreateFrontComponentInput!"
                     ]
                 }
@@ -7937,7 +8009,7 @@ export default {
                 252,
                 {
                     "input": [
-                        429,
+                        432,
                         "UpdateFrontComponentInput!"
                     ]
                 }
@@ -7955,7 +8027,7 @@ export default {
                 46,
                 {
                     "input": [
-                        431,
+                        434,
                         "CreateOneObjectInput!"
                     ]
                 }
@@ -7964,7 +8036,7 @@ export default {
                 46,
                 {
                     "input": [
-                        433,
+                        436,
                         "DeleteOneObjectInput!"
                     ]
                 }
@@ -7973,7 +8045,7 @@ export default {
                 46,
                 {
                     "input": [
-                        434,
+                        437,
                         "UpdateOneObjectInput!"
                     ]
                 }
@@ -7982,7 +8054,7 @@ export default {
                 25,
                 {
                     "input": [
-                        436,
+                        439,
                         "CreateAgentInput!"
                     ]
                 }
@@ -7991,7 +8063,7 @@ export default {
                 25,
                 {
                     "input": [
-                        437,
+                        440,
                         "UpdateAgentInput!"
                     ]
                 }
@@ -8000,7 +8072,7 @@ export default {
                 25,
                 {
                     "input": [
-                        354,
+                        357,
                         "AgentIdInput!"
                     ]
                 }
@@ -8022,7 +8094,7 @@ export default {
                 29,
                 {
                     "createRoleInput": [
-                        438,
+                        441,
                         "CreateRoleInput!"
                     ]
                 }
@@ -8031,7 +8103,7 @@ export default {
                 29,
                 {
                     "updateRoleInput": [
-                        439,
+                        442,
                         "UpdateRoleInput!"
                     ]
                 }
@@ -8049,7 +8121,7 @@ export default {
                 16,
                 {
                     "upsertObjectPermissionsInput": [
-                        441,
+                        444,
                         "UpsertObjectPermissionsInput!"
                     ]
                 }
@@ -8058,7 +8130,7 @@ export default {
                 27,
                 {
                     "upsertPermissionFlagsInput": [
-                        443,
+                        446,
                         "UpsertPermissionFlagsInput!"
                     ]
                 }
@@ -8067,7 +8139,7 @@ export default {
                 26,
                 {
                     "upsertFieldPermissionsInput": [
-                        444,
+                        447,
                         "UpsertFieldPermissionsInput!"
                     ]
                 }
@@ -8076,7 +8148,7 @@ export default {
                 246,
                 {
                     "input": [
-                        446,
+                        449,
                         "UpsertRowLevelPermissionPredicatesInput!"
                     ]
                 }
@@ -8107,7 +8179,7 @@ export default {
                 34,
                 {
                     "input": [
-                        449,
+                        452,
                         "CreateOneFieldMetadataInput!"
                     ]
                 }
@@ -8116,7 +8188,7 @@ export default {
                 34,
                 {
                     "input": [
-                        451,
+                        454,
                         "UpdateOneFieldMetadataInput!"
                     ]
                 }
@@ -8125,7 +8197,7 @@ export default {
                 34,
                 {
                     "input": [
-                        453,
+                        456,
                         "DeleteOneFieldInput!"
                     ]
                 }
@@ -8134,7 +8206,7 @@ export default {
                 56,
                 {
                     "input": [
-                        454,
+                        457,
                         "CreateViewGroupInput!"
                     ]
                 }
@@ -8143,7 +8215,7 @@ export default {
                 56,
                 {
                     "inputs": [
-                        454,
+                        457,
                         "[CreateViewGroupInput!]!"
                     ]
                 }
@@ -8152,7 +8224,7 @@ export default {
                 56,
                 {
                     "input": [
-                        455,
+                        458,
                         "UpdateViewGroupInput!"
                     ]
                 }
@@ -8161,7 +8233,7 @@ export default {
                 56,
                 {
                     "inputs": [
-                        455,
+                        458,
                         "[UpdateViewGroupInput!]!"
                     ]
                 }
@@ -8170,7 +8242,7 @@ export default {
                 56,
                 {
                     "input": [
-                        457,
+                        460,
                         "DeleteViewGroupInput!"
                     ]
                 }
@@ -8179,34 +8251,34 @@ export default {
                 56,
                 {
                     "input": [
-                        458,
+                        461,
                         "DestroyViewGroupInput!"
                     ]
                 }
             ],
             "updateMessageFolder": [
-                342,
+                345,
                 {
                     "input": [
-                        459,
+                        462,
                         "UpdateMessageFolderInput!"
                     ]
                 }
             ],
             "updateMessageFolders": [
-                342,
+                345,
                 {
                     "input": [
-                        461,
+                        464,
                         "UpdateMessageFoldersInput!"
                     ]
                 }
             ],
             "updateMessageChannel": [
-                334,
+                337,
                 {
                     "input": [
-                        462,
+                        465,
                         "UpdateMessageChannelInput!"
                     ]
                 }
@@ -8221,34 +8293,34 @@ export default {
                 }
             ],
             "updateCalendarChannel": [
-                329,
+                332,
                 {
                     "input": [
-                        464,
+                        467,
                         "UpdateCalendarChannelInput!"
                     ]
                 }
             ],
             "createWebhook": [
-                349,
+                352,
                 {
                     "input": [
-                        466,
+                        469,
                         "CreateWebhookInput!"
                     ]
                 }
             ],
             "updateWebhook": [
-                349,
+                352,
                 {
                     "input": [
-                        467,
+                        470,
                         "UpdateWebhookInput!"
                     ]
                 }
             ],
             "deleteWebhook": [
-                349,
+                352,
                 {
                     "id": [
                         3,
@@ -8257,10 +8329,10 @@ export default {
                 }
             ],
             "createChatThread": [
-                318
+                321
             ],
             "sendChatMessage": [
-                323,
+                326,
                 {
                     "threadId": [
                         3,
@@ -8301,25 +8373,25 @@ export default {
                 }
             ],
             "createSkill": [
-                317,
+                320,
                 {
                     "input": [
-                        469,
+                        472,
                         "CreateSkillInput!"
                     ]
                 }
             ],
             "updateSkill": [
-                317,
+                320,
                 {
                     "input": [
-                        470,
+                        473,
                         "UpdateSkillInput!"
                     ]
                 }
             ],
             "deleteSkill": [
-                317,
+                320,
                 {
                     "id": [
                         3,
@@ -8328,7 +8400,7 @@ export default {
                 }
             ],
             "activateSkill": [
-                317,
+                320,
                 {
                     "id": [
                         3,
@@ -8337,7 +8409,7 @@ export default {
                 }
             ],
             "deactivateSkill": [
-                317,
+                320,
                 {
                     "id": [
                         3,
@@ -8346,7 +8418,7 @@ export default {
                 }
             ],
             "evaluateAgentTurn": [
-                327,
+                330,
                 {
                     "turnId": [
                         3,
@@ -8355,7 +8427,7 @@ export default {
                 }
             ],
             "runEvaluationInput": [
-                328,
+                331,
                 {
                     "agentId": [
                         3,
@@ -8380,7 +8452,7 @@ export default {
                 261,
                 {
                     "input": [
-                        471,
+                        474,
                         "GetAuthorizationUrlForSSOInput!"
                     ]
                 }
@@ -8634,7 +8706,7 @@ export default {
                 217,
                 {
                     "input": [
-                        472,
+                        475,
                         "CreateApplicationRegistrationInput!"
                     ]
                 }
@@ -8643,7 +8715,7 @@ export default {
                 7,
                 {
                     "input": [
-                        473,
+                        476,
                         "UpdateApplicationRegistrationInput!"
                     ]
                 }
@@ -8670,7 +8742,7 @@ export default {
                 5,
                 {
                     "input": [
-                        475,
+                        478,
                         "CreateApplicationRegistrationVariableInput!"
                     ]
                 }
@@ -8679,7 +8751,7 @@ export default {
                 5,
                 {
                     "input": [
-                        476,
+                        479,
                         "UpdateApplicationRegistrationVariableInput!"
                     ]
                 }
@@ -8697,7 +8769,7 @@ export default {
                 7,
                 {
                     "file": [
-                        377,
+                        380,
                         "Upload!"
                     ],
                     "universalIdentifier": [
@@ -8793,7 +8865,7 @@ export default {
                 66,
                 {
                     "data": [
-                        478,
+                        481,
                         "ActivateWorkspaceInput!"
                     ]
                 }
@@ -8802,7 +8874,7 @@ export default {
                 66,
                 {
                     "data": [
-                        479,
+                        482,
                         "UpdateWorkspaceInput!"
                     ]
                 }
@@ -8817,7 +8889,7 @@ export default {
                 225,
                 {
                     "input": [
-                        480,
+                        483,
                         "SetupOIDCSsoInput!"
                     ]
                 }
@@ -8826,7 +8898,7 @@ export default {
                 225,
                 {
                     "input": [
-                        481,
+                        484,
                         "SetupSAMLSsoInput!"
                     ]
                 }
@@ -8835,7 +8907,7 @@ export default {
                 221,
                 {
                     "input": [
-                        482,
+                        485,
                         "DeleteSsoInput!"
                     ]
                 }
@@ -8844,7 +8916,7 @@ export default {
                 222,
                 {
                     "input": [
-                        483,
+                        486,
                         "EditSsoInput!"
                     ]
                 }
@@ -8863,10 +8935,10 @@ export default {
                 }
             ],
             "sendEmail": [
-                313,
+                316,
                 {
                     "input": [
-                        484,
+                        487,
                         "SendEmailInput!"
                     ]
                 }
@@ -8892,7 +8964,7 @@ export default {
                         "String!"
                     ],
                     "connectionParameters": [
-                        486,
+                        488,
                         "EmailAccountConnectionParameters!"
                     ],
                     "id": [
@@ -8904,7 +8976,7 @@ export default {
                 200,
                 {
                     "input": [
-                        488,
+                        490,
                         "UpdateLabPublicFeatureFlagInput!"
                     ]
                 }
@@ -8965,7 +9037,7 @@ export default {
                 6,
                 {
                     "role": [
-                        489,
+                        491,
                         "AiModelRole!"
                     ],
                     "modelId": [
@@ -9170,7 +9242,7 @@ export default {
                 68,
                 {
                     "input": [
-                        490,
+                        492,
                         "CreateOneAppTokenInput!"
                     ]
                 }
@@ -9206,7 +9278,7 @@ export default {
                 6,
                 {
                     "workspaceMigration": [
-                        492,
+                        494,
                         "WorkspaceMigrationInput!"
                     ]
                 }
@@ -9272,7 +9344,7 @@ export default {
                 279,
                 {
                     "file": [
-                        377,
+                        380,
                         "Upload!"
                     ],
                     "applicationUniversalIdentifier": [
@@ -9280,7 +9352,7 @@ export default {
                         "String!"
                     ],
                     "fileFolder": [
-                        495,
+                        497,
                         "FileFolder!"
                     ],
                     "filePath": [
@@ -9386,7 +9458,7 @@ export default {
                 3
             ],
             "update": [
-                376
+                379
             ],
             "__typename": [
                 1
@@ -9490,7 +9562,7 @@ export default {
                 3
             ],
             "update": [
-                382
+                385
             ],
             "__typename": [
                 1
@@ -9663,7 +9735,7 @@ export default {
                 3
             ],
             "update": [
-                389
+                392
             ],
             "__typename": [
                 1
@@ -9698,7 +9770,7 @@ export default {
                 3
             ],
             "update": [
-                393
+                396
             ],
             "__typename": [
                 1
@@ -9774,7 +9846,7 @@ export default {
                 3
             ],
             "update": [
-                398
+                401
             ],
             "__typename": [
                 1
@@ -9838,10 +9910,10 @@ export default {
                 3
             ],
             "groups": [
-                403
+                406
             ],
             "fields": [
-                404
+                407
             ],
             "__typename": [
                 1
@@ -9861,7 +9933,7 @@ export default {
                 6
             ],
             "fields": [
-                404
+                407
             ],
             "__typename": [
                 1
@@ -10030,7 +10102,7 @@ export default {
                 3
             ],
             "tabs": [
-                417
+                420
             ],
             "__typename": [
                 1
@@ -10053,7 +10125,7 @@ export default {
                 79
             ],
             "widgets": [
-                418
+                421
             ],
             "__typename": [
                 1
@@ -10076,7 +10148,7 @@ export default {
                 3
             ],
             "gridPosition": [
-                419
+                422
             ],
             "position": [
                 15
@@ -10122,7 +10194,7 @@ export default {
                 3
             ],
             "gridPosition": [
-                419
+                422
             ],
             "position": [
                 15
@@ -10135,6 +10207,9 @@ export default {
             ]
         },
         "UpdatePageLayoutWidgetInput": {
+            "pageLayoutTabId": [
+                3
+            ],
             "title": [
                 1
             ],
@@ -10145,7 +10220,7 @@ export default {
                 3
             ],
             "gridPosition": [
-                419
+                422
             ],
             "position": [
                 15
@@ -10214,7 +10289,7 @@ export default {
                 3
             ],
             "update": [
-                425
+                428
             ],
             "__typename": [
                 1
@@ -10368,7 +10443,7 @@ export default {
                 3
             ],
             "update": [
-                430
+                433
             ],
             "__typename": [
                 1
@@ -10387,7 +10462,7 @@ export default {
         },
         "CreateOneObjectInput": {
             "object": [
-                432
+                435
             ],
             "__typename": [
                 1
@@ -10447,7 +10522,7 @@ export default {
         },
         "UpdateOneObjectInput": {
             "update": [
-                435
+                438
             ],
             "id": [
                 3
@@ -10619,7 +10694,7 @@ export default {
         },
         "UpdateRoleInput": {
             "update": [
-                440
+                443
             ],
             "id": [
                 3
@@ -10674,7 +10749,7 @@ export default {
                 3
             ],
             "objectPermissions": [
-                442
+                445
             ],
             "__typename": [
                 1
@@ -10716,7 +10791,7 @@ export default {
                 3
             ],
             "fieldPermissions": [
-                445
+                448
             ],
             "__typename": [
                 1
@@ -10747,10 +10822,10 @@ export default {
                 3
             ],
             "predicates": [
-                447
+                450
             ],
             "predicateGroups": [
-                448
+                451
             ],
             "__typename": [
                 1
@@ -10810,7 +10885,7 @@ export default {
         },
         "CreateOneFieldMetadataInput": {
             "field": [
-                450
+                453
             ],
             "__typename": [
                 1
@@ -10883,7 +10958,7 @@ export default {
                 3
             ],
             "update": [
-                452
+                455
             ],
             "__typename": [
                 1
@@ -10975,7 +11050,7 @@ export default {
                 3
             ],
             "update": [
-                456
+                459
             ],
             "__typename": [
                 1
@@ -11019,7 +11094,7 @@ export default {
                 3
             ],
             "update": [
-                460
+                463
             ],
             "__typename": [
                 1
@@ -11038,7 +11113,7 @@ export default {
                 3
             ],
             "update": [
-                460
+                463
             ],
             "__typename": [
                 1
@@ -11049,7 +11124,7 @@ export default {
                 3
             ],
             "update": [
-                463
+                466
             ],
             "__typename": [
                 1
@@ -11057,16 +11132,16 @@ export default {
         },
         "UpdateMessageChannelInputUpdates": {
             "visibility": [
-                335
+                338
             ],
             "isContactAutoCreationEnabled": [
                 6
             ],
             "contactAutoCreationPolicy": [
-                337
+                340
             ],
             "messageFolderImportPolicy": [
-                338
+                341
             ],
             "isSyncEnabled": [
                 6
@@ -11086,7 +11161,7 @@ export default {
                 3
             ],
             "update": [
-                465
+                468
             ],
             "__typename": [
                 1
@@ -11094,13 +11169,13 @@ export default {
         },
         "UpdateCalendarChannelInputUpdates": {
             "visibility": [
-                332
+                335
             ],
             "isContactAutoCreationEnabled": [
                 6
             ],
             "contactAutoCreationPolicy": [
-                333
+                336
             ],
             "isSyncEnabled": [
                 6
@@ -11134,7 +11209,7 @@ export default {
                 3
             ],
             "update": [
-                468
+                471
             ],
             "__typename": [
                 1
@@ -11239,7 +11314,7 @@ export default {
                 1
             ],
             "update": [
-                474
+                477
             ],
             "__typename": [
                 1
@@ -11287,7 +11362,7 @@ export default {
                 1
             ],
             "update": [
-                477
+                480
             ],
             "__typename": [
                 1
@@ -11467,33 +11542,19 @@ export default {
             "inReplyTo": [
                 1
             ],
-            "files": [
-                485
-            ],
-            "__typename": [
-                1
-            ]
-        },
-        "SendEmailAttachmentInput": {
-            "id": [
-                1
-            ],
-            "name": [
-                1
-            ],
             "__typename": [
                 1
             ]
         },
         "EmailAccountConnectionParameters": {
             "IMAP": [
-                487
+                489
             ],
             "SMTP": [
-                487
+                489
             ],
             "CALDAV": [
-                487
+                489
             ],
             "__typename": [
                 1
@@ -11533,7 +11594,7 @@ export default {
         "AiModelRole": {},
         "CreateOneAppTokenInput": {
             "appToken": [
-                491
+                493
             ],
             "__typename": [
                 1
@@ -11549,7 +11610,7 @@ export default {
         },
         "WorkspaceMigrationInput": {
             "actions": [
-                493
+                495
             ],
             "__typename": [
                 1
@@ -11557,10 +11618,10 @@ export default {
         },
         "WorkspaceMigrationDeleteActionInput": {
             "type": [
-                494
+                496
             ],
             "metadataName": [
-                345
+                348
             ],
             "universalIdentifier": [
                 1
@@ -11585,13 +11646,13 @@ export default {
                 253,
                 {
                     "input": [
-                        497,
+                        499,
                         "LogicFunctionLogsInput!"
                     ]
                 }
             ],
             "onAgentChatEvent": [
-                324,
+                327,
                 {
                     "threadId": [
                         3,
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index 3f8809a5a0a..bf2759184cf 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -1035,6 +1035,22 @@ export type ConnectedAccountDto = {
   userWorkspaceId: Scalars['UUID'];
 };
 
+export type ConnectedAccountPublicDto = {
+  __typename?: 'ConnectedAccountPublicDTO';
+  authFailedAt?: Maybe<Scalars['DateTime']>;
+  connectionParameters?: Maybe<PublicImapSmtpCaldavConnectionParameters>;
+  createdAt: Scalars['DateTime'];
+  handle: Scalars['String'];
+  handleAliases?: Maybe<Array<Scalars['String']>>;
+  id: Scalars['UUID'];
+  lastCredentialsRefreshedAt?: Maybe<Scalars['DateTime']>;
+  lastSignedInAt?: Maybe<Scalars['DateTime']>;
+  provider: Scalars['String'];
+  scopes?: Maybe<Array<Scalars['String']>>;
+  updatedAt: Scalars['DateTime'];
+  userWorkspaceId: Scalars['UUID'];
+};
+
 export type ConnectedImapSmtpCaldavAccount = {
   __typename?: 'ConnectedImapSmtpCaldavAccount';
   connectionParameters?: Maybe<ImapSmtpCaldavConnectionParameters>;
@@ -4230,6 +4246,14 @@ export type PublicApplicationRegistration = {
   websiteUrl?: Maybe<Scalars['String']>;
 };
 
+export type PublicConnectionParametersOutput = {
+  __typename?: 'PublicConnectionParametersOutput';
+  host: Scalars['String'];
+  port: Scalars['Float'];
+  secure?: Maybe<Scalars['Boolean']>;
+  username?: Maybe<Scalars['String']>;
+};
+
 export type PublicDomain = {
   __typename?: 'PublicDomain';
   createdAt: Scalars['DateTime'];
@@ -4251,6 +4275,13 @@ export type PublicFeatureFlagMetadata = {
   label: Scalars['String'];
 };
 
+export type PublicImapSmtpCaldavConnectionParameters = {
+  __typename?: 'PublicImapSmtpCaldavConnectionParameters';
+  CALDAV?: Maybe<PublicConnectionParametersOutput>;
+  IMAP?: Maybe<PublicConnectionParametersOutput>;
+  SMTP?: Maybe<PublicConnectionParametersOutput>;
+};
+
 export type PublicWorkspaceData = {
   __typename?: 'PublicWorkspaceData';
   authBypassProviders?: Maybe<AuthBypassProviders>;
@@ -4277,6 +4308,7 @@ export type Query = {
   checkWorkspaceInviteHashIsValid: WorkspaceInviteHashValid;
   commandMenuItem?: Maybe<CommandMenuItem>;
   commandMenuItems: Array<CommandMenuItem>;
+  connectedAccountById?: Maybe<ConnectedAccountPublicDto>;
   connectedAccounts: Array<ConnectedAccountDto>;
   currentUser: User;
   currentWorkspace: Workspace;
@@ -4441,6 +4473,11 @@ export type QueryCommandMenuItemArgs = {
 };
 
 
+export type QueryConnectedAccountByIdArgs = {
+  id: Scalars['UUID'];
+};
+
+
 export type QueryEnterpriseCheckoutSessionArgs = {
   billingInterval?: InputMaybe<Scalars['String']>;
 };
@@ -5469,6 +5506,7 @@ export type UpdatePageLayoutWidgetInput = {
   configuration?: InputMaybe<Scalars['JSON']>;
   gridPosition?: InputMaybe<GridPositionInput>;
   objectMetadataId?: InputMaybe<Scalars['UUID']>;
+  pageLayoutTabId?: InputMaybe<Scalars['UUID']>;
   position?: InputMaybe<Scalars['JSON']>;
   title?: InputMaybe<Scalars['String']>;
   type?: InputMaybe<WidgetType>;
@@ -7116,6 +7154,15 @@ export type UpdateMessageFoldersMutationVariables = Exact<{
 
 export type UpdateMessageFoldersMutation = { __typename?: 'Mutation', updateMessageFolders: Array<{ __typename?: 'MessageFolder', id: string, isSynced: boolean }> };
 
+export type PublicConnectionParamsFragment = { __typename?: 'PublicConnectionParametersOutput', host: string, port: number, secure?: boolean | null, username?: string | null };
+
+export type ConnectedAccountByIdQueryVariables = Exact<{
+  id: Scalars['UUID'];
+}>;
+
+
+export type ConnectedAccountByIdQuery = { __typename?: 'Query', connectedAccountById?: { __typename?: 'ConnectedAccountPublicDTO', id: string, handle: string, provider: string, scopes?: Array<string> | null, userWorkspaceId: string, connectionParameters?: { __typename?: 'PublicImapSmtpCaldavConnectionParameters', IMAP?: { __typename?: 'PublicConnectionParametersOutput', host: string, port: number, secure?: boolean | null, username?: string | null } | null, SMTP?: { __typename?: 'PublicConnectionParametersOutput', host: string, port: number, secure?: boolean | null, username?: string | null } | null, CALDAV?: { __typename?: 'PublicConnectionParametersOutput', host: string, port: number, secure?: boolean | null, username?: string | null } | null } | null } | null };
+
 export type GetConnectedImapSmtpCaldavAccountQueryVariables = Exact<{
   id: Scalars['UUID'];
 }>;
@@ -8301,6 +8348,7 @@ export const MarketplaceAppDetailFieldsFragmentDoc = {"kind":"Document","definit
 export const MarketplaceAppFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"MarketplaceAppFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"MarketplaceApp"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"author"}},{"kind":"Field","name":{"kind":"Name","value":"category"}},{"kind":"Field","name":{"kind":"Name","value":"logo"}},{"kind":"Field","name":{"kind":"Name","value":"sourcePackage"}},{"kind":"Field","name":{"kind":"Name","value":"isFeatured"}}]}}]} as unknown as DocumentNode<MarketplaceAppFieldsFragment, unknown>;
 export const NavigationMenuItemFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"NavigationMenuItemFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"NavigationMenuItem"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"userWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"targetRecordId"}},{"kind":"Field","name":{"kind":"Name","value":"targetObjectMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"folderId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"link"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<NavigationMenuItemFieldsFragment, unknown>;
 export const NavigationMenuItemQueryFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"NavigationMenuItemQueryFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"NavigationMenuItem"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"NavigationMenuItemFields"}},{"kind":"Field","name":{"kind":"Name","value":"targetRecordIdentifier"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"labelIdentifier"}},{"kind":"Field","name":{"kind":"Name","value":"imageIdentifier"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"NavigationMenuItemFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"NavigationMenuItem"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"userWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"targetRecordId"}},{"kind":"Field","name":{"kind":"Name","value":"targetObjectMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"folderId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"link"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<NavigationMenuItemQueryFieldsFragment, unknown>;
+export const PublicConnectionParamsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"PublicConnectionParams"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PublicConnectionParametersOutput"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"host"}},{"kind":"Field","name":{"kind":"Name","value":"port"}},{"kind":"Field","name":{"kind":"Name","value":"secure"}},{"kind":"Field","name":{"kind":"Name","value":"username"}}]}}]} as unknown as DocumentNode<PublicConnectionParamsFragment, unknown>;
 export const ApplicationRegistrationFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ApplicationRegistrationFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ApplicationRegistration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"universalIdentifier"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthClientId"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthRedirectUris"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthScopes"}},{"kind":"Field","name":{"kind":"Name","value":"sourceType"}},{"kind":"Field","name":{"kind":"Name","value":"sourcePackage"}},{"kind":"Field","name":{"kind":"Name","value":"latestAvailableVersion"}},{"kind":"Field","name":{"kind":"Name","value":"isListed"}},{"kind":"Field","name":{"kind":"Name","value":"isFeatured"}},{"kind":"Field","name":{"kind":"Name","value":"ownerWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<ApplicationRegistrationFragmentFragment, unknown>;
 export const BillingPriceLicensedFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BillingPriceLicensedFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingPriceLicensed"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"stripePriceId"}},{"kind":"Field","name":{"kind":"Name","value":"unitAmount"}},{"kind":"Field","name":{"kind":"Name","value":"recurringInterval"}},{"kind":"Field","name":{"kind":"Name","value":"priceUsageType"}}]}}]} as unknown as DocumentNode<BillingPriceLicensedFragmentFragment, unknown>;
 export const BillingPriceMeteredFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"BillingPriceMeteredFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BillingPriceMetered"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"priceUsageType"}},{"kind":"Field","name":{"kind":"Name","value":"recurringInterval"}},{"kind":"Field","name":{"kind":"Name","value":"stripePriceId"}},{"kind":"Field","name":{"kind":"Name","value":"tiers"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"flatAmount"}},{"kind":"Field","name":{"kind":"Name","value":"unitAmount"}},{"kind":"Field","name":{"kind":"Name","value":"upTo"}}]}}]}}]} as unknown as DocumentNode<BillingPriceMeteredFragmentFragment, unknown>;
@@ -8440,6 +8488,7 @@ export const UpdateCalendarChannelDocument = {"kind":"Document","definitions":[{
 export const UpdateMessageChannelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateMessageChannel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateMessageChannelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateMessageChannel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"contactAutoCreationPolicy"}},{"kind":"Field","name":{"kind":"Name","value":"excludeNonProfessionalEmails"}},{"kind":"Field","name":{"kind":"Name","value":"excludeGroupEmails"}},{"kind":"Field","name":{"kind":"Name","value":"messageFolderImportPolicy"}}]}}]}}]} as unknown as DocumentNode<UpdateMessageChannelMutation, UpdateMessageChannelMutationVariables>;
 export const UpdateMessageFolderDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateMessageFolder"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateMessageFolderInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateMessageFolder"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"isSynced"}}]}}]}}]} as unknown as DocumentNode<UpdateMessageFolderMutation, UpdateMessageFolderMutationVariables>;
 export const UpdateMessageFoldersDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateMessageFolders"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateMessageFoldersInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateMessageFolders"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"isSynced"}}]}}]}}]} as unknown as DocumentNode<UpdateMessageFoldersMutation, UpdateMessageFoldersMutationVariables>;
+export const ConnectedAccountByIdDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ConnectedAccountById"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"connectedAccountById"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"handle"}},{"kind":"Field","name":{"kind":"Name","value":"provider"}},{"kind":"Field","name":{"kind":"Name","value":"scopes"}},{"kind":"Field","name":{"kind":"Name","value":"userWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"connectionParameters"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"IMAP"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"PublicConnectionParams"}}]}},{"kind":"Field","name":{"kind":"Name","value":"SMTP"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"PublicConnectionParams"}}]}},{"kind":"Field","name":{"kind":"Name","value":"CALDAV"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"PublicConnectionParams"}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"PublicConnectionParams"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PublicConnectionParametersOutput"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"host"}},{"kind":"Field","name":{"kind":"Name","value":"port"}},{"kind":"Field","name":{"kind":"Name","value":"secure"}},{"kind":"Field","name":{"kind":"Name","value":"username"}}]}}]} as unknown as DocumentNode<ConnectedAccountByIdQuery, ConnectedAccountByIdQueryVariables>;
 export const GetConnectedImapSmtpCaldavAccountDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetConnectedImapSmtpCaldavAccount"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getConnectedImapSmtpCaldavAccount"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"handle"}},{"kind":"Field","name":{"kind":"Name","value":"provider"}},{"kind":"Field","name":{"kind":"Name","value":"userWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"connectionParameters"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"IMAP"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"host"}},{"kind":"Field","name":{"kind":"Name","value":"port"}},{"kind":"Field","name":{"kind":"Name","value":"secure"}},{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"password"}}]}},{"kind":"Field","name":{"kind":"Name","value":"SMTP"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"host"}},{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"port"}},{"kind":"Field","name":{"kind":"Name","value":"secure"}},{"kind":"Field","name":{"kind":"Name","value":"password"}}]}},{"kind":"Field","name":{"kind":"Name","value":"CALDAV"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"host"}},{"kind":"Field","name":{"kind":"Name","value":"port"}},{"kind":"Field","name":{"kind":"Name","value":"secure"}},{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"password"}}]}}]}}]}}]}}]} as unknown as DocumentNode<GetConnectedImapSmtpCaldavAccountQuery, GetConnectedImapSmtpCaldavAccountQueryVariables>;
 export const MyCalendarChannelsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"MyCalendarChannels"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"connectedAccountId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"myCalendarChannels"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"connectedAccountId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"connectedAccountId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"handle"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"syncStage"}},{"kind":"Field","name":{"kind":"Name","value":"syncStageStartedAt"}},{"kind":"Field","name":{"kind":"Name","value":"isContactAutoCreationEnabled"}},{"kind":"Field","name":{"kind":"Name","value":"contactAutoCreationPolicy"}},{"kind":"Field","name":{"kind":"Name","value":"isSyncEnabled"}},{"kind":"Field","name":{"kind":"Name","value":"connectedAccountId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<MyCalendarChannelsQuery, MyCalendarChannelsQueryVariables>;
 export const MyConnectedAccountsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"MyConnectedAccounts"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"myConnectedAccounts"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"handle"}},{"kind":"Field","name":{"kind":"Name","value":"provider"}},{"kind":"Field","name":{"kind":"Name","value":"authFailedAt"}},{"kind":"Field","name":{"kind":"Name","value":"scopes"}},{"kind":"Field","name":{"kind":"Name","value":"handleAliases"}},{"kind":"Field","name":{"kind":"Name","value":"lastSignedInAt"}},{"kind":"Field","name":{"kind":"Name","value":"userWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"connectionParameters"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"IMAP"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"host"}},{"kind":"Field","name":{"kind":"Name","value":"port"}},{"kind":"Field","name":{"kind":"Name","value":"secure"}},{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"password"}}]}},{"kind":"Field","name":{"kind":"Name","value":"SMTP"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"host"}},{"kind":"Field","name":{"kind":"Name","value":"port"}},{"kind":"Field","name":{"kind":"Name","value":"secure"}},{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"password"}}]}},{"kind":"Field","name":{"kind":"Name","value":"CALDAV"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"host"}},{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"password"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<MyConnectedAccountsQuery, MyConnectedAccountsQueryVariables>;
diff --git a/packages/twenty-front/src/modules/accounts/utils/hasMissingDraftEmailScopes.ts b/packages/twenty-front/src/modules/accounts/utils/hasMissingDraftEmailScopes.ts
index dc9cec40acc..0d503ed2e43 100644
--- a/packages/twenty-front/src/modules/accounts/utils/hasMissingDraftEmailScopes.ts
+++ b/packages/twenty-front/src/modules/accounts/utils/hasMissingDraftEmailScopes.ts
@@ -5,7 +5,7 @@ import { ConnectedAccountProvider } from 'twenty-shared/types';
 import { assertUnreachable, isDefined } from 'twenty-shared/utils';
 
 export const getMissingDraftEmailScopes = (
-  connectedAccount: ConnectedAccount,
+  connectedAccount: Pick<ConnectedAccount, 'provider' | 'scopes'>,
 ): string[] => {
   const scopes = connectedAccount.scopes;
 
diff --git a/packages/twenty-front/src/modules/information-banner/hooks/useAccountToReconnect.ts b/packages/twenty-front/src/modules/information-banner/hooks/useAccountToReconnect.ts
index cd22938e953..5faa7f564fc 100644
--- a/packages/twenty-front/src/modules/information-banner/hooks/useAccountToReconnect.ts
+++ b/packages/twenty-front/src/modules/information-banner/hooks/useAccountToReconnect.ts
@@ -1,8 +1,6 @@
-import { type ConnectedAccount } from '@/accounts/types/ConnectedAccount';
 import { currentUserState } from '@/auth/states/currentUserState';
 import { type InformationBannerKeys } from '@/information-banner/types/InformationBannerKeys';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
+import { useMyConnectedAccounts } from '@/settings/accounts/hooks/useMyConnectedAccounts';
 import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
 
 export const useAccountToReconnect = (key: InformationBannerKeys) => {
@@ -12,13 +10,13 @@ export const useAccountToReconnect = (key: InformationBannerKeys) => {
 
   const firstAccountIdToReconnect = userVars?.[key]?.[0];
 
-  const accountToReconnect = useFindOneRecord<ConnectedAccount>({
-    objectNameSingular: CoreObjectNameSingular.ConnectedAccount,
-    objectRecordId: firstAccountIdToReconnect,
-    skip: !firstAccountIdToReconnect,
-  });
+  const { accounts } = useMyConnectedAccounts();
+
+  const accountToReconnect = accounts.find(
+    (account) => account.id === firstAccountIdToReconnect,
+  );
 
   return {
-    accountToReconnect: accountToReconnect?.record,
+    accountToReconnect,
   };
 };
diff --git a/packages/twenty-front/src/modules/settings/accounts/graphql/queries/getConnectedAccountById.ts b/packages/twenty-front/src/modules/settings/accounts/graphql/queries/getConnectedAccountById.ts
new file mode 100644
index 00000000000..4dda458faed
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/accounts/graphql/queries/getConnectedAccountById.ts
@@ -0,0 +1,31 @@
+import { gql } from '@apollo/client';
+
+export const GET_CONNECTED_ACCOUNT_BY_ID = gql`
+  fragment PublicConnectionParams on PublicConnectionParametersOutput {
+    host
+    port
+    secure
+    username
+  }
+
+  query ConnectedAccountById($id: UUID!) {
+    connectedAccountById(id: $id) {
+      id
+      handle
+      provider
+      scopes
+      userWorkspaceId
+      connectionParameters {
+        IMAP {
+          ...PublicConnectionParams
+        }
+        SMTP {
+          ...PublicConnectionParams
+        }
+        CALDAV {
+          ...PublicConnectionParams
+        }
+      }
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
index baa60d6d0c0..824d54d0edd 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
@@ -1,12 +1,12 @@
 import { type ConnectedAccount } from '@/accounts/types/ConnectedAccount';
 import { getMissingDraftEmailScopes } from '@/accounts/utils/hasMissingDraftEmailScopes';
 import { WorkflowSendEmailAttachments } from '@/advanced-text-editor/components/WorkflowSendEmailAttachments';
-import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
-import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { FormAdvancedTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormAdvancedTextFieldInput';
 import { FormMultiTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormMultiTextFieldInput';
 import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
+import { GET_CONNECTED_ACCOUNT_BY_ID } from '@/settings/accounts/graphql/queries/getConnectedAccountById';
+import { useMyConnectedAccounts } from '@/settings/accounts/hooks/useMyConnectedAccounts';
 import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
 import { Select } from '@/ui/input/components/Select';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
@@ -15,7 +15,6 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
 import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
 import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
 import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
 import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
 import { workflowVisualizerWorkflowIdComponentState } from '@/workflow/states/workflowVisualizerWorkflowIdComponentState';
 import { type WorkflowEmailAction } from '@/workflow/types/WorkflowEmailAction';
@@ -23,6 +22,7 @@ import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowS
 import { WorkflowStepFooter } from '@/workflow/workflow-steps/components/WorkflowStepFooter';
 import { useEmailForm } from '@/workflow/workflow-steps/workflow-actions/hooks/useEmailForm';
 import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';
+import { useQuery } from '@apollo/client/react';
 import { t } from '@lingui/core/macro';
 import { useEffect, useState } from 'react';
 import { ConnectedAccountProvider, SettingsPath } from 'twenty-shared/types';
@@ -52,7 +52,6 @@ export const WorkflowEditActionEmailBase = ({
   action,
   actionOptions,
 }: WorkflowEditActionEmailBaseProps) => {
-  const currentWorkspaceMember = useAtomStateValue(currentWorkspaceMemberState);
   const { triggerApisOAuth } = useTriggerApisOAuth();
 
   const workflowVisualizerWorkflowId = useAtomComponentStateValue(
@@ -110,43 +109,40 @@ export const WorkflowEditActionEmailBase = ({
     handleFieldChange('connectedAccountId', connectedAccountId);
   };
 
-  const filter: { or: object[] } = {
-    or: [
-      {
-        userWorkspaceId: {
-          eq: currentWorkspaceMember?.id,
-        },
-      },
-    ],
-  };
+  const { accounts: myAccounts, loading: myAccountsLoading } =
+    useMyConnectedAccounts();
 
-  if (
-    isDefined(action.settings.input.connectedAccountId) &&
-    action.settings.input.connectedAccountId !== ''
-  ) {
-    filter.or.push({
-      id: {
-        eq: action.settings.input.connectedAccountId,
-      },
-    });
-  }
+  const configuredAccountId = formData.connectedAccountId;
+  const isConfiguredAccountMine = myAccounts.some(
+    (account) => account.id === configuredAccountId,
+  );
 
-  const { records: accounts, loading } = useFindManyRecords<ConnectedAccount>({
-    objectNameSingular: 'connectedAccount',
-    filter,
-    recordGqlFields: {
-      id: true,
-      handle: true,
-      provider: true,
-      scopes: true,
-      userWorkspaceId: true,
-      connectionParameters: true,
-    },
+  const { data: otherAccountData, loading: otherAccountLoading } = useQuery<{
+    connectedAccountById: Pick<
+      ConnectedAccount,
+      | 'id'
+      | 'handle'
+      | 'provider'
+      | 'scopes'
+      | 'userWorkspaceId'
+      | 'connectionParameters'
+    > | null;
+  }>(GET_CONNECTED_ACCOUNT_BY_ID, {
+    variables: { id: configuredAccountId },
+    skip:
+      !isDefined(configuredAccountId) ||
+      configuredAccountId === '' ||
+      isConfiguredAccountMine,
   });
 
-  const selectedAccount = accounts.find(
-    (account) => account.id === formData.connectedAccountId,
-  );
+  const loading = myAccountsLoading || otherAccountLoading;
+
+  const otherAccount = otherAccountData?.connectedAccountById ?? null;
+
+  const selectedAccount =
+    myAccounts.find((account) => account.id === configuredAccountId) ??
+    otherAccount ??
+    undefined;
 
   const missingDraftScopes =
     action.type === 'DRAFT_EMAIL' && isDefined(selectedAccount)
@@ -169,7 +165,7 @@ export const WorkflowEditActionEmailBase = ({
   };
   const connectedAccountOptions: SelectOption<string | null>[] = [];
 
-  accounts.forEach((account) => {
+  myAccounts.forEach((account) => {
     if (
       account.provider === ConnectedAccountProvider.IMAP_SMTP_CALDAV &&
       !isDefined(account.connectionParameters?.SMTP)
@@ -177,17 +173,25 @@ export const WorkflowEditActionEmailBase = ({
       return;
     }
 
-    const selectOption = {
+    connectedAccountOptions.push({
       label: account.handle,
       value: account.id,
-    };
-    if (account.userWorkspaceId === currentWorkspaceMember?.id) {
-      connectedAccountOptions.push(selectOption);
-    } else {
-      emptyOption = selectOption;
-    }
+    });
   });
 
+  if (
+    isDefined(otherAccount) &&
+    !(
+      otherAccount.provider === ConnectedAccountProvider.IMAP_SMTP_CALDAV &&
+      !isDefined(otherAccount.connectionParameters?.SMTP)
+    )
+  ) {
+    emptyOption = {
+      label: otherAccount.handle,
+      value: otherAccount.id,
+    };
+  }
+
   const navigate = useNavigateSettings();
 
   const { closeSidePanelMenu } = useSidePanelMenu();
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-22/1-22-workspace-command-1780000001000-backfill-page-layouts-and-fields-widget-view-fields.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-22/1-22-workspace-command-1780000001000-backfill-page-layouts-and-fields-widget-view-fields.command.ts
index c6901264f1c..114d4f2b72c 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-22/1-22-workspace-command-1780000001000-backfill-page-layouts-and-fields-widget-view-fields.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-22/1-22-workspace-command-1780000001000-backfill-page-layouts-and-fields-widget-view-fields.command.ts
@@ -12,10 +12,10 @@ import { v4 } from 'uuid';
 import { ActiveOrSuspendedWorkspaceCommandRunner } from 'src/database/commands/command-runners/active-or-suspended-workspace.command-runner';
 import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
 import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
-import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
 import { ApplicationService } from 'src/engine/core-modules/application/application.service';
 import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
 import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
 import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
 import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
 import { type FlatPageLayoutTab } from 'src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab.type';
@@ -779,6 +779,7 @@ export class BackfillPageLayoutsAndFieldsWidgetViewFieldsCommand extends ActiveO
           deletedAt: null,
           conditionalDisplay: null,
           overrides: null,
+          universalOverrides: null,
         };
 
         widgetsToCreate.push(widget);
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util.ts
index 7c3ae6c60cb..2b4c8f72752 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-page-layout-widget-manifest-to-universal-flat-page-layout-widget.util.ts
@@ -36,6 +36,6 @@ export const fromPageLayoutWidgetManifestToUniversalFlatPageLayoutWidget = ({
     createdAt: now,
     updatedAt: now,
     deletedAt: null,
-    overrides: null,
+    universalOverrides: null,
   };
 };
diff --git a/packages/twenty-server/src/engine/metadata-modules/connected-account/dtos/connected-account-public.dto.ts b/packages/twenty-server/src/engine/metadata-modules/connected-account/dtos/connected-account-public.dto.ts
new file mode 100644
index 00000000000..08d24c4ae52
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/connected-account/dtos/connected-account-public.dto.ts
@@ -0,0 +1,32 @@
+import { Field, ObjectType, OmitType } from '@nestjs/graphql';
+
+import { IsOptional } from 'class-validator';
+
+import { ConnectionParametersDTO } from 'src/engine/core-modules/imap-smtp-caldav-connection/dtos/imap-smtp-caldav-connection.dto';
+import { ConnectedAccountDTO } from 'src/engine/metadata-modules/connected-account/dtos/connected-account.dto';
+
+@ObjectType('PublicConnectionParametersOutput')
+class PublicConnectionParametersDTO extends OmitType(ConnectionParametersDTO, [
+  'password',
+] as const) {}
+
+@ObjectType('PublicImapSmtpCaldavConnectionParameters')
+class PublicImapSmtpCaldavConnectionParametersDTO {
+  @Field(() => PublicConnectionParametersDTO, { nullable: true })
+  IMAP?: PublicConnectionParametersDTO;
+
+  @Field(() => PublicConnectionParametersDTO, { nullable: true })
+  SMTP?: PublicConnectionParametersDTO;
+
+  @Field(() => PublicConnectionParametersDTO, { nullable: true })
+  CALDAV?: PublicConnectionParametersDTO;
+}
+
+@ObjectType('ConnectedAccountPublicDTO')
+export class ConnectedAccountPublicDTO extends OmitType(ConnectedAccountDTO, [
+  'connectionParameters',
+] as const) {
+  @IsOptional()
+  @Field(() => PublicImapSmtpCaldavConnectionParametersDTO, { nullable: true })
+  connectionParameters: PublicImapSmtpCaldavConnectionParametersDTO | null;
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver.ts
index 5cbd527a2ab..ecaabb4eae5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/connected-account/resolvers/connected-account.resolver.ts
@@ -13,6 +13,7 @@ import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.g
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { ConnectedAccountMetadataService } from 'src/engine/metadata-modules/connected-account/connected-account-metadata.service';
 import { ConnectedAccountDTO } from 'src/engine/metadata-modules/connected-account/dtos/connected-account.dto';
+import { ConnectedAccountPublicDTO } from 'src/engine/metadata-modules/connected-account/dtos/connected-account-public.dto';
 import { ConnectedAccountGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules/connected-account/interceptors/connected-account-graphql-api-exception.interceptor';
 
 @UseGuards(WorkspaceAuthGuard)
@@ -35,6 +36,18 @@ export class ConnectedAccountResolver {
     });
   }
 
+  @Query(() => ConnectedAccountPublicDTO, { nullable: true })
+  @UseGuards(NoPermissionGuard)
+  async connectedAccountById(
+    @Args('id', { type: () => UUIDScalarType }) id: string,
+    @AuthWorkspace() workspace: WorkspaceEntity,
+  ): Promise<ConnectedAccountPublicDTO | null> {
+    return this.connectedAccountMetadataService.findById({
+      id,
+      workspaceId: workspace.id,
+    });
+  }
+
   @Query(() => [ConnectedAccountDTO])
   @UseGuards(SettingsPermissionGuard(PermissionFlagType.CONNECTED_ACCOUNTS))
   async connectedAccounts(
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/all-universal-flat-entity-properties-to-compare-and-stringify.constant.spec.ts.snap b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/all-universal-flat-entity-properties-to-compare-and-stringify.constant.spec.ts.snap
index 3cb86716385..4390d9e6504 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/all-universal-flat-entity-properties-to-compare-and-stringify.constant.spec.ts.snap
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/__tests__/__snapshots__/all-universal-flat-entity-properties-to-compare-and-stringify.constant.spec.ts.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+// Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ALL_UNIVERSAL_FLAT_ENTITY_PROPERTIES_TO_COMPARE_AND_STRINGIFY should match snapshot 1`] = `
 {
@@ -195,14 +195,14 @@ exports[`ALL_UNIVERSAL_FLAT_ENTITY_PROPERTIES_TO_COMPARE_AND_STRINGIFY should ma
       "deletedAt",
       "conditionalDisplay",
       "isActive",
-      "overrides",
+      "universalOverrides",
     ],
     "propertiesToStringify": [
       "gridPosition",
       "position",
       "universalConfiguration",
       "conditionalDisplay",
-      "overrides",
+      "universalOverrides",
     ],
   },
   "permissionFlag": {
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts
index f7016ba100e..bb73fa994cb 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-entity-properties-configuration-by-metadata-name.constant.ts
@@ -921,6 +921,7 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {
       toCompare: false,
       toStringify: false,
       universalProperty: 'pageLayoutTabUniversalIdentifier',
+      isOverridable: true,
     },
     conditionalDisplay: {
       toCompare: true,
@@ -937,7 +938,7 @@ export const ALL_ENTITY_PROPERTIES_CONFIGURATION_BY_METADATA_NAME = {
     overrides: {
       toCompare: true,
       toStringify: true,
-      universalProperty: undefined,
+      universalProperty: 'universalOverrides',
     },
   },
   pageLayoutTab: {
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/split-entities-by-reset-strategy.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/split-entities-by-reset-strategy.util.ts
index 0b0b013c2ef..16ee1038ed5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/split-entities-by-reset-strategy.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/split-entities-by-reset-strategy.util.ts
@@ -36,6 +36,7 @@ export const splitEntitiesByResetStrategy = <
         ...entity,
         isActive: true as const,
         overrides: null,
+        ...('universalOverrides' in entity ? { universalOverrides: null } : {}),
         updatedAt: now,
       });
     }
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/constants/flat-page-layout-widget-editable-properties.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/constants/flat-page-layout-widget-editable-properties.constant.ts
index 9556e907077..23ddf79f395 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/constants/flat-page-layout-widget-editable-properties.constant.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/constants/flat-page-layout-widget-editable-properties.constant.ts
@@ -8,4 +8,5 @@ export const FLAT_PAGE_LAYOUT_WIDGET_EDITABLE_PROPERTIES = [
   'position',
   'configuration',
   'conditionalDisplay',
+  'pageLayoutTabId',
 ] as const satisfies MetadataEntityPropertyName<'pageLayoutWidget'>[];
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-create-page-layout-widget-input-to-flat-page-layout-widget-to-create.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-create-page-layout-widget-input-to-flat-page-layout-widget-to-create.util.ts
index c94d2bd08c5..70a1d1c751c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-create-page-layout-widget-input-to-flat-page-layout-widget-to-create.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-create-page-layout-widget-input-to-flat-page-layout-widget-to-create.util.ts
@@ -75,6 +75,7 @@ export const fromCreatePageLayoutWidgetInputToFlatPageLayoutWidgetToCreate = ({
     applicationUniversalIdentifier: flatApplication.universalIdentifier,
     conditionalDisplay: null,
     overrides: null,
+    universalOverrides: null,
     universalConfiguration:
       fromPageLayoutWidgetConfigurationToUniversalConfiguration({
         configuration: createPageLayoutWidgetInput.configuration,
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-entity-to-flat-page-layout-widget.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-entity-to-flat-page-layout-widget.util.ts
index db8f9cac224..82e059ecc34 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-entity-to-flat-page-layout-widget.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-entity-to-flat-page-layout-widget.util.ts
@@ -7,6 +7,7 @@ import {
 import { getMetadataEntityRelationProperties } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-entity-relation-properties.util';
 import { type FlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type';
 import { fromPageLayoutWidgetConfigurationToUniversalConfiguration } from 'src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-configuration-to-universal-configuration.util';
+import { fromPageLayoutWidgetOverridesToUniversalOverrides } from 'src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-overrides-to-universal-overrides.util';
 import { type FromEntityToFlatEntityArgs } from 'src/engine/workspace-cache/types/from-entity-to-flat-entity-args.type';
 
 type FromPageLayoutWidgetEntityToFlatPageLayoutWidgetArgs =
@@ -81,6 +82,18 @@ export const fromPageLayoutWidgetEntityToFlatPageLayoutWidget = ({
       viewUniversalIdentifierById,
     });
 
+  const pageLayoutTabUniversalIdentifierById = Object.fromEntries(
+    pageLayoutTabIdToUniversalIdentifierMap.entries(),
+  );
+
+  const universalOverrides = isDefined(pageLayoutWidgetEntity.overrides)
+    ? fromPageLayoutWidgetOverridesToUniversalOverrides({
+        overrides: pageLayoutWidgetEntity.overrides,
+        pageLayoutTabUniversalIdentifierById,
+        shouldThrowOnMissingIdentifier: false,
+      })
+    : null;
+
   return {
     ...pageLayoutWidgetEntityWithoutRelations,
     createdAt: pageLayoutWidgetEntity.createdAt.toISOString(),
@@ -93,5 +106,6 @@ export const fromPageLayoutWidgetEntityToFlatPageLayoutWidget = ({
     pageLayoutTabUniversalIdentifier,
     objectMetadataUniversalIdentifier,
     universalConfiguration: configurationWithUniversalIdentifiers,
+    universalOverrides,
   };
 };
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-overrides-to-universal-overrides.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-overrides-to-universal-overrides.util.ts
new file mode 100644
index 00000000000..efba976d612
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-overrides-to-universal-overrides.util.ts
@@ -0,0 +1,54 @@
+import { type FormatRecordSerializedRelationProperties } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+
+import {
+  FlatEntityMapsException,
+  FlatEntityMapsExceptionCode,
+} from 'src/engine/metadata-modules/flat-entity/exceptions/flat-entity-maps.exception';
+import { type PageLayoutWidgetOverrides } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity';
+
+type UniversalPageLayoutWidgetOverrides =
+  FormatRecordSerializedRelationProperties<PageLayoutWidgetOverrides>;
+
+export const fromPageLayoutWidgetOverridesToUniversalOverrides = ({
+  overrides,
+  pageLayoutTabUniversalIdentifierById,
+  shouldThrowOnMissingIdentifier = true,
+}: {
+  overrides: PageLayoutWidgetOverrides;
+  pageLayoutTabUniversalIdentifierById: Partial<Record<string, string>>;
+  shouldThrowOnMissingIdentifier?: boolean;
+}): UniversalPageLayoutWidgetOverrides => {
+  const { pageLayoutTabId, ...scalarOverrides } = overrides;
+
+  if (!isDefined(pageLayoutTabId)) {
+    return {
+      ...scalarOverrides,
+      ...(pageLayoutTabId === null
+        ? { pageLayoutTabUniversalIdentifier: null }
+        : {}),
+    };
+  }
+
+  const pageLayoutTabUniversalIdentifier =
+    pageLayoutTabUniversalIdentifierById[pageLayoutTabId];
+
+  if (!isDefined(pageLayoutTabUniversalIdentifier)) {
+    if (shouldThrowOnMissingIdentifier) {
+      throw new FlatEntityMapsException(
+        `PageLayoutTab universal identifier not found for id: ${pageLayoutTabId}`,
+        FlatEntityMapsExceptionCode.RELATION_UNIVERSAL_IDENTIFIER_NOT_FOUND,
+      );
+    }
+
+    return {
+      ...scalarOverrides,
+      pageLayoutTabUniversalIdentifier: null,
+    };
+  }
+
+  return {
+    ...scalarOverrides,
+    pageLayoutTabUniversalIdentifier,
+  };
+};
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-update-page-layout-widget-input-to-flat-page-layout-widget-to-update-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-update-page-layout-widget-input-to-flat-page-layout-widget-to-update-or-throw.util.ts
index cda2317e3b2..f167853e6a7 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-update-page-layout-widget-input-to-flat-page-layout-widget-to-update-or-throw.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout-widget/utils/from-update-page-layout-widget-input-to-flat-page-layout-widget-to-update-or-throw.util.ts
@@ -11,6 +11,7 @@ import { FLAT_PAGE_LAYOUT_WIDGET_EDITABLE_PROPERTIES } from 'src/engine/metadata
 import { type FlatPageLayoutWidgetMaps } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget-maps.type';
 import { type FlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type';
 import { fromPageLayoutWidgetConfigurationToUniversalConfiguration } from 'src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-configuration-to-universal-configuration.util';
+import { fromPageLayoutWidgetOverridesToUniversalOverrides } from 'src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-overrides-to-universal-overrides.util';
 import { type UpdatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget.input';
 import {
   PageLayoutWidgetException,
@@ -35,6 +36,7 @@ export const fromUpdatePageLayoutWidgetInputToFlatPageLayoutWidgetToUpdateOrThro
     flatFrontComponentMaps,
     flatViewFieldGroupMaps,
     flatViewMaps,
+    flatPageLayoutTabMaps,
     callerApplicationUniversalIdentifier,
     workspaceCustomApplicationUniversalIdentifier,
   }: {
@@ -49,6 +51,7 @@ export const fromUpdatePageLayoutWidgetInputToFlatPageLayoutWidgetToUpdateOrThro
     | 'flatFrontComponentMaps'
     | 'flatViewFieldGroupMaps'
     | 'flatViewMaps'
+    | 'flatPageLayoutTabMaps'
   >): FlatPageLayoutWidget => {
     const { id: pageLayoutWidgetToUpdateId } =
       extractAndSanitizeObjectStringFields(rawUpdatePageLayoutWidgetInput, [
@@ -103,7 +106,21 @@ export const fromUpdatePageLayoutWidgetInputToFlatPageLayoutWidgetToUpdateOrThro
         update: updatedEditableProperties,
       }),
       overrides,
-    };
+    } as FlatPageLayoutWidget;
+
+    if (updatedEditableProperties.pageLayoutTabId !== undefined) {
+      const { pageLayoutTabUniversalIdentifier } =
+        resolveEntityRelationUniversalIdentifiers({
+          metadataName: 'pageLayoutWidget',
+          foreignKeyValues: {
+            pageLayoutTabId: flatPageLayoutWidgetToUpdate.pageLayoutTabId,
+          },
+          flatEntityMaps: { flatPageLayoutTabMaps },
+        });
+
+      flatPageLayoutWidgetToUpdate.pageLayoutTabUniversalIdentifier =
+        pageLayoutTabUniversalIdentifier;
+    }
 
     if (updatedEditableProperties.objectMetadataId !== undefined) {
       const { objectMetadataUniversalIdentifier } =
@@ -133,5 +150,16 @@ export const fromUpdatePageLayoutWidgetInputToFlatPageLayoutWidgetToUpdateOrThro
         });
     }
 
+    if (isDefined(overrides)) {
+      flatPageLayoutWidgetToUpdate.universalOverrides =
+        fromPageLayoutWidgetOverridesToUniversalOverrides({
+          overrides,
+          pageLayoutTabUniversalIdentifierById:
+            flatPageLayoutTabMaps.universalIdentifierById,
+        });
+    } else {
+      flatPageLayoutWidgetToUpdate.universalOverrides = null;
+    }
+
     return flatPageLayoutWidgetToUpdate;
   };
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/utils/reconstruct-flat-page-layout-with-tabs-and-widgets.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/utils/reconstruct-flat-page-layout-with-tabs-and-widgets.util.ts
index 2aeb7bea76c..c914e0df6df 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/utils/reconstruct-flat-page-layout-with-tabs-and-widgets.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-page-layout/utils/reconstruct-flat-page-layout-with-tabs-and-widgets.util.ts
@@ -5,6 +5,7 @@ import { type FlatPageLayoutTab } from 'src/engine/metadata-modules/flat-page-la
 import { type FlatPageLayoutWidgetMaps } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget-maps.type';
 import { type FlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type';
 import { type FlatPageLayout } from 'src/engine/metadata-modules/flat-page-layout/types/flat-page-layout.type';
+import { resolveOverridableEntityProperty } from 'src/engine/metadata-modules/utils/resolve-overridable-entity-property.util';
 
 export type FlatPageLayoutTabWithWidgets = FlatPageLayoutTab & {
   widgets: FlatPageLayoutWidget[];
@@ -14,6 +15,9 @@ export type FlatPageLayoutWithTabsAndWidgets = FlatPageLayout & {
   tabs: FlatPageLayoutTabWithWidgets[];
 };
 
+const getResolvedPageLayoutTabId = (widget: FlatPageLayoutWidget): string =>
+  resolveOverridableEntityProperty(widget, 'pageLayoutTabId');
+
 export const reconstructFlatPageLayoutWithTabsAndWidgets = ({
   layout,
   flatPageLayoutTabMaps,
@@ -33,7 +37,10 @@ export const reconstructFlatPageLayoutWithTabsAndWidgets = ({
       flatPageLayoutWidgetMaps.byUniversalIdentifier,
     )
       .filter(isDefined)
-      .filter((widget) => widget.pageLayoutTabId === tab.id && widget.isActive);
+      .filter(
+        (widget) =>
+          getResolvedPageLayoutTabId(widget) === tab.id && widget.isActive,
+      );
 
     return {
       ...tab,
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget.input.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget.input.ts
index b0e2470fa49..66745aba10a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget.input.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget.input.ts
@@ -22,6 +22,11 @@ import { AllPageLayoutWidgetConfiguration } from 'src/engine/metadata-modules/pa
 
 @InputType()
 export class UpdatePageLayoutWidgetInput {
+  @Field(() => UUIDScalarType, { nullable: true })
+  @IsUUID()
+  @IsOptional()
+  pageLayoutTabId?: string;
+
   @Field({ nullable: true })
   @IsString()
   @IsOptional()
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts
index eac08efbf79..1b912550988 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity.ts
@@ -4,6 +4,7 @@ import {
   PageLayoutWidgetConditionalDisplay,
   PageLayoutWidgetPosition,
   type GridPosition,
+  type SerializedRelation,
 } from 'twenty-shared/types';
 import {
   Column,
@@ -30,6 +31,7 @@ export type PageLayoutWidgetOverrides = {
   title?: string;
   position?: PageLayoutWidgetPosition | null;
   conditionalDisplay?: PageLayoutWidgetConditionalDisplay | null;
+  pageLayoutTabId?: SerializedRelation;
 };
 
 @Entity({ name: 'pageLayoutWidget', schema: 'core' })
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts
index 27f6444e4fa..d0864c7cb41 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout-widget/services/page-layout-widget.service.ts
@@ -18,6 +18,7 @@ import {
 import { CreatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/create-page-layout-widget.input';
 import { UpdatePageLayoutWidgetInput } from 'src/engine/metadata-modules/page-layout-widget/dtos/inputs/update-page-layout-widget.input';
 import { type PageLayoutWidgetDTO } from 'src/engine/metadata-modules/page-layout-widget/dtos/page-layout-widget.dto';
+import { resolveOverridableEntityProperty } from 'src/engine/metadata-modules/utils/resolve-overridable-entity-property.util';
 import { WidgetConfigurationType } from 'src/engine/metadata-modules/page-layout-widget/enums/widget-configuration-type.type';
 import {
   PageLayoutWidgetException,
@@ -162,8 +163,8 @@ export class PageLayoutWidgetService {
       .filter(isDefined)
       .filter(
         (widget) =>
-          widget.pageLayoutTabId === pageLayoutTabId &&
-          !isDefined(widget.deletedAt),
+          resolveOverridableEntityProperty(widget, 'pageLayoutTabId') ===
+            pageLayoutTabId && !isDefined(widget.deletedAt),
       )
       .sort(
         (widgetA, widgetB) =>
@@ -317,6 +318,7 @@ export class PageLayoutWidgetService {
         flatFrontComponentMaps: existingFlatFrontComponentMaps,
         flatViewFieldGroupMaps: existingFlatViewFieldGroupMaps,
         flatViewMaps: existingFlatViewMaps,
+        flatPageLayoutTabMaps: existingFlatPageLayoutTabMaps,
       },
       { workspaceCustomFlatApplication },
     ] = await Promise.all([
@@ -329,6 +331,7 @@ export class PageLayoutWidgetService {
             'flatFrontComponentMaps',
             'flatViewFieldGroupMaps',
             'flatViewMaps',
+            'flatPageLayoutTabMaps',
           ],
         },
       ),
@@ -368,6 +371,7 @@ export class PageLayoutWidgetService {
         flatFrontComponentMaps: existingFlatFrontComponentMaps,
         flatViewFieldGroupMaps: existingFlatViewFieldGroupMaps,
         flatViewMaps: existingFlatViewMaps,
+        flatPageLayoutTabMaps: existingFlatPageLayoutTabMaps,
         callerApplicationUniversalIdentifier:
           workspaceCustomFlatApplication.universalIdentifier,
         workspaceCustomApplicationUniversalIdentifier:
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-reset.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-reset.service.ts
index d544fe6da95..9ae3b999432 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-reset.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-reset.service.ts
@@ -116,6 +116,7 @@ export class PageLayoutResetService {
     const widgetToUpdate: FlatPageLayoutWidget = {
       ...widget,
       overrides: null,
+      universalOverrides: null,
       updatedAt: now,
     };
 
@@ -547,15 +548,10 @@ export class PageLayoutResetService {
         now,
       });
 
-    const viewFieldsToReset = fieldsToReset.map((field) => ({
-      ...field,
-      universalOverrides: null,
-    }));
-
     return {
       viewFieldGroupsToUpdate: groupsToReset,
       viewFieldGroupsToDelete: groupsToDelete,
-      viewFieldsToUpdate: viewFieldsToReset,
+      viewFieldsToUpdate: fieldsToReset,
       viewFieldsToDelete: fieldsToDelete,
     };
   }
diff --git a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-update.service.ts b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-update.service.ts
index a78d58be98d..1b581244a21 100644
--- a/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-update.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/page-layout/services/page-layout-update.service.ts
@@ -10,6 +10,7 @@ import { AllFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types
 import { addFlatEntityToFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/add-flat-entity-to-flat-entity-maps-or-throw.util';
 import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
 import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
+import { resolveEntityRelationUniversalIdentifiers } from 'src/engine/metadata-modules/flat-entity/utils/resolve-entity-relation-universal-identifiers.util';
 import { splitEntitiesByRemovalStrategy } from 'src/engine/metadata-modules/flat-entity/utils/split-entities-by-removal-strategy.util';
 import { FLAT_PAGE_LAYOUT_TAB_EDITABLE_PROPERTIES } from 'src/engine/metadata-modules/flat-page-layout-tab/constants/flat-page-layout-tab-editable-properties.constant';
 import { type FlatPageLayoutTabMaps } from 'src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab-maps.type';
@@ -18,6 +19,7 @@ import { FLAT_PAGE_LAYOUT_WIDGET_EDITABLE_PROPERTIES } from 'src/engine/metadata
 import { type FlatPageLayoutWidget } from 'src/engine/metadata-modules/flat-page-layout-widget/types/flat-page-layout-widget.type';
 import { buildFlatPageLayoutWidgetCommonProperties } from 'src/engine/metadata-modules/flat-page-layout-widget/utils/build-flat-page-layout-widget-common-properties.util';
 import { fromPageLayoutWidgetConfigurationToUniversalConfiguration } from 'src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-configuration-to-universal-configuration.util';
+import { fromPageLayoutWidgetOverridesToUniversalOverrides } from 'src/engine/metadata-modules/flat-page-layout-widget/utils/from-page-layout-widget-overrides-to-universal-overrides.util';
 import { type FlatPageLayout } from 'src/engine/metadata-modules/flat-page-layout/types/flat-page-layout.type';
 import { reconstructFlatPageLayoutWithTabsAndWidgets } from 'src/engine/metadata-modules/flat-page-layout/utils/reconstruct-flat-page-layout-with-tabs-and-widgets.util';
 import { UpdatePageLayoutTabWithWidgetsInput } from 'src/engine/metadata-modules/page-layout-tab/dtos/inputs/update-page-layout-tab-with-widgets.input';
@@ -468,11 +470,16 @@ export class PageLayoutUpdateService {
     const allWidgetsToUpdate: FlatPageLayoutWidget[] = [];
     const allWidgetsToDelete: FlatPageLayoutWidget[] = [];
 
+    const widgetIdsAcrossAllTabs = new Set(
+      tabs.flatMap((tab) => tab.widgets.map((widget) => widget.id)),
+    );
+
     for (const tabInput of tabs) {
       const { widgetsToCreate, widgetsToUpdate, widgetsToDelete } =
         this.computeWidgetOperationsForTab({
           tabId: tabInput.id,
           widgets: tabInput.widgets,
+          widgetIdsAcrossAllTabs,
           flatPageLayoutWidgetMaps,
           flatPageLayoutTabMaps,
           flatObjectMetadataMaps,
@@ -500,6 +507,7 @@ export class PageLayoutUpdateService {
   private computeWidgetOperationsForTab({
     tabId,
     widgets,
+    widgetIdsAcrossAllTabs,
     flatPageLayoutWidgetMaps,
     flatPageLayoutTabMaps,
     flatObjectMetadataMaps,
@@ -513,6 +521,7 @@ export class PageLayoutUpdateService {
   }: {
     tabId: string;
     widgets: UpdatePageLayoutWidgetWithIdInput[];
+    widgetIdsAcrossAllTabs: Set<string>;
     workspaceId: string;
     workspaceCustomApplicationId: string;
     workspaceCustomApplicationUniversalIdentifier: string;
@@ -538,11 +547,15 @@ export class PageLayoutUpdateService {
       });
     }
 
-    const existingWidgets = Object.values(
-      flatPageLayoutWidgetMaps.byUniversalIdentifier,
-    )
-      .filter(isDefined)
-      .filter((widget) => widget.pageLayoutTabId === tabId);
+    const widgetIdsInCurrentTabInput = new Set(
+      widgets.map((widget) => widget.id),
+    );
+
+    const existingWidgets = this.findWidgetsInTabOrMovingToTab({
+      tabId,
+      widgetIdsInCurrentTabInput,
+      flatPageLayoutWidgetMaps,
+    });
 
     const resolvedExistingWidgets = existingWidgets.map(
       resolveFlatEntityOverridableProperties,
@@ -587,6 +600,7 @@ export class PageLayoutUpdateService {
             workspaceCustomApplicationUniversalIdentifier,
           conditionalDisplay: null,
           overrides: null,
+          universalOverrides: null,
           isActive: true,
           universalConfiguration:
             fromPageLayoutWidgetConfigurationToUniversalConfiguration({
@@ -604,120 +618,45 @@ export class PageLayoutUpdateService {
     );
 
     const widgetsToUpdate: FlatPageLayoutWidget[] = entitiesToUpdate.map(
-      (widgetInput) => {
-        const existingWidget = findFlatEntityByIdInFlatEntityMapsOrThrow({
-          flatEntityId: widgetInput.id,
-          flatEntityMaps: flatPageLayoutWidgetMaps,
-        });
-
-        const shouldOverride = isCallerOverridingEntity({
-          callerApplicationUniversalIdentifier:
-            workspaceCustomApplicationUniversalIdentifier,
-          entityApplicationUniversalIdentifier:
-            existingWidget.applicationUniversalIdentifier,
-          workspaceCustomApplicationUniversalIdentifier,
-        });
-
-        const commonProperties = buildFlatPageLayoutWidgetCommonProperties({
+      (widgetInput) =>
+        this.buildUpdatedFlatPageLayoutWidget({
           widgetInput,
+          flatPageLayoutWidgetMaps,
           flatPageLayoutTabMaps,
           flatObjectMetadataMaps,
-        });
-
-        const updatedConfiguration = widgetInput.configuration ?? null;
-
-        const { overrides, updatedEditableProperties } =
-          sanitizeOverridableEntityInput({
-            metadataName: 'pageLayoutWidget',
-            existingFlatEntity: existingWidget,
-            updatedEditableProperties: {
-              ...commonProperties,
-              configuration: updatedConfiguration,
-            },
-            shouldOverride,
-          });
-
-        return {
-          ...existingWidget,
-          ...updatedEditableProperties,
-          overrides,
-          updatedAt: now.toISOString(),
-          ...(isDefined(updatedConfiguration) && {
-            universalConfiguration:
-              fromPageLayoutWidgetConfigurationToUniversalConfiguration({
-                configuration: updatedConfiguration,
-                fieldMetadataUniversalIdentifierById:
-                  flatFieldMetadataMaps.universalIdentifierById,
-                frontComponentUniversalIdentifierById:
-                  flatFrontComponentMaps.universalIdentifierById,
-                viewFieldGroupUniversalIdentifierById:
-                  flatViewFieldGroupMaps.universalIdentifierById,
-                viewUniversalIdentifierById:
-                  flatViewMaps.universalIdentifierById,
-              }),
-          }),
-        };
-      },
+          flatFieldMetadataMaps,
+          flatFrontComponentMaps,
+          flatViewFieldGroupMaps,
+          flatViewMaps,
+          workspaceCustomApplicationUniversalIdentifier,
+          now,
+        }),
     );
 
     const widgetsToRestoreAndUpdate: FlatPageLayoutWidget[] =
-      entitiesToRestoreAndUpdate.map((widgetInput) => {
-        const existingWidget = findFlatEntityByIdInFlatEntityMapsOrThrow({
-          flatEntityId: widgetInput.id,
-          flatEntityMaps: flatPageLayoutWidgetMaps,
-        });
-
-        const shouldOverride = isCallerOverridingEntity({
-          callerApplicationUniversalIdentifier:
-            workspaceCustomApplicationUniversalIdentifier,
-          entityApplicationUniversalIdentifier:
-            existingWidget.applicationUniversalIdentifier,
-          workspaceCustomApplicationUniversalIdentifier,
-        });
-
-        const commonProperties = buildFlatPageLayoutWidgetCommonProperties({
+      entitiesToRestoreAndUpdate.map((widgetInput) => ({
+        ...this.buildUpdatedFlatPageLayoutWidget({
           widgetInput,
+          flatPageLayoutWidgetMaps,
           flatPageLayoutTabMaps,
           flatObjectMetadataMaps,
-        });
+          flatFieldMetadataMaps,
+          flatFrontComponentMaps,
+          flatViewFieldGroupMaps,
+          flatViewMaps,
+          workspaceCustomApplicationUniversalIdentifier,
+          now,
+        }),
+        isActive: true,
+      }));
 
-        const restoredConfiguration = widgetInput.configuration ?? null;
-
-        const { overrides, updatedEditableProperties } =
-          sanitizeOverridableEntityInput({
-            metadataName: 'pageLayoutWidget',
-            existingFlatEntity: existingWidget,
-            updatedEditableProperties: {
-              ...commonProperties,
-              configuration: restoredConfiguration,
-            },
-            shouldOverride,
-          });
-
-        return {
-          ...existingWidget,
-          ...updatedEditableProperties,
-          overrides,
-          isActive: true,
-          updatedAt: now.toISOString(),
-          ...(isDefined(restoredConfiguration) && {
-            universalConfiguration:
-              fromPageLayoutWidgetConfigurationToUniversalConfiguration({
-                configuration: restoredConfiguration,
-                fieldMetadataUniversalIdentifierById:
-                  flatFieldMetadataMaps.universalIdentifierById,
-                frontComponentUniversalIdentifierById:
-                  flatFrontComponentMaps.universalIdentifierById,
-                viewFieldGroupUniversalIdentifierById:
-                  flatViewFieldGroupMaps.universalIdentifierById,
-                viewUniversalIdentifierById:
-                  flatViewMaps.universalIdentifierById,
-              }),
-          }),
-        };
+    const widgetIdsToRemoveExcludingMovedToOtherTabs =
+      this.excludeWidgetsMovedToOtherTabs({
+        idsToRemove,
+        widgetIdsAcrossAllTabs,
       });
 
-    const widgetsToRemove = idsToRemove
+    const widgetsToRemove = widgetIdsToRemoveExcludingMovedToOtherTabs
       .map((widgetId) =>
         findFlatEntityByIdInFlatEntityMaps({
           flatEntityId: widgetId,
@@ -743,6 +682,162 @@ export class PageLayoutUpdateService {
     };
   }
 
+  private buildUpdatedFlatPageLayoutWidget({
+    widgetInput,
+    flatPageLayoutWidgetMaps,
+    flatPageLayoutTabMaps,
+    flatObjectMetadataMaps,
+    flatFieldMetadataMaps,
+    flatFrontComponentMaps,
+    flatViewFieldGroupMaps,
+    flatViewMaps,
+    workspaceCustomApplicationUniversalIdentifier,
+    now,
+  }: {
+    widgetInput: UpdatePageLayoutWidgetWithIdInput;
+    workspaceCustomApplicationUniversalIdentifier: string;
+    now: Date;
+  } & Pick<
+    AllFlatEntityMaps,
+    | 'flatObjectMetadataMaps'
+    | 'flatFieldMetadataMaps'
+    | 'flatFrontComponentMaps'
+    | 'flatViewFieldGroupMaps'
+    | 'flatViewMaps'
+    | 'flatPageLayoutTabMaps'
+    | 'flatPageLayoutWidgetMaps'
+  >): FlatPageLayoutWidget {
+    const existingWidget = findFlatEntityByIdInFlatEntityMapsOrThrow({
+      flatEntityId: widgetInput.id,
+      flatEntityMaps: flatPageLayoutWidgetMaps,
+    });
+
+    const shouldOverride = isCallerOverridingEntity({
+      callerApplicationUniversalIdentifier:
+        workspaceCustomApplicationUniversalIdentifier,
+      entityApplicationUniversalIdentifier:
+        existingWidget.applicationUniversalIdentifier,
+      workspaceCustomApplicationUniversalIdentifier,
+    });
+
+    const configuration = widgetInput.configuration ?? null;
+
+    const editableProperties: Partial<FlatPageLayoutWidget> = {
+      title: widgetInput.title,
+      type: widgetInput.type,
+      objectMetadataId: widgetInput.objectMetadataId ?? null,
+      gridPosition: widgetInput.gridPosition,
+      position: widgetInput.position ?? null,
+      configuration,
+      pageLayoutTabId: widgetInput.pageLayoutTabId,
+    };
+
+    if (widgetInput.conditionalDisplay !== undefined) {
+      editableProperties.conditionalDisplay =
+        widgetInput.conditionalDisplay ?? null;
+    }
+
+    const { overrides, updatedEditableProperties } =
+      sanitizeOverridableEntityInput({
+        metadataName: 'pageLayoutWidget',
+        existingFlatEntity: existingWidget,
+        updatedEditableProperties: editableProperties,
+        shouldOverride,
+      });
+
+    const updatedWidget: FlatPageLayoutWidget = {
+      ...existingWidget,
+      ...updatedEditableProperties,
+      overrides,
+      updatedAt: now.toISOString(),
+    };
+
+    if (updatedEditableProperties.pageLayoutTabId !== undefined) {
+      const { pageLayoutTabUniversalIdentifier } =
+        resolveEntityRelationUniversalIdentifiers({
+          metadataName: 'pageLayoutWidget',
+          foreignKeyValues: {
+            pageLayoutTabId: updatedWidget.pageLayoutTabId,
+          },
+          flatEntityMaps: { flatPageLayoutTabMaps },
+        });
+
+      updatedWidget.pageLayoutTabUniversalIdentifier =
+        pageLayoutTabUniversalIdentifier;
+    }
+
+    if (updatedEditableProperties.objectMetadataId !== undefined) {
+      const { objectMetadataUniversalIdentifier } =
+        resolveEntityRelationUniversalIdentifiers({
+          metadataName: 'pageLayoutWidget',
+          foreignKeyValues: {
+            objectMetadataId: updatedWidget.objectMetadataId,
+          },
+          flatEntityMaps: { flatObjectMetadataMaps },
+        });
+
+      updatedWidget.objectMetadataUniversalIdentifier =
+        objectMetadataUniversalIdentifier;
+    }
+
+    if (isDefined(overrides)) {
+      updatedWidget.universalOverrides =
+        fromPageLayoutWidgetOverridesToUniversalOverrides({
+          overrides,
+          pageLayoutTabUniversalIdentifierById:
+            flatPageLayoutTabMaps.universalIdentifierById,
+        });
+    } else {
+      updatedWidget.universalOverrides = null;
+    }
+
+    if (isDefined(configuration)) {
+      updatedWidget.universalConfiguration =
+        fromPageLayoutWidgetConfigurationToUniversalConfiguration({
+          configuration,
+          fieldMetadataUniversalIdentifierById:
+            flatFieldMetadataMaps.universalIdentifierById,
+          frontComponentUniversalIdentifierById:
+            flatFrontComponentMaps.universalIdentifierById,
+          viewFieldGroupUniversalIdentifierById:
+            flatViewFieldGroupMaps.universalIdentifierById,
+          viewUniversalIdentifierById: flatViewMaps.universalIdentifierById,
+        });
+    }
+
+    return updatedWidget;
+  }
+
+  private findWidgetsInTabOrMovingToTab({
+    tabId,
+    widgetIdsInCurrentTabInput,
+    flatPageLayoutWidgetMaps,
+  }: {
+    tabId: string;
+    widgetIdsInCurrentTabInput: Set<string>;
+    flatPageLayoutWidgetMaps: AllFlatEntityMaps['flatPageLayoutWidgetMaps'];
+  }): FlatPageLayoutWidget[] {
+    return Object.values(flatPageLayoutWidgetMaps.byUniversalIdentifier)
+      .filter(isDefined)
+      .filter(
+        (widget) =>
+          widget.pageLayoutTabId === tabId ||
+          widgetIdsInCurrentTabInput.has(widget.id),
+      );
+  }
+
+  private excludeWidgetsMovedToOtherTabs({
+    idsToRemove,
+    widgetIdsAcrossAllTabs,
+  }: {
+    idsToRemove: string[];
+    widgetIdsAcrossAllTabs: Set<string>;
+  }): string[] {
+    return idsToRemove.filter(
+      (widgetId) => !widgetIdsAcrossAllTabs.has(widgetId),
+    );
+  }
+
   private validateChartFieldReferences({
     widgetInput,
     flatFieldMetadataMaps,
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 fd8a7ab27aa..a1798213c0c 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/page-layout-widget/create-standard-page-layout-widget-flat-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout-widget/create-standard-page-layout-widget-flat-metadata.util.ts
index 78348963448..8a1a153899e 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout-widget/create-standard-page-layout-widget-flat-metadata.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/page-layout-widget/create-standard-page-layout-widget-flat-metadata.util.ts
@@ -1,7 +1,7 @@
 import {
+  type GridPosition,
   type PageLayoutWidgetConditionalDisplay,
   type PageLayoutWidgetPosition,
-  type GridPosition,
 } from 'twenty-shared/types';
 import { isDefined } from 'twenty-shared/utils';
 
@@ -110,5 +110,6 @@ export const createStandardPageLayoutWidgetFlatMetadata = ({
     deletedAt: null,
     conditionalDisplay: conditionalDisplay ?? null,
     overrides: null,
+    universalOverrides: null,
   };
 };
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 e8abb4aa4ce..ebbbe35c322 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 ac2203bafe4..ac0849423ec 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 33a88480c62..fe83f5ea5c6 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 aa70fa10748..082b39bc88a 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 0d191a3e749..386f08c2546 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 3e439c55a37..035695f8e96 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 edead6a2eb9..1a9e5405302 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 582914bee8e..b54bc35c8fc 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 5d39b245191..9c422ada5cf 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 a128341003c..ed74b86e264 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 1c7d3042ab3..4ee77fee67d 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 00b7222e3e1..fc4d12aa7a3 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 0d4496c7d68..e4037f88f63 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 194bc651105..a4cf0dfd6a4 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 1073e63c94a..425892f9148 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 6bde611a71a..6a477293f4d 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 56339268867..41512cb1426 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 5020a904f68..1a4f212afa7 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 45fe2352ca4..a060621727c 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 ac9d5d7e71d..bf7b35ea88c 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 e62660c6366..cac37ecb5a8 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 99bbb629088..5fcbf670a24 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 fc019af19dd..f56bff725c9 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 987957a408a..e860bfc21f6 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 dcef868f4a1..1cd76ac1313 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 2f580a432c8..c0301c91482 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 b6afe41d933..e4cfcfc6cea 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 9abfd9dc107..61fcc29d1f1 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 634f54ac293..1a5c12eb587 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 a8e5c18c71f..ac7d9e03b83 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 f4841aa78e5..187486e45fc 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 5a00060e7e9..0f2a3ab3599 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 1425677dae4..0b6f868944c 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 6f75111de48..0f6686a0eb7 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 17e9f2a7833..e635ceed300 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 263ac519942..215fdb614e4 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 9938300d554..9904f236153 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 a0ae428b5ce..baa51107613 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 11870367f69..cee06735552 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 2ec02e5c400..1cb3dc75cf3 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-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/constants/all-jsonb-properties-with-serialized-relation-by-metadata-name.constant.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/constants/all-jsonb-properties-with-serialized-relation-by-metadata-name.constant.ts
index cd977044103..3107aa43623 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/constants/all-jsonb-properties-with-serialized-relation-by-metadata-name.constant.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/universal-flat-entity/constants/all-jsonb-properties-with-serialized-relation-by-metadata-name.constant.ts
@@ -34,6 +34,7 @@ export const ALL_JSONB_PROPERTIES_WITH_SERIALIZED_RELATION_BY_METADATA_NAME = {
   pageLayoutTab: {},
   pageLayoutWidget: {
     configuration: 'configuration',
+    overrides: 'overrides',
   },
   commandMenuItem: {},
   navigationMenuItem: {},
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/create-page-layout-widget-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/create-page-layout-widget-action-handler.service.ts
index c6a563a0f38..df123d58d58 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/create-page-layout-widget-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/create-page-layout-widget-action-handler.service.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
+import { isDefined } from 'twenty-shared/utils';
 import { v4 } from 'uuid';
 
 import { WorkspaceMigrationRunnerActionHandler } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/interfaces/workspace-migration-runner-action-handler-service.interface';
@@ -11,6 +12,7 @@ import {
   UniversalCreatePageLayoutWidgetAction,
 } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/page-layout-widget/types/workspace-migration-page-layout-widget-action.type';
 import { fromUniversalConfigurationToFlatPageLayoutWidgetConfiguration } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/utils/from-universal-configuration-to-flat-page-layout-widget-configuration.util';
+import { fromUniversalOverridesToPageLayoutWidgetOverrides } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/utils/from-universal-overrides-to-page-layout-widget-overrides.util';
 import {
   WorkspaceMigrationActionRunnerArgs,
   WorkspaceMigrationActionRunnerContext,
@@ -47,6 +49,13 @@ export class CreatePageLayoutWidgetActionHandlerService extends WorkspaceMigrati
         flatViewFieldGroupMaps: allFlatEntityMaps.flatViewFieldGroupMaps,
       });
 
+    const overrides = isDefined(action.flatEntity.universalOverrides)
+      ? fromUniversalOverridesToPageLayoutWidgetOverrides({
+          universalOverrides: action.flatEntity.universalOverrides,
+          flatPageLayoutTabMaps: allFlatEntityMaps.flatPageLayoutTabMaps,
+        })
+      : null;
+
     const emptyUniversalForeignKeyAggregators =
       getUniversalFlatEntityEmptyForeignKeyAggregators({
         metadataName: 'pageLayoutWidget',
@@ -57,6 +66,7 @@ export class CreatePageLayoutWidgetActionHandlerService extends WorkspaceMigrati
       flatEntity: {
         ...action.flatEntity,
         configuration,
+        overrides,
         pageLayoutTabId,
         objectMetadataId,
         applicationId: flatApplication.id,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/update-page-layout-widget-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/update-page-layout-widget-action-handler.service.ts
index b34ffc94fb6..6c3c844f219 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/update-page-layout-widget-action-handler.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/update-page-layout-widget-action-handler.service.ts
@@ -10,6 +10,7 @@ import {
   UniversalUpdatePageLayoutWidgetAction,
 } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-builder/builders/page-layout-widget/types/workspace-migration-page-layout-widget-action.type';
 import { fromUniversalConfigurationToFlatPageLayoutWidgetConfiguration } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/utils/from-universal-configuration-to-flat-page-layout-widget-configuration.util';
+import { fromUniversalOverridesToPageLayoutWidgetOverrides } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/utils/from-universal-overrides-to-page-layout-widget-overrides.util';
 import {
   WorkspaceMigrationActionRunnerArgs,
   WorkspaceMigrationActionRunnerContext,
@@ -34,14 +35,17 @@ export class UpdatePageLayoutWidgetActionHandlerService extends WorkspaceMigrati
       universalIdentifier: action.universalIdentifier,
     });
 
-    const { universalConfiguration, ...updateWithResolvedForeignKeys } =
-      resolveUniversalUpdateRelationIdentifiersToIds({
-        metadataName: 'pageLayoutWidget',
-        universalUpdate: action.update,
-        allFlatEntityMaps,
-      });
+    const {
+      universalConfiguration,
+      universalOverrides,
+      ...updateWithResolvedForeignKeys
+    } = resolveUniversalUpdateRelationIdentifiersToIds({
+      metadataName: 'pageLayoutWidget',
+      universalUpdate: action.update,
+      allFlatEntityMaps,
+    });
 
-    const update =
+    const updateWithConfiguration =
       universalConfiguration === undefined
         ? updateWithResolvedForeignKeys
         : {
@@ -58,6 +62,19 @@ export class UpdatePageLayoutWidgetActionHandlerService extends WorkspaceMigrati
               }),
           };
 
+    const update =
+      universalOverrides === undefined
+        ? updateWithConfiguration
+        : universalOverrides === null
+          ? { ...updateWithConfiguration, overrides: null }
+          : {
+              ...updateWithConfiguration,
+              overrides: fromUniversalOverridesToPageLayoutWidgetOverrides({
+                universalOverrides,
+                flatPageLayoutTabMaps: allFlatEntityMaps.flatPageLayoutTabMaps,
+              }),
+            };
+
     return {
       type: 'update',
       metadataName: 'pageLayoutWidget',
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/utils/from-universal-overrides-to-page-layout-widget-overrides.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/utils/from-universal-overrides-to-page-layout-widget-overrides.util.ts
new file mode 100644
index 00000000000..648899b0088
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/page-layout-widget/services/utils/from-universal-overrides-to-page-layout-widget-overrides.util.ts
@@ -0,0 +1,39 @@
+import { type FormatRecordSerializedRelationProperties } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+
+import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';
+import { type FlatPageLayoutTabMaps } from 'src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab-maps.type';
+import { type FlatPageLayoutTab } from 'src/engine/metadata-modules/flat-page-layout-tab/types/flat-page-layout-tab.type';
+import { type PageLayoutWidgetOverrides } from 'src/engine/metadata-modules/page-layout-widget/entities/page-layout-widget.entity';
+
+type UniversalPageLayoutWidgetOverrides =
+  FormatRecordSerializedRelationProperties<PageLayoutWidgetOverrides>;
+
+export const fromUniversalOverridesToPageLayoutWidgetOverrides = ({
+  universalOverrides,
+  flatPageLayoutTabMaps,
+}: {
+  universalOverrides: UniversalPageLayoutWidgetOverrides;
+  flatPageLayoutTabMaps: FlatPageLayoutTabMaps;
+}): PageLayoutWidgetOverrides => {
+  const { pageLayoutTabUniversalIdentifier, ...scalarOverrides } =
+    universalOverrides;
+
+  if (!isDefined(pageLayoutTabUniversalIdentifier)) {
+    return {
+      ...scalarOverrides,
+    };
+  }
+
+  const flatPageLayoutTab =
+    findFlatEntityByUniversalIdentifierOrThrow<FlatPageLayoutTab>({
+      flatEntityMaps: flatPageLayoutTabMaps,
+      universalIdentifier: pageLayoutTabUniversalIdentifier,
+    });
+
+  return {
+    ...scalarOverrides,
+    pageLayoutTabId:
+      flatPageLayoutTab.id as PageLayoutWidgetOverrides['pageLayoutTabId'],
+  };
+};
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 41ba766a83f..398c574bf9d 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',
           },
         },