diff --git a/odoo_openupgrade_wizard/cli_estimate_workload.py b/odoo_openupgrade_wizard/cli_estimate_workload.py
index 33aef3a..5a72bfe 100644
--- a/odoo_openupgrade_wizard/cli_estimate_workload.py
+++ b/odoo_openupgrade_wizard/cli_estimate_workload.py
@@ -46,7 +46,6 @@ def estimate_workload(ctx, analysis_file_path, extra_modules_list):
     analysis.modules = sorted(analysis.modules)
 
     # Render html file
-    # TODO, make
     ensure_file_exists_from_template(
         Path(analysis_file_path),
         templates.ANALYSIS_HTML_TEMPLATE,
diff --git a/odoo_openupgrade_wizard/templates.py b/odoo_openupgrade_wizard/templates.py
index 4b503f3..882734b 100644
--- a/odoo_openupgrade_wizard/templates.py
+++ b/odoo_openupgrade_wizard/templates.py
@@ -276,7 +276,7 @@ ANALYSIS_HTML_TEMPLATE = """
         <tr>
           <td>{{odoo_module.name}}
           </td>
-  {% for version in odoo_module.analyse.all_version %}
+  {% for version in odoo_module.analyse.all_versions %}
     {% set module_version = odoo_module.get_module_version(version) %}
     {% if module_version %}
       {% set size_text = module_version.get_size_text() %}
diff --git a/odoo_openupgrade_wizard/tools_odoo_module.py b/odoo_openupgrade_wizard/tools_odoo_module.py
index 57495a3..b6ab621 100644
--- a/odoo_openupgrade_wizard/tools_odoo_module.py
+++ b/odoo_openupgrade_wizard/tools_odoo_module.py
@@ -475,6 +475,9 @@ class OdooModuleVersion(object):
             if self.openupgrade_state and (
                 self.openupgrade_state.lower().startswith("done")
                 or self.openupgrade_state.lower().startswith("nothing to do")
+                or self.openupgrade_state.lower().startswith(
+                    "no db layout changes"
+                )
             ):
                 return
             else:
@@ -646,6 +649,9 @@ class OdooModuleVersion(object):
                     or self.openupgrade_state.lower().startswith(
                         "nothing to do"
                     )
+                    or self.openupgrade_state.lower().startswith(
+                        "no db layout changes"
+                    )
                 ):
                     return "lightgreen"
                 else:
@@ -673,15 +679,10 @@ class OdooModuleVersion(object):
                 self.odoo_module.module_type == "odoo"
                 and self.version != self.odoo_module.analyse.initial_version
             ):
-                if self.openupgrade_state.lower().startswith(
-                    "done"
-                ) or self.openupgrade_state.lower().startswith(
-                    "nothing to do"
-                ):
+                if self.openupgrade_state:
                     return self.openupgrade_state
                 else:
                     return "To analyse"
-            return ""
         else:
             if self.state == "merged":
                 return "Merged into %s" % self.target_module