diff --git a/stock_picking_comment_template/README.rst b/stock_picking_comment_template/README.rst
index ca87572..705e4c7 100644
--- a/stock_picking_comment_template/README.rst
+++ b/stock_picking_comment_template/README.rst
@@ -20,7 +20,7 @@ Picking Comments
     :target: https://translation.odoo-community.org/projects/stock-logistics-reporting-11-0/stock-logistics-reporting-11-0-stock_picking_comment_template
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/151/11.0
+    :target: https://runbot.odoo-community.org/runbot/151/12.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
diff --git a/stock_picking_comment_template/__manifest__.py b/stock_picking_comment_template/__manifest__.py
index 9c3ef85..b442868 100644
--- a/stock_picking_comment_template/__manifest__.py
+++ b/stock_picking_comment_template/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "Picking Comments",
     "summary": "Comments texts templates on Picking documents",
-    "version": "11.0.1.0.0",
+    "version": "12.0.1.0.0",
     "category": "Warehouse Management",
     "website": "https://github.com/OCA/stock-logistics-reporting",
     "author": "C2i Change 2 improve,"
diff --git a/stock_picking_comment_template/views/report_delivery_document.xml b/stock_picking_comment_template/views/report_delivery_document.xml
index 2f618ba..58ed051 100644
--- a/stock_picking_comment_template/views/report_delivery_document.xml
+++ b/stock_picking_comment_template/views/report_delivery_document.xml
@@ -3,12 +3,12 @@
 
     <template id="report_delivery_document_comments"
       inherit_id="stock.report_delivery_document">
-      <xpath expr="//table[hasclass('table-condensed')]" position="before">
+      <xpath expr="//table[hasclass('table-sm')]" position="before">
         <p t-if="o.note1">
           <span t-field="o.note1"/>
         </p>
       </xpath>
-      <xpath expr="//p[@t-if='o.backorder_id']" position="after">
+      <xpath expr="(//p)[position()=last()]" position="after">
         <p t-if="o.note2">
           <span t-field="o.note2"/>
         </p>
diff --git a/stock_picking_comment_template/views/report_picking.xml b/stock_picking_comment_template/views/report_picking.xml
index 297e83e..a1852d3 100644
--- a/stock_picking_comment_template/views/report_picking.xml
+++ b/stock_picking_comment_template/views/report_picking.xml
@@ -3,7 +3,7 @@
 
     <template id="report_picking_document_comments"
       inherit_id="stock.report_picking">
-      <xpath expr="//table[hasclass('table-condensed')]" position="before">
+      <xpath expr="//table[hasclass('table-sm')]" position="before">
         <p t-if="o.note1">
           <span t-field="o.note1"/>
         </p>