diff --git a/Koha/Plugin/Com/ByWaterSolutions/ItemMessages.pm b/Koha/Plugin/Com/ByWaterSolutions/ItemMessages.pm
index c1bbc0c..37f85eb 100644
--- a/Koha/Plugin/Com/ByWaterSolutions/ItemMessages.pm
+++ b/Koha/Plugin/Com/ByWaterSolutions/ItemMessages.pm
@@ -154,6 +154,7 @@ sub tool_step2 {
     my $template = $self->get_template({ file => 'tool-step2.tt' });
     
     my $uploadbarcodes = $cgi->upload('uploadbarcodes');
+    my $barcodelist = $cgi->param('barcodelist');
     my @barcodes;
     my @uploadedbarcodes;
 
@@ -165,7 +166,7 @@ sub tool_step2 {
             push @uploadedbarcodes, grep { /\S/ } split( /[$split_chars]/, $barcode );
         }
     } else {
-        warn 'NO UPLOADED BARCODES';
+        push @uploadedbarcodes, split(/\s\n/, scalar $cgi->param('barcodelist') );
     }
 
     for my $barcode (@uploadedbarcodes) {
@@ -192,7 +193,8 @@ sub tool_step2 {
             itemnumber  => $item->itemnumber,
             barcode  => $item->barcode,
             title    => $biblio->title,
-            messages  => [],   # Placeholder for item_messages.message
+            biblio   => $biblio,
+            messages => [],   # Placeholder for item_messages.message
             type     => '',   # Placeholder for item_messages.type
         };
     }
