diff --git a/frontend/src/resources/cr.tsx b/frontend/src/resources/cr.tsx
index 1a63391..40df96e 100644
--- a/frontend/src/resources/cr.tsx
+++ b/frontend/src/resources/cr.tsx
@@ -94,7 +94,7 @@ export const CrEdit = () => {
         <>
             <Breadcrumb />
             <PageTitle pageType="edit" crId={record.id} />
-            <Edit actions={<EditTopToolbar hasYaml />}>
+            <Edit actions={<EditTopToolbar hasYaml />} mutationMode='pessimistic'>
                 <SimpleForm toolbar={<ViewToolbar />}>
                     {jsonSchema ? (
                         <JsonSchemaInput
diff --git a/frontend/src/resources/crs.tsx b/frontend/src/resources/crs.tsx
index de09293..0fd524c 100644
--- a/frontend/src/resources/crs.tsx
+++ b/frontend/src/resources/crs.tsx
@@ -111,6 +111,7 @@ export const SchemaCreate = () => {
                         mode="json"
                         source="schema"
                         theme="monokai"
+                        fullWidth={true}
                     />
                 </SimpleForm>
             </Create>
@@ -132,7 +133,7 @@ export const SchemaEdit = () => {
                     recordRepresentation: record.id,
                 })}
             </Typography>
-            <Edit actions={<EditTopToolbar />}>
+            <Edit actions={<EditTopToolbar />} mutationMode='pessimistic'>
                 <SimpleForm toolbar={<ViewToolbar />}>
                     <TextInput source="id" disabled sx={{ width: '22em' }} />
                     <TextInput source="crdId" disabled sx={{ width: '22em' }} />
@@ -141,6 +142,7 @@ export const SchemaEdit = () => {
                         mode="json"
                         source="schema"
                         theme="monokai"
+                        fullWidth={true}
                     />
                 </SimpleForm>
             </Edit>
diff --git a/frontend/src/resources/custom/cr.apigws.operator.scc-digitalhub.github.io.tsx b/frontend/src/resources/custom/cr.apigws.operator.scc-digitalhub.github.io.tsx
index 3f6bfb2..714ff44 100644
--- a/frontend/src/resources/custom/cr.apigws.operator.scc-digitalhub.github.io.tsx
+++ b/frontend/src/resources/custom/cr.apigws.operator.scc-digitalhub.github.io.tsx
@@ -232,7 +232,7 @@ const CrEdit = () => {
         <>
             <Breadcrumb />
             <SimplePageTitle pageType="create" crName={CR_APIGATEWAYS} />
-            <Edit redirect="list" actions={<EditTopToolbar />} transform={transform} >
+            <Edit redirect="list" actions={<EditTopToolbar />} transform={transform} mutationMode='pessimistic'>
                 <SimpleForm validate={validate} >
                     <ApiGWForm/>
                 </SimpleForm>
diff --git a/frontend/src/resources/custom/cr.buckets.minio.scc-digitalhub.github.io.tsx b/frontend/src/resources/custom/cr.buckets.minio.scc-digitalhub.github.io.tsx
index b2a98ec..7870115 100644
--- a/frontend/src/resources/custom/cr.buckets.minio.scc-digitalhub.github.io.tsx
+++ b/frontend/src/resources/custom/cr.buckets.minio.scc-digitalhub.github.io.tsx
@@ -130,7 +130,7 @@ const CrEdit = () => {
                 crName={CR_MINIO_BUCKETS}
                 crId={record.spec.database}
             />
-            <Edit actions={<EditTopToolbar hasYaml/>} transform={transform}>
+            <Edit actions={<EditTopToolbar hasYaml/>} transform={transform} mutationMode='pessimistic'>
                 <SimpleForm toolbar={<ViewToolbar />}  validate={validateData} >
                     <Grid container alignItems="center" spacing={2}>
                         <Grid item xs={4}>
diff --git a/frontend/src/resources/custom/cr.dremiorestservers.operator.dremiorestserver.com.tsx b/frontend/src/resources/custom/cr.dremiorestservers.operator.dremiorestserver.com.tsx
index 85db934..b15eb67 100644
--- a/frontend/src/resources/custom/cr.dremiorestservers.operator.dremiorestserver.com.tsx
+++ b/frontend/src/resources/custom/cr.dremiorestservers.operator.dremiorestserver.com.tsx
@@ -217,7 +217,7 @@ const CrEdit = () => {
                 crName={CR_DREMIOREST}
                 crId={record.spec.database}
             />
-            <Edit actions={<EditTopToolbar hasYaml />} transform={transform}>
+            <Edit actions={<EditTopToolbar hasYaml />} transform={transform} mutationMode='pessimistic'>
                 <SimpleForm toolbar={<ViewToolbar />} validate={validateData}>
                 <Grid container alignItems="center" spacing={2}>
                         <Grid item xs={4}>
diff --git a/frontend/src/resources/custom/cr.nuclioapigateways.nuclio.io.tsx b/frontend/src/resources/custom/cr.nuclioapigateways.nuclio.io.tsx
index 39c85d4..61871e7 100644
--- a/frontend/src/resources/custom/cr.nuclioapigateways.nuclio.io.tsx
+++ b/frontend/src/resources/custom/cr.nuclioapigateways.nuclio.io.tsx
@@ -386,7 +386,7 @@ const CrEdit = () => {
         <>
             <Breadcrumb />
             <SimplePageTitle pageType="edit" crName={CR_NUCLIO_APIGATEWAYS} />
-            <Edit actions={<EditTopToolbar hasYaml />} transform={transform}>
+            <Edit actions={<EditTopToolbar hasYaml />} transform={transform} mutationMode='pessimistic'>
                 <SimpleForm toolbar={<ViewToolbar />} validate={validate}>
                     <Grid container  spacing={2}>
                         <Grid item xs={2}>
diff --git a/frontend/src/resources/custom/cr.policies.minio.scc-digitalhub.github.io.tsx b/frontend/src/resources/custom/cr.policies.minio.scc-digitalhub.github.io.tsx
index ef9dee6..e18c76a 100644
--- a/frontend/src/resources/custom/cr.policies.minio.scc-digitalhub.github.io.tsx
+++ b/frontend/src/resources/custom/cr.policies.minio.scc-digitalhub.github.io.tsx
@@ -101,7 +101,7 @@ const CrEdit = () => {
                 crName={CR_MINIO_POLICIES}
                 crId={record.spec.database}
             />
-            <Edit actions={false}>
+            <Edit actions={false} mutationMode='pessimistic'>
                 <TopToolbar>
                     <InspectButton/>
                     <ShowButton/>
diff --git a/frontend/src/resources/custom/cr.postgres.db.movetokube.com.tsx b/frontend/src/resources/custom/cr.postgres.db.movetokube.com.tsx
index f294e14..b190ce1 100644
--- a/frontend/src/resources/custom/cr.postgres.db.movetokube.com.tsx
+++ b/frontend/src/resources/custom/cr.postgres.db.movetokube.com.tsx
@@ -131,7 +131,7 @@ const CrEdit = () => {
                 crName={CR_POSTGRES_DB}
                 crId={record.spec.database}
             />
-            <Edit actions={<EditTopToolbar hasYaml />}>
+            <Edit actions={<EditTopToolbar hasYaml />} mutationMode='pessimistic'>
                 <SimpleForm toolbar={<ViewToolbar />}>
                     <Grid container alignItems="center" spacing={2}>
                         <Grid item xs={4}>
diff --git a/frontend/src/resources/custom/cr.postgrests.operator.postgrest.org.tsx b/frontend/src/resources/custom/cr.postgrests.operator.postgrest.org.tsx
index bba6d57..d1509db 100644
--- a/frontend/src/resources/custom/cr.postgrests.operator.postgrest.org.tsx
+++ b/frontend/src/resources/custom/cr.postgrests.operator.postgrest.org.tsx
@@ -292,7 +292,7 @@ const CrEdit = () => {
                 crName={CR_POSTGREST}
                 crId={record.spec.database}
             />
-            <Edit actions={<EditTopToolbar hasYaml />} transform={transform}>
+            <Edit actions={<EditTopToolbar hasYaml />} transform={transform} mutationMode='pessimistic'>
                 <SimpleForm toolbar={<ViewToolbar />} validate={validateData}>
                 <Grid container alignItems="center" spacing={2}>
                         <Grid item xs={4}>
diff --git a/frontend/src/resources/custom/cr.postgresusers.db.movetokube.com.tsx b/frontend/src/resources/custom/cr.postgresusers.db.movetokube.com.tsx
index bc44494..b35e518 100644
--- a/frontend/src/resources/custom/cr.postgresusers.db.movetokube.com.tsx
+++ b/frontend/src/resources/custom/cr.postgresusers.db.movetokube.com.tsx
@@ -138,6 +138,7 @@ const CrEdit = () => {
             />
             <Edit
                 mutationOptions={{ onSuccess }}
+                mutationMode='pessimistic'
                 actions={
                     <UserTopToolbar
                         redirect={`${CR_POSTGRES_DB}/${record.spec.database}/show`}
diff --git a/frontend/src/resources/custom/cr.users.minio.scc-digitalhub.github.io.tsx b/frontend/src/resources/custom/cr.users.minio.scc-digitalhub.github.io.tsx
index 4e02d37..f1c96ea 100644
--- a/frontend/src/resources/custom/cr.users.minio.scc-digitalhub.github.io.tsx
+++ b/frontend/src/resources/custom/cr.users.minio.scc-digitalhub.github.io.tsx
@@ -101,7 +101,7 @@ const CrEdit = () => {
                 crName={CR_MINIO_USERS}
                 crId={record.spec.database}
             />
-            <Edit actions={false}>
+            <Edit actions={false} mutationMode='pessimistic'>
                 <TopToolbar>
                     <ShowButton/>
                     <InspectButton/>