diff --git a/upgrade_analysis/views/view_upgrade_analysis.xml b/upgrade_analysis/views/view_upgrade_analysis.xml
index c664fa70d43..b7388dd08e4 100644
--- a/upgrade_analysis/views/view_upgrade_analysis.xml
+++ b/upgrade_analysis/views/view_upgrade_analysis.xml
@@ -51,6 +51,7 @@
                             nolabel="1"
                             widget="ace"
                             options="{'mode': 'txt'}"
+                            colspan="2"
                         />
                     </group>
 
diff --git a/upgrade_analysis/wizards/upgrade_install_wizard.py b/upgrade_analysis/wizards/upgrade_install_wizard.py
index 7bb4b327d29..7c5f05d37dc 100644
--- a/upgrade_analysis/wizards/upgrade_install_wizard.py
+++ b/upgrade_analysis/wizards/upgrade_install_wizard.py
@@ -24,6 +24,7 @@ class UpgradeInstallWizard(models.TransientModel):
     module_ids = fields.Many2many(
         comodel_name="ir.module.module",
         domain=lambda x: x._module_ids_domain(),
+        string="Modules",
     )
 
     module_qty = fields.Integer(
diff --git a/upgrade_analysis/wizards/view_upgrade_generate_record_wizard.xml b/upgrade_analysis/wizards/view_upgrade_generate_record_wizard.xml
index 4a4cd019303..b563f527fef 100644
--- a/upgrade_analysis/wizards/view_upgrade_generate_record_wizard.xml
+++ b/upgrade_analysis/wizards/view_upgrade_generate_record_wizard.xml
@@ -8,12 +8,13 @@
                 <header>
                   <field name="state" widget="statusbar" />
                 </header>
-                <group states="draft" colspan="4">
+                <group states="draft">
                     <p
+                        colspan="2"
                     >This will reinitialize all the modules installed on this database. Do not continue if you use this database in production.</p>
                 </group>
-                <group states="done" colspan="4">
-                    <p>Modules initialized and record created</p>
+                <group states="done">
+                    <p colspan="2">Modules initialized and record created</p>
                 </group>
                 <footer>
                     <button
diff --git a/upgrade_analysis/wizards/view_upgrade_install_wizard.xml b/upgrade_analysis/wizards/view_upgrade_install_wizard.xml
index 7c9ac1cebfe..35cc90483a5 100644
--- a/upgrade_analysis/wizards/view_upgrade_install_wizard.xml
+++ b/upgrade_analysis/wizards/view_upgrade_install_wizard.xml
@@ -12,15 +12,17 @@
                     <p
                         class="alert alert-warning"
                         role="alert"
+                        colspan="2"
                     >This will install the selected modules on the database. Do not continue if you use this database in production.</p>
                 </group>
                 <group states="done">
                     <p
                         class="alert alert-info"
                         role="alert"
+                        colspan="2"
                     >The modules have been installed successfuly</p>
                 </group>
-                <group col="4" states="draft">
+                <header states="draft">
                     <button
                         name="select_installable_modules"
                         type="object"
@@ -42,7 +44,13 @@
                         type="object"
                         string="All Other Modules"
                     />
-                </group>
+                </header>
+                <button
+                    name="unselect_modules"
+                    type="object"
+                    string="Clear the list"
+                    states="draft"
+                />
                 <group states="draft">
                     <field name="module_qty" />
                     <field
@@ -50,11 +58,6 @@
                         widget="many2many_tags"
                         options="{'no_create': True}"
                     />
-                    <button
-                        name="unselect_modules"
-                        type="object"
-                        string="Clear the list"
-                    />
                 </group>
                 <footer>
                     <button