@@ -240,28 +242,128 @@ sub tool_step3 {
     my @itemnumbers = $cgi->param('itemnumber');
     my $action = $cgi->param('action');
     my $type = $cgi->param('type');
+    my $delete_type = $cgi->param('delete_type');
     my $dbh = C4::Context->dbh;
     my @updated_items;
+    my @old_messages;
 
-    if ( $action eq 'update' ) {
+    if ( $action eq 'update_all') {
+        my $new_message = $cgi->param('new_message_all');
+        my $new_type = $cgi->param('new_type_all');
+
+        my $placeholders = join(',', ('?') x scalar(@itemnumbers));
+
+        my $fetch_query = qq{
+            SELECT itemnumber, message, type
+            FROM item_messages
+              WHERE itemnumber IN ($placeholders)
+        };
+        my $fetch_sth = $dbh->prepare($fetch_query);
+        $fetch_sth->execute(@itemnumbers);
+
+        while (my $row = $fetch_sth->fetchrow_hashref) {
+            push @old_messages, {
+                itemnumber   => $row->{itemnumber},
+                old_message  => $row->{message},
+                old_type     => $row->{type},
+            };
+        }
+        $fetch_sth->finish;
+
+        my $delete_query = qq{
+            DELETE FROM  item_messages
+            WHERE itemnumber IN ( $placeholders )
+        };
+
+        my $delete_sth = $dbh->prepare($delete_query);
+        $delete_sth->execute(@itemnumbers);
+
+        my $query = qq{
+            INSERT  INTO item_messages (itemnumber, message, type)
+            VALUES (?, ?, ?)
+        };
+
+        my $sth = $dbh->prepare($query);
+        foreach my $itemnumber (@itemnumbers) {
+            $sth->execute($itemnumber, $new_message, $new_type);
+        }
+        
+        $sth->finish;
+
+        my $select_query = qq{
+            SELECT im.item_message_id, im.itemnumber, im.message AS message, im.type,
+                   i.barcode, b.title
+            FROM item_messages im
+            JOIN items i ON im.itemnumber = i.itemnumber
+            LEFT JOIN biblio b ON i.biblionumber = b.biblionumber
+              WHERE im.itemnumber IN ($placeholders)
+        };
+
+        my $select_sth = $dbh->prepare($select_query);
+        $select_sth->execute(@itemnumbers);
+
+        while (my $row = $select_sth->fetchrow_hashref) {
+            next unless $row;
+            push @updated_items, {
+                item_message_id => $row->{item_message_id},
+                itemnumber      => $row->{itemnumber},
+                barcode         => $row->{barcode},
+                title           => $row->{title},
+                message         => $row->{message},
+                type            => $row->{type},
+            };
+        }
+        $select_sth->finish;
+    } elsif ( $action eq 'update' ) {
         my $new_message = $cgi->param('new_message');
+        my $new_type = $cgi->param('new_type');
 
-        unless ($type) {
-            warn "No type provided!";
+        unless ($new_type && $new_message ) {
+            warn "No message or message type provided!";
             return;
         }
 
         my $placeholders = join(',', ('?') x scalar(@itemnumbers));
-        my $query = qq{
-            UPDATE item_messages
-            SET message = ?
+
+        my $fetch_query = qq{
+            SELECT itemnumber, message, type
+            FROM item_messages
             WHERE type = ?
-                AND item_message_id IN ( $placeholders )
+              AND itemnumber IN ($placeholders)
+        };
+        my $fetch_sth = $dbh->prepare($fetch_query);
+        $fetch_sth->execute($new_type, @itemnumbers);
+
+        while (my $row = $fetch_sth->fetchrow_hashref) {
+            push @old_messages, {
+                itemnumber   => $row->{itemnumber},
+                old_message  => $row->{message},
+                old_type     => $row->{type},
+            };
+        }
+        $fetch_sth->finish;
+
+        my $delete_query = qq{
+            DELETE FROM  item_messages
+            WHERE type = ?
+            AND itemnumber IN ( $placeholders )
+        };
+
+        my $delete_sth = $dbh->prepare($delete_query);
+        $delete_sth->execute($new_type, @itemnumbers);
+
+        my $query = qq{
+            INSERT  INTO item_messages (itemnumber, message, type)
+            VALUES (?, ?, ?)
         };
 
         my $sth = $dbh->prepare($query);
-        $sth->execute($new_message, $type, @itemnumbers);
+        foreach my $itemnumber (@itemnumbers) {
+            $sth->execute($itemnumber, $new_message, $new_type);
+        }
         
+        $sth->finish;
+
         my $select_query = qq{
             SELECT im.item_message_id, im.itemnumber, im.message AS message, im.type,
                    i.barcode, b.title
@@ -269,11 +371,11 @@ sub tool_step3 {
             JOIN items i ON im.itemnumber = i.itemnumber
             LEFT JOIN biblio b ON i.biblionumber = b.biblionumber
             WHERE im.type = ?
-              AND im.item_message_id IN ($placeholders)
+              AND im.itemnumber IN ($placeholders)
         };
 
         my $select_sth = $dbh->prepare($select_query);
-        $select_sth->execute($type, @itemnumbers);
+        $select_sth->execute($new_type, @itemnumbers);
 
         while (my $row = $select_sth->fetchrow_hashref) {
             next unless $row;
@@ -286,7 +388,6 @@ sub tool_step3 {
                 type            => $row->{type},
             };
         }
-
         $select_sth->finish;
 
     } elsif ( $action eq 'delete' )  {
@@ -296,41 +397,50 @@ sub tool_step3 {
         }
 
         my $placeholders = join(',', ('?') x scalar(@itemnumbers));
-
-    my $select_query = qq{
-        SELECT im.item_message_id, im.itemnumber, im.message AS old_message, im.type,
-               i.barcode, b.title
-        FROM item_messages im
-        JOIN items i ON im.itemnumber = i.itemnumber
-        LEFT JOIN biblio b ON i.biblionumber = b.biblionumber
-        WHERE im.type = ?
-          AND im.item_message_id IN ($placeholders)
-    };
-    my $select_sth = $dbh->prepare($select_query);
-    $select_sth->execute($type, @itemnumbers);
-
-    while (my $row = $select_sth->fetchrow_hashref) {
-        next unless $row;
-
-        push @updated_items, {
-            item_message_id => $row->{item_message_id},
-            itemnumber      => $row->{itemnumber},
-            barcode         => $row->{barcode},
-            title           => $row->{title},
-            message         => $row->{message},
-            type            => $row->{type},
+        my $select_query = qq{
+            SELECT im.item_message_id, im.itemnumber, im.message AS old_message, im.type AS old_type,
+                   i.barcode, b.title
+            FROM item_messages im
+            JOIN items i ON im.itemnumber = i.itemnumber
+            LEFT JOIN biblio b ON i.biblionumber = b.biblionumber
+            WHERE im.type = ?
+              AND i.itemnumber IN ($placeholders)
         };
-    }
-    $select_sth->finish;
+
+        my $select_sth = $dbh->prepare($select_query);
+        $select_sth->execute($delete_type, @itemnumbers);
+
+        while (my $row = $select_sth->fetchrow_hashref) {
+            next unless $row;
+
+            push @updated_items, {
+                item_message_id => $row->{item_message_id},
+                itemnumber      => $row->{itemnumber},
+                barcode         => $row->{barcode},
+                title           => $row->{title},
+                old_message     => $row->{old_message},
+                old_type        => $row->{old_type},
+            };
+        }
+
+        $select_sth->finish;
 
         my $query = qq{
             DELETE FROM  item_messages
             WHERE type = ?
-                AND item_message_id IN ( $placeholders )
+            AND itemnumber IN ( $placeholders )
         };
 
         my $sth = $dbh->prepare($query);
-        $sth->execute($type, @itemnumbers);
+        $sth->execute($delete_type, @itemnumbers);
+    }
+
+    if ( $action eq 'update' || $action eq 'update_all' ) {
+        foreach my $updated_item (@updated_items) {
+            my ($old_data) = grep { $_->{itemnumber} == $updated_item->{itemnumber} } @old_messages;
+            $updated_item->{old_message} = $old_data->{old_message} // 'No Previous Message';
+            $updated_item->{old_type} = $old_data->{old_type} // 'No Previous Type';
+        }
     }
 
     my $count = scalar @updated_items;
diff --git a/Koha/Plugin/Com/ByWaterSolutions/ItemMessages/tool-step1.tt b/Koha/Plugin/Com/ByWaterSolutions/ItemMessages/tool-step1.tt
index f6ea166..7f2b7cf 100644
--- a/Koha/Plugin/Com/ByWaterSolutions/ItemMessages/tool-step1.tt
+++ b/Koha/Plugin/Com/ByWaterSolutions/ItemMessages/tool-step1.tt
@@ -53,6 +53,15 @@
                 </li>
             </ol>
         </fieldset>
+        <fieldset class="rows">
+            <legend>Or scan items one by one</legend>
+            <ol>
+                <li>
+                    <label for="barcodelist">Barcode list (one barcode per line): </label>
+                    <textarea rows="10" cols="30" id="barcodelist" name="barcodelist"></textarea>
+                </li>
+            </ol>
+        </fieldset>
 
         <fieldset class="action">
             <input type="submit" name="submitted" class="btn btn-primary" value="Submit">
diff --git a/Koha/Plugin/Com/ByWaterSolutions/ItemMessages/tool-step2.tt b/Koha/Plugin/Com/ByWaterSolutions/ItemMessages/tool-step2.tt
index 2d18ed9..3fc1b67 100644
--- a/Koha/Plugin/Com/ByWaterSolutions/ItemMessages/tool-step2.tt
+++ b/Koha/Plugin/Com/ByWaterSolutions/ItemMessages/tool-step2.tt
@@ -13,11 +13,18 @@
     [% t("Koha") | html %]
 [% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
+<style>
+    fieldset.rows { 
+        margin-top .9em !important;
+    }
+</style>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
 </head>
 
 <body id="plugins_item_message" class="plugins">
 [% INCLUDE 'header.inc' %]
 [% PROCESS 'about-team.inc' %]
+
 [% WRAPPER 'sub-header.inc' %]
     [% WRAPPER breadcrumbs %]
         [% IF blocking_error %]
@@ -35,7 +42,7 @@
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]
 
-<div id="doc3">
+<div id="main container-fluid">
     <h1>Update item messages</h1>
     <div class="page-section">
         <h3>Scanned items:</h3>
@@ -53,8 +60,9 @@
             [% FOREACH item IN scanned_items %]
                 [% IF item.messages.size > 0 %]
                     [% FOREACH message IN item.messages %]
+                        [% item.biblionumber %]
                         <tr class="[% message.type | html %]">
-                            <td>[% item.title | html %]</td>
+                            <td>[% INCLUDE 'biblio-title.inc' biblio=item.biblio link=1 %]</td>
                             <td>[% item.barcode | html %]</td>
                             <td>[% message.message | html %]</td>
                             <td><span class="badge text-bg-success">[% message.type | html %]</span></td>
@@ -62,7 +70,7 @@
                     [% END %]
                 [% ELSE %]
                         <tr class="notype nomessage">
-                            <td>[% item.title | html %]</td>
+                            <td>[% INCLUDE 'biblio-title.inc' biblio=item.biblio link=1 %]</td>
                             <td>[% item.barcode | html %]</td>
                             <td></td>
                             <td></td>
@@ -72,59 +80,124 @@
             </tbody>
         </table>
     </div>
-    <div class="page-section">
-        <h3>Bulk update item messages by type:</h3>
-        <ul class="nav nav-tabs" role="tablist">
-            [% FOREACH av IN AuthorisedValues.Get('ITEM_MESSAGE_TYPE' ) %]
-                <li class="nav-item[% IF loop.count == 1 %] active[% END %]" role="presentation" data-type="[% av.authorised_value | html %]">
-                    <a id="[% av.authorised_value | html %]-tab" class="nav-link[% IF loop.count == 1 %] active[% END %]" href="#[% av.authorised_value | html %]_panel" data-bs-toggle="tab" dat-bs-target="#[av.authorised_value | html]" role="tab" data-toggle="tab">[% av.authorised_value | html %]</a>
-                </li>    
+    <div>
+        <h3>Choose an action:</h3>
+        <form id="update_messages" method="post">
+            [% INCLUDE 'csrf-token.inc' %]
+            <input type="hidden" name="class" value="[% CLASS %]"/>
+            <input type="hidden" name="method" value="[% METHOD %]"/>
+            [% FOREACH item IN scanned_items %]
+                <input type="hidden" name="itemnumber" value="[% item.itemnumber | html %]">
             [% END %]
-        </ul>
-        <div class="tab-content">
-            [% FOREACH av IN AuthorisedValues.Get('ITEM_MESSAGE_TYPE' ) %]
-                [% SET type_options = av.lib_opac.split('\|') %]
-                    <div id="[% av.authorised_value | html %]_panel" class="tab-pane[% IF loop.count == 1 %] active[% END %]" role="tabpanel">
-                        <form id="update_messages" method="post">
-                            [% INCLUDE 'csrf-token.inc' %]
-                            <input type="hidden" name="class" value="[% CLASS %]"/>
-                            <input type="hidden" name="method" value="[% METHOD %]"/>
-                            [% FOREACH item IN scanned_items %]
-                                [% FOREACH message IN item.messages %]
-                                    <input name="itemnumber" type="hidden" value="[% message.item_message_id | html %]">
-                                [% END %]
+            <div>
+                <fieldset class="action rows">
+                    <ol>
+                    <li>
+                        <input type="radio" name="action" value="update_all">
+                        <span style="font-size:125%;font-weight:bold;">Replace all</span>
+                    </li>
+                    <li>
+                        <label for="new_message_all">New message: </label>
+                        <select id="new_type_all" name="new_type_all">
+                            <option value="">--Choose a type--</option>
+                            [% FOREACH av IN AuthorisedValues.Get('ITEM_MESSAGE_TYPE' ) %]
+                                <option value="[% av.authorised_value | html %]">[% av.authorised_value | html %]</option>
                             [% END %]
-                            <h3>Actions for the item message type: [% av.authorised_value | html %]</h3>
-                            <fieldset class="action">
-                                <input type="radio" name="action" value="update">
-                                <label for="new_message_[% av.authorised_value | html %]">Update ALL item messages of the type <span class="badge text-bg-success">[% av.authorised_value | html %]</span> to:</label>
-                                [% IF type_options.size > 1 %]
-                                    <select id="new_message_[% av.authorised_value | html %]" name="new_message">
-                                        [% FOREACH option_type IN type_options %]
-                                            <option value="[% option_type %]">[% option_type %]</optoin>
-                                        [% END %]
-                                    </select>
-                                [% ELSE %]
-                                <input id="new_message_[% av.authorised_value | html %]" name="new_message" type="text" />
+                        </select>
+                    </li>
+                    <li>
+                        <label>New type:</label>
+                        <input id="new_message_all" name="new_message_all" type="text" />
+                        <div class="hint" style="margin-left:2em;">This will REPLACE all scanned item's messages and types regardless of current item message or type.</div>
+                    </li>
+                    </ol>
+                </fieldset>
+            </div>
+            <div>
+                <fieldset class="action rows">
+                    <ol>
+                        <li>
+                            <input type="radio" name="action" value="update">
+                            <span style="font-size:125%;font-weight:bold;">Replace all with type of:</span>
+                            <select id="new_type" name="new_type">
+                                <option value="">--Choose a type--</option>
+                                [% FOREACH av IN AuthorisedValues.Get('ITEM_MESSAGE_TYPE' ) %]
+                                    <option value="[% av.authorised_value | html %]">[% av.authorised_value | html %]</option>
                                 [% END %]
-                                 <input type="hidden" name="type" value="[% av.authorised_value | html %]">
-                            </fieldset>
-                            <fieldset class="action">
-                                <input type="radio" name="action" value="delete">
-                                <label for="delete_message">Delete all messages of the type <span class="badge text-bg-success">[% av.authorised_value | html %]</span>.</label>
-                            </fieldset>
-                            <button type="submit" name="update" value="update_type" class="btn btn-primary">Submit</button>
-                        </form>
-                    </div>
-            [% END %]
-        </div>
-    </div>
+                            </select>
+                        </li>
+                        <li>
+                            <label for="new_message">New message: </label>
+                            <input id="new_message" name="new_message" type="text" />
+                        </li>
+                    </ol>
+                </fieldset>
+            </div>
+            <div>
+                <fieldset class="action rows">
+                    <ol>
+                        <li>
+                            <input type="radio" name="action" value="delete">
+                            <span style="font-size:125%;font-weight:bold;">Delete all with type of:</span>
+                            <select id="delete_type" name="delete_type">
+                                <option value="">--Choose a type--</option>
+                                [% FOREACH av IN AuthorisedValues.Get('ITEM_MESSAGE_TYPE' ) %]
+                                    <option value="[% av.authorised_value | html %]">[% av.authorised_value | html %]</option>
+                                [% END %]
+                            </select>
+                        </li>
+                    </ol>
+                </fieldset>
+            </div>
+            <div class="page-section">
+                <button type="submit" name="update" value="update_type" class="btn btn-primary">Submit</button>
+            </div>
+        </form>
     </div>
 </div>
 <br/>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
+
 <script>
     $(document).ready(function () {
+        $('#new_type').on('change',function() {
+            let new_type = $(this).val();
+                let new_options = '';
+                [% FOREACH av IN AuthorisedValues.Get('ITEM_MESSAGE_TYPE' ) %]
+                    [% SET type_options = av.lib_opac.split('\|') %]
+                    if ( "[% av.authorised_value %]" == new_type ) {
+                        [% FOREACH option_type IN type_options %]
+                            new_options = new_options + '<option value="[% option_type %]">[% option_type %]</option>'
+                        [% END %]
+                    }
+                [% END %]
+            let html = '';
+            if ( new_options ) {
+                html = '<select id="new_message" name="new_message">'+ new_options + '</select>';
+            } else {
+                html = '<input id="new_message" name="new_message" type="text">';
+            }
+            $('#new_message').replaceWith(html);
+        });
+
+        $('#new_type_all').on('change',function() {
+            let new_type = $(this).val();
+                let new_options = '';
+                [% FOREACH av IN AuthorisedValues.Get('ITEM_MESSAGE_TYPE' ) %]
+                    [% SET type_options = av.lib_opac.split('\|') %]
+                    if ( "[% av.authorised_value %]" == new_type ) {
+                        [% FOREACH option_type IN type_options %]
+                            new_options = new_options + '<option value="[% option_type %]">[% option_type %]</option>'
+                        [% END %]
+                    }
+                [% END %]
+            let html = '';
+            if ( new_options ) {
+                html = '<select id="new_message_all" name="new_message_all">'+ new_options + '</select>';
+            } else {
+                html = '<input id="new_message_all" name="new_message_all" type="text">';
+            }
+            $('#new_message_all').replaceWith(html);
+        });
 
         $('form').on('submit', function (e) {
             const action = $(this).find('input[name="action"]:checked').val();
@@ -133,54 +206,66 @@
                 e.preventDefault(); // Prevent form submission
                 return;
             }
+
+            if (action == 'update_all') {
+                let new_type = $('#new_type_all[name="new_type_all"]').val();
+                let new_message = $('#new_message_all[name="new_message_all"]').val();
+                if ( !new_type || !new_message ) {
+                    alert('Please specify a message and an item message type for updating.');
+                    e.preventDefault(); // Prevent form submission
+                    return;
+                }
+            }
+
             if (action == 'update') {
-                let multivalue = $(this).find('select[name="new_message"]').val();
-                let singlevalue = $(this).find('input[name="new_message"]').val();
-                if ( !multivalue && !singlevalue ) {
-                    alert('Please specify a message for updating.');
+                let new_type = $('#new_type[name="new_type"]').val();
+                let new_message = $('#new_message[name="new_message"]').val();
+                if ( !new_type || !new_message ) {
+                    alert('Please specify a message and an item message type for updating.');
                     e.preventDefault(); // Prevent form submission
                     return;
                 }
             }
-            let current_type = $('.nav-item.active').data('type');
-            let current_count = 0;
-            $('table tbody tr').each( function() {
-                let row_type = $(this).attr('class');
-                if ( current_type == row_type ) {
-                    current_count++;
+
+            if (action == 'delete') {
+                let delete_type = $('#delete_type[name="delete_type"]').val();
+                if ( !delete_type ) {
+                    alert('Please specify an item message type for deleting.');
+                    e.preventDefault(); // Prevent form submission
+                    return;
                 }
-            });
-            if ( current_count == 0 ) {
-                alert('Please select at least one item message to update or delete.');
-                e.preventDefault();
-                return;
             }
-            if ( !confirm(`Are you sure you want to ${action} ${current_count} item messages?`) ) {
+
+            let count = 0;
+            if ( action == 'delete' || action == 'update' ) {
+                $('table tbody tr').each( function() {
+                    let row_type = $(this).attr('class');
+                    let this_type;
+                    if ( action == 'update' ) {
+                        this_type = $('#new_type[name="new_type"]').val();
+                    } else {
+                        this_type = $('#delete_type[name="delete_type"]').val();
+                    }
+                    if ( row_type == this_type ) {
+                        count++;
+                    }
+                });
+                
+                if ( count == 0 ) {
+                    alert('Nothing to update or delete!');
+                    e.preventDefault(); // Prevent form submission
+                    return;
+                }
+            } else {
+                count = $('table tbody tr').length; 
+            }
+
+            if ( !confirm(`Are you sure you want to ${action} ${count} item messages?`) ) {
                 e.preventDefault();
                 return;
             }
         });
         
-        let first_tab_type = $('.nav-item.active').data('type');
-        $('table tbody tr').each( function() {
-            let row_type = $(this).attr('class');
-            if ( row_type == first_tab_type ) {
-                $(this).find('td').css('color' , 'red');
-            } else {
-                $(this).find('td').css('color' , 'unset');
-            }
-        });
-        $('.nav-item').on('click' , function() {
-            let tab_type = $(this).data('type');
-            $('table tbody tr').each( function() {
-                let row_type = $(this).attr('class');
-                if ( row_type == tab_type ) {
-                    $(this).find('td').css('color' , 'red');
-                } else {
-                    $(this).find('td').css('color' , 'unset');
-                }
-            });
-        });
     });
 </script>
 
diff --git a/Koha/Plugin/Com/ByWaterSolutions/ItemMessages/tool-step3.tt b/Koha/Plugin/Com/ByWaterSolutions/ItemMessages/tool-step3.tt
index 3d5c59b..9786187 100644
--- a/Koha/Plugin/Com/ByWaterSolutions/ItemMessages/tool-step3.tt
+++ b/Koha/Plugin/Com/ByWaterSolutions/ItemMessages/tool-step3.tt
@@ -35,7 +35,7 @@
 [% END #/ WRAPPER sub-header.inc %]
 
 <div id="doc3" class="page-section">
-    [% IF action == 'update' %]
+    [% IF action == 'update' || action == 'update_all' %]
         <h3>[% updated_count %] item messages were successfully updated!</h3>
     [% ELSE %]
         <h3>[% updated_count %] item messages were successfully deleted!</h3>
@@ -45,8 +45,10 @@
             <tr>
                 <th>Title</th>
                 <th>Barcode</th>
+                <th>Old message</th>
                 <th>New message</th>
-                <th>Type</th>
+                <th>Old type</th>
+                <th>New type</th>
             </tr>
         </thead>
         <tbody>
@@ -54,12 +56,18 @@
                 <tr>
                     <td>[% item.title | html %]</td>
                     <td>[% item.barcode | html %]</td>
-                    [% IF action == 'update' %]
+                    <td>[% item.old_message | html %]</td>
+                    [% IF action == 'update' || action == 'update_all'  %]
                         <td>[% item.message | html %]</td>
                     [% ELSE %]
                         <td>deleted</td>
                     [% END %]
-                    <td>[% item.type | html %]</td>
+                    <td>[% item.old_type | html %]</td>
+                    [% IF action == 'update' || action == 'update_all'  %]
+                        <td>[% item.type | html %]</td>
+                    [% ELSE %]
+                        <td>deleted</td>
+                    [% END %]
                 </tr>
             [% END %]
         </tbody>