diff --git a/resources/ts/back/Components/FieldsetWrapper.tsx b/resources/ts/back/Components/FieldsetWrapper.tsx
index 94fd10c..9f7982b 100644
--- a/resources/ts/back/Components/FieldsetWrapper.tsx
+++ b/resources/ts/back/Components/FieldsetWrapper.tsx
@@ -28,8 +28,8 @@ export default function FieldsetWrapper({
 }) {
   return (
     <Card
-      className={cn("mb-4", {
-        "w-full sm:w-1/2 grid grid-cols-1 lg:grid-cols-2 items-center": inline,
+      className={cn("col-span-2", {
+        "sm:col-span-1 grid grid-cols-1 lg:grid-cols-2 items-center": inline,
       })}
     >
       <CardHeader>
diff --git a/resources/ts/back/Pages/Brands/Form.tsx b/resources/ts/back/Pages/Brands/Form.tsx
index b58516e..04366c4 100644
--- a/resources/ts/back/Pages/Brands/Form.tsx
+++ b/resources/ts/back/Pages/Brands/Form.tsx
@@ -31,7 +31,7 @@ export default function Form({
     appEnv: AppEnv;
   };
 
-  /** Form section */
+  // Form section.
   const { post, setData, data } = useForm({
     name: model?.name ? model?.name[appEnv.locale] : undefined,
     sites: extractIdsFromDatabasePivotRelation(model?.sites),
@@ -51,7 +51,7 @@ export default function Form({
   });
 
   return (
-    <form id="config-form" onSubmit={submit}>
+    <form onSubmit={submit} className="grid grid-cols-2 gap-4">
       <InputError all />
       <FieldsetWrapper
         title={useTrans("uwil-backend::back.form_title_global")}
@@ -101,7 +101,7 @@ export default function Form({
           closeButtonVisible={true}
         />
       </FieldsetWrapper>
-      <div className="text-center">
+      <div className="col-span-2 text-center">
         <SubmitButton
           modelTrans={useTrans(`models.classes.${modelName}`, {
             choice: 1,
diff --git a/resources/ts/back/Pages/GitlabProjects/Form.tsx b/resources/ts/back/Pages/GitlabProjects/Form.tsx
index 458368c..ebce579 100644
--- a/resources/ts/back/Pages/GitlabProjects/Form.tsx
+++ b/resources/ts/back/Pages/GitlabProjects/Form.tsx
@@ -34,7 +34,7 @@ export default function Form({
     appEnv: AppEnv;
   };
 
-  /** Form section */
+  // Form section.
   const { post, setData, data } = useForm({
     name: model?.name ? model?.name[appEnv.locale] : undefined,
     url: model?.url ?? undefined,
@@ -55,7 +55,7 @@ export default function Form({
   });
 
   return (
-    <form id="config-form" onSubmit={submit}>
+    <form onSubmit={submit} className="grid grid-cols-2 gap-4">
       <InputError all />
       <FieldsetWrapper
         title={useTrans("uwil-backend::back.form_title_global")}
@@ -125,7 +125,7 @@ export default function Form({
           )}
         </div>
       </FieldsetWrapper>
-      <div className="text-center">
+      <div className="col-span-2 text-center">
         <SubmitButton
           modelTrans={useTrans(`models.classes.${modelName}`, {
             choice: 1,
diff --git a/resources/ts/back/Pages/InvoiceCompanies/Form.tsx b/resources/ts/back/Pages/InvoiceCompanies/Form.tsx
index a30fa00..cc73b08 100644
--- a/resources/ts/back/Pages/InvoiceCompanies/Form.tsx
+++ b/resources/ts/back/Pages/InvoiceCompanies/Form.tsx
@@ -29,7 +29,7 @@ export default function Form({
     appEnv: AppEnv;
   };
 
-  /** Form section */
+  // Form section.
   const { post, setData, data } = useForm({
     name: model?.name ? model?.name[appEnv.locale] : "",
   });
@@ -48,7 +48,7 @@ export default function Form({
   });
 
   return (
-    <form id="config-form" onSubmit={submit}>
+    <form onSubmit={submit} className="grid grid-cols-2 gap-4">
       <InputError all />
       <FieldsetWrapper
         title={useTrans("uwil-backend::back.form_title_global")}
@@ -73,7 +73,7 @@ export default function Form({
           setData={setData}
         />
       </FieldsetWrapper>
-      <div className="text-center">
+      <div className="col-span-2 text-center">
         <SubmitButton
           modelTrans={useTrans(`models.classes.${modelName}`, {
             choice: 1,
diff --git a/resources/ts/back/Pages/InvoicePackages/Form.tsx b/resources/ts/back/Pages/InvoicePackages/Form.tsx
index 2593cec..0a89d68 100644
--- a/resources/ts/back/Pages/InvoicePackages/Form.tsx
+++ b/resources/ts/back/Pages/InvoicePackages/Form.tsx
@@ -31,7 +31,7 @@ export default function Form({
     appEnv: AppEnv;
   };
 
-  /** Form section */
+  // Form section.
   const { post, setData, data } = useForm({
     name: model?.name ? model?.name[appEnv.locale] : "",
     amount: model?.amount ?? 0,
@@ -52,7 +52,7 @@ export default function Form({
   });
 
   return (
-    <form id="config-form" onSubmit={submit}>
+    <form onSubmit={submit} className="grid grid-cols-2 gap-4">
       <InputError all />
       <FieldsetWrapper
         title={useTrans("uwil-backend::back.form_title_global")}
@@ -111,7 +111,7 @@ export default function Form({
           setData={setData}
         />
       </FieldsetWrapper>
-      <div className="text-center">
+      <div className="col-span-2 text-center">
         <SubmitButton
           modelTrans={useTrans(`models.classes.${modelName}`, {
             choice: 1,
diff --git a/resources/ts/back/Pages/Notices/Form.tsx b/resources/ts/back/Pages/Notices/Form.tsx
index e92750b..9aa4b08 100644
--- a/resources/ts/back/Pages/Notices/Form.tsx
+++ b/resources/ts/back/Pages/Notices/Form.tsx
@@ -32,7 +32,7 @@ export default function Form({
     noticeTypeEnum: LaravelEnum;
   };
 
-  /** Form section */
+  // Form section.
   const { post, setData, data } = useForm({
     title: model?.title ? model?.title[appEnv.locale] : "",
     message: model?.message ? model?.message[appEnv.locale] : "",
@@ -53,7 +53,7 @@ export default function Form({
   });
 
   return (
-    <form id="config-form" onSubmit={submit}>
+    <form onSubmit={submit} className="grid grid-cols-2 gap-4">
       <InputError all />
       <FieldsetWrapper
         title={useTrans("uwil-backend::back.form_title_global")}
@@ -111,7 +111,7 @@ export default function Form({
           setData={setData}
         />
       </FieldsetWrapper>
-      <div className="text-center">
+      <div className="col-span-2 text-center">
         <SubmitButton
           modelTrans={useTrans(`models.classes.${modelName}`, {
             choice: 1,
diff --git a/resources/ts/back/Pages/Sites/Form.tsx b/resources/ts/back/Pages/Sites/Form.tsx
index 3a44acd..33c9866 100644
--- a/resources/ts/back/Pages/Sites/Form.tsx
+++ b/resources/ts/back/Pages/Sites/Form.tsx
@@ -40,7 +40,7 @@ export default function Form({
     userModelsClient: Array<UserModel>;
   };
 
-  /** Form section */
+  // Form section.
   const { post, setData, data } = useForm({
     name: model?.name ? model?.name[appEnv.locale] : undefined,
     url_re7: model?.url_re7,
@@ -97,7 +97,7 @@ export default function Form({
   );
 
   return (
-    <form id="config-form" onSubmit={submit}>
+    <form onSubmit={submit} className="grid grid-cols-2 gap-4">
       <InputError all />
       <FieldsetWrapper
         title={useTrans("uwil-backend::back.form_title_global")}
@@ -287,7 +287,7 @@ export default function Form({
           )}
         </div>
       </FieldsetWrapper>
-      <div className="text-center">
+      <div className="col-span-2 text-center">
         <SubmitButton
           modelTrans={useTrans(`models.classes.${modelName}`, {
             choice: 1,
diff --git a/resources/ts/back/Pages/Users/Form.tsx b/resources/ts/back/Pages/Users/Form.tsx
index dbe51c5..9a6167b 100644
--- a/resources/ts/back/Pages/Users/Form.tsx
+++ b/resources/ts/back/Pages/Users/Form.tsx
@@ -38,7 +38,7 @@ export default function Form({
     );
   };
 
-  /** Form section */
+  // Form section.
   const { post, setData, data } = useForm({
     first_name: model?.first_name,
     last_name: model?.last_name,
@@ -80,7 +80,7 @@ export default function Form({
   );
 
   return (
-    <form onSubmit={submit}>
+    <form onSubmit={submit} className="grid grid-cols-2 gap-4">
       <InputError all />
       <FieldsetWrapper
         title={useTrans("uwil-backend::back.form_title_global")}
@@ -162,10 +162,10 @@ export default function Form({
       {userModel.role.value === isConceptor!.value &&
         userModel.email !== model?.email && (
           <FieldsetWrapper
-            className="gap-4"
             title={transFormTitleVisibility}
             icon={<EyeIcon className="mr-1" />}
             description={transFormSubtitleVisibility}
+            className="gap-4"
             inline
           >
             <SimpleSwitch
@@ -175,7 +175,7 @@ export default function Form({
             />
           </FieldsetWrapper>
         )}
-      <div className="text-center">
+      <div className="col-span-2 text-center">
         <SubmitButton
           modelTrans={useTrans(`uwil-backend::models.classes.${modelName}`, {
             choice: 1,