diff --git a/templates/helper.twig b/templates/helper.twig
index ff0d921f..1957864f 100644
--- a/templates/helper.twig
+++ b/templates/helper.twig
@@ -168,6 +168,14 @@
     {% endif %}
 {% endmacro %}
 
+{% macro entity_last_modified(entity, datetime_format = "short") %}
+    {{ _self.date_user_combination(entity, true, datetime_format) }}
+{% endmacro %}
+
+{% macro entity_created_at(entity, datetime_format = "short") %}
+    {{ _self.date_user_combination(entity, false, datetime_format) }}
+{% endmacro %}
+
 {% macro user_icon(user) %}
     <img src="{{ avatar_helper.avatarSmURL(user) }}" class="avatar-xs" alt="User avatar" {{ stimulus_controller('elements/hoverpic') }} data-thumbnail="{{ avatar_helper.avatarMdURL(user) }}">
 {% endmacro %}
diff --git a/templates/parts/info/_attachments_info.html.twig b/templates/parts/info/_attachments_info.html.twig
index 4f8e3b81..4b1ba28a 100644
--- a/templates/parts/info/_attachments_info.html.twig
+++ b/templates/parts/info/_attachments_info.html.twig
@@ -1,3 +1,5 @@
+{% import "helper.twig" as helper %}
+
 <table class="table table-striped table-sm table-hover table-responsive-sm">
     <thead>
     <tr>
@@ -72,8 +74,9 @@
                         </button>
                         <div class="dropdown-menu" aria-labelledby="btnGroupDrop1">
                             <span class="text-muted dropdown-item-text" ><i class="fas fa-lightbulb fa-fw"></i> <b>ID:</b> {{ attachment.iD }}</span>
-                            <span class="text-muted dropdown-item-text" ><i class="fas fa-calendar fa-fw"></i> <b>{% trans %}createdAt{% endtrans %}:</b> {{ attachment.addedDate | format_datetime("short")}}</span>
-                            <span class="text-muted dropdown-item-text" ><i class="fas fa-history fa-fw"></i> <b>{% trans %}createdAt{% endtrans %}:</b> {{ attachment.addedDate | format_datetime("short")}}</span>
+                            <span class="text-muted dropdown-item-text" ><i class="fas fa-history fa-fw"></i> <b>{% trans %}lastModified{% endtrans %}:</b> {{ helper.entity_last_modified(attachment) }}</span>
+                            <span class="text-muted dropdown-item-text" ><i class="fas fa-calendar-plus fa-fw"></i> <b>{% trans %}createdAt{% endtrans %}:</b> {{ helper.entity_created_at(attachment) }}</span>
+
                         </div>
                     </div>
                 </div></td>
diff --git a/templates/parts/info/_order_infos.html.twig b/templates/parts/info/_order_infos.html.twig
index cd64d58f..68462de5 100644
--- a/templates/parts/info/_order_infos.html.twig
+++ b/templates/parts/info/_order_infos.html.twig
@@ -1,3 +1,5 @@
+{% import "helper.twig" as helper %}
+
 <div class="table-responsive">
     <table class="table table-striped table-header table-hover">
         <thead>
