diff --git a/instances/templates/instances/settings_tab.html b/instances/templates/instances/settings_tab.html
index 16c9032..6426023 100644
--- a/instances/templates/instances/settings_tab.html
+++ b/instances/templates/instances/settings_tab.html
@@ -652,7 +652,7 @@
                     </div>
                 </div>
                 {% if computes_count != 1 %}
-                    <button type="submit" class="btn btn-lg btn-success float-end" name="migrate" onclick="showPleaseWaitDialog();">{% trans "Migrate" %}</button>
+                    <button type="submit" class="btn btn-lg btn-success float-end" onclick="showPleaseWaitDialog()" name="migrate" >{% trans "Migrate" %}</button>
                 {% else %}
                     <button class="btn btn-lg btn-success float-end disabled">{% trans "Migrate" %}</button>
                 {% endif %}
diff --git a/storages/templates/storage.html b/storages/templates/storage.html
index 4840785..b9f1af8 100644
--- a/storages/templates/storage.html
+++ b/storages/templates/storage.html
@@ -11,6 +11,7 @@
 {% block page_heading_extra %}{% include 'create_stg_vol_block.html' %}{% endblock page_heading_extra %}
 
 {% block content %}
+    {% include 'pleasewaitdialog.html' %}
     <div class="row">
         <div class="col-lg-12">
             
@@ -152,7 +153,7 @@
                                         </div>
                                         <div class="modal-footer">
                                             <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans "Close" %}</button>
-                                            <button type="submit" class="btn btn-primary" name="cln_volume" onclick="showPleaseWaitDialog();">{% trans "Clone" %}</button>
+                                            <button type="submit" class="btn btn-primary" name="cln_volume" onclick="showPleaseWaitDialog()">{% trans "Clone" %}</button>
                                         </div>
                                     </form>
                                 </div> <!-- /.modal-content -->
@@ -190,7 +191,6 @@
     {% endif %}
     </div>
 
-    {% include 'pleasewaitdialog.html' %}
 {% endblock %}
 {% block script %}
     <script src="{% static 'js/sortable.min.js' %}"></script>
diff --git a/storages/views.py b/storages/views.py
index 1934237..0c48ab6 100644
--- a/storages/views.py
+++ b/storages/views.py
@@ -171,7 +171,7 @@ def storage(request, compute_id, pool):
                     name = conn.clone_volume(data["image"], data["name"], format, meta_prealloc)
                     messages.success(
                         request,
-                        _("%(image)s image cloned as %(clone)s successfully") % {"image": data["image"], "name": name},
+                        _("%(image)s image cloned as %(name)s successfully") % {"image": data["image"], "name": name},
                     )
                     return HttpResponseRedirect(request.get_full_path())
                 except libvirtError as lib_err:
diff --git a/templates/pleasewaitdialog.html b/templates/pleasewaitdialog.html
index 84b0d6e..2d51471 100644
--- a/templates/pleasewaitdialog.html
+++ b/templates/pleasewaitdialog.html
@@ -1,6 +1,6 @@
 {% load i18n %}
     <!-- Please wait dialog -->
-    <div class="modal fade" id="pleaseWaitDialog" tabindex="-1" role="dialog" aria-labelledby="pleaseWaitDialogLabel" data-backdrop="static" data-keyboard="false">
+    <div class="modal fade" id="pleaseWaitDialog" tabindex="-1" aria-labelledby="pleaseWaitDialogLabel" data-bs-backdrop="static" data-bs-keyboard="false">
         <div class="modal-dialog modal-sm">
             <div class="modal-content">
                 <div class="modal-header">
@@ -17,11 +17,17 @@
     </div>
 <script>
 function showPleaseWaitDialog() {
-    $('#pleaseWaitDialog').modal();
+    var pleaseModal = new bootstrap.Modal(document.getElementById('pleaseWaitDialog'), {
+        keyboard: false
+    });
+    pleaseModal.show();
     backgroundJobRunning = true;
 }
 function hidePleaseWaitDialog() {
-    $('#pleaseWaitDialog').modal('hide');
+    var pleaseModal = new bootstrap.Modal(document.getElementById('pleaseWaitDialog'), {
+        keyboard: false
+    })
+    pleaseModal.hide();
     backgroundJobRunning = false;
 }
 </script>