@@ -64,15 +66,13 @@
                 </td>
                 <td> {# Action for order information #}
                     <div class="btn-group">
-                        <button type="button" class="btn btn-info btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            Action
+                        <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            <i class="fa-solid fa-lightbulb fa-fw"></i>
                         </button>
                         <div class="dropdown-menu">
                             <span class="text-muted dropdown-item-text" ><i class="fas fa-lightbulb fa-fw"></i> <b>ID:</b> {{ order.iD }}</span>
-                            <span class="text-muted dropdown-item-text" ><i class="fas fa-history fa-fw"></i> <b>{% trans %}createdAt{% endtrans %}:</b> {{ order.addedDate | format_datetime("short")}}</span>
-                            <div class="dropdown-divider"></div>
-                            <a class="dropdown-item" href="#"><i class="fas fa-edit fa-fw"></i> {% trans %}edit.caption_short{% endtrans %}</a>
-                            <a class="dropdown-item" href="#"><i class="fas fa-trash fa-fw"></i> {% trans %}delete.caption{% endtrans %}</a>
+                            <span class="text-muted dropdown-item-text" ><i class="fas fa-history fa-fw"></i> <b>{% trans %}lastModified{% endtrans %}:</b> {{ helper.entity_last_modified(order) }}</span>
+                            <span class="text-muted dropdown-item-text" ><i class="fas fa-calendar-plus fa-fw"></i> <b>{% trans %}createdAt{% endtrans %}:</b> {{ helper.entity_created_at(order) }}</span>
                         </div>
                     </div>
                 </td>
diff --git a/templates/parts/info/_part_lots.html.twig b/templates/parts/info/_part_lots.html.twig
index ddf7d43d..e6d8637f 100644
--- a/templates/parts/info/_part_lots.html.twig
+++ b/templates/parts/info/_part_lots.html.twig
@@ -13,6 +13,7 @@
             <th></th> {# Tags row #}
             <th></th>
             <th></th> {# Button row #}
+            <th></th>
         </tr>
         </thead>
 
@@ -63,21 +64,21 @@
                 </td>
                 <td>
                     <div class="btn-group" role="group">
-                        <button type="button" class="btn btn-outline-primary" data-bs-toggle="modal" data-bs-target="#withdraw-modal"
+                        <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#withdraw-modal"
                                 data-action="withdraw" data-lot-id="{{ lot.id }}" data-lot-amount="{{ lot.amount }}"
                                 title="{% trans %}part.info.withdraw_modal.title.withdraw{% endtrans %}"
                                 {% if not is_granted('withdraw', lot) or not withdraw_add_helper.canWithdraw(lot) %}disabled{% endif %}
                         >
                             <i class="fa-solid fa-minus fa-fw"></i>
                         </button>
-                        <button type="button" class="btn btn-outline-primary" data-bs-toggle="modal" data-bs-target="#withdraw-modal"
+                        <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#withdraw-modal"
                                 data-action="add" data-lot-id="{{ lot.id }}" data-lot-amount="{{ lot.amount }}"
                                 title="{% trans %}part.info.withdraw_modal.title.add{% endtrans %}"
                                 {% if not is_granted('add', lot) or not withdraw_add_helper.canAdd(lot) %}disabled{% endif %}
                         >
                             <i class="fa-solid fa-plus fa-fw"></i>
                         </button>
-                        <button type="button" class="btn btn-outline-primary" data-bs-toggle="modal" data-bs-target="#withdraw-modal"
+                        <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#withdraw-modal"
                                 data-action="move" data-lot-id="{{ lot.id }}" data-lot-amount="{{ lot.amount }}"
                                 title="{% trans %}part.info.withdraw_modal.title.move{% endtrans %}"
                                 {% if not is_granted('move', lot) or not withdraw_add_helper.canWithdraw(lot) or part.partLots.count == 1 %}disabled{% endif %}
@@ -89,6 +90,23 @@
                 <td>
                     {{ dropdown.profile_dropdown('part_lot', lot.id, false) }}
                 </td>
+                <td>
+                <td> {# Action for order information #}
+                    <div class="btn-group">
+                        <button type="button" class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            <i class="fa-solid fa-lightbulb fa-fw"></i>
+                        </button>
+                        <div class="dropdown-menu">
+                            <span class="text-muted dropdown-item-text" ><i class="fas fa-lightbulb fa-fw"></i> <b>{% trans %}id.label{% endtrans %}:</b> {{ lot.iD }}</span>
+                            <span class="text-muted dropdown-item-text" ><i class="fas fa-history fa-fw"></i> <b>{% trans %}lastModified{% endtrans %}:</b> {{ helper.entity_last_modified(lot) }}</span>
+                            <span class="text-muted dropdown-item-text" ><i class="fas fa-calendar-plus fa-fw"></i> <b>{% trans %}createdAt{% endtrans %}:</b> {{ helper.entity_created_at(lot) }}</span>
+                            {% if lot.comment is not empty %}
+                                <span class="text-muted dropdown-item-text" ><i class="fas fa-sticky-note fa-fw"></i> <b>{% trans %}part_lot.edit.comment{% endtrans %}:</b> {{ lot.comment }}</span>
+                            {% endif %}
+                        </div>
+                    </div>
+                </td>
+                </td>
             </tr>
         {% endfor %}
         </tbody>
diff --git a/templates/parts/info/_sidebar.html.twig b/templates/parts/info/_sidebar.html.twig
index 9d6296df..5fb8caef 100644
--- a/templates/parts/info/_sidebar.html.twig
+++ b/templates/parts/info/_sidebar.html.twig
@@ -10,11 +10,11 @@
 
 <div class="mb-3">
 <span class="text-muted" title="{% trans %}lastModified{% endtrans %}">
-    <i class="fas fa-history fa-fw"></i>  {{ helper.date_user_combination(part, true) }}
+    <i class="fas fa-history fa-fw"></i>  {{ helper.entity_last_modified(part) }}
 </span>
     <br>
     <span class="text-muted mt-1" title="{% trans %}createdAt{% endtrans %}">
-    <i class="fas fa-calendar-plus fa-fw"></i> {{ helper.date_user_combination(part, false) }}
+    <i class="fas fa-calendar-plus fa-fw"></i> {{ helper.entity_created_at(part) }}
 </span>
 </div>
 
diff --git a/templates/parts/info/show_part_info.html.twig b/templates/parts/info/show_part_info.html.twig
index ece620fa..6ac7bd52 100644
--- a/templates/parts/info/show_part_info.html.twig
+++ b/templates/parts/info/show_part_info.html.twig
@@ -55,7 +55,7 @@
                     <li class="nav-item">
                         <a class="nav-link" id="comment-tab" data-bs-toggle="tab"
                            href="#comment" role="tab">
-                            <i class="fas fa-comment-alt fa-fw"></i>
+                            <i class="fas fa-sticky-note fa-fw"></i>
                             {% trans %}comment.label{% endtrans %}
                         </a>
                     </li>