diff --git a/computes/templates/computes.html b/computes/templates/computes.html
index 1ab1026..96728c1 100644
--- a/computes/templates/computes.html
+++ b/computes/templates/computes.html
@@ -62,7 +62,6 @@
                                         {% ifequal compute.type 1 %}
                                             <form method="post" role="form">{% csrf_token %}
                                                 <div class="modal-body">
-
                                                     <div class="form-group row">
                                                         <label class="col-sm-4 col-form-label">{% trans "Label" %}</label>
                                                         <div class="col-sm-6">
@@ -95,13 +94,13 @@
                                                         </div>
                                                     </div></div>
                                                 <div class="modal-footer">
-                                                    <button type="submit" class="btn btn-danger  mr-auto" name="host_del">
+                                                    <button type="submit" class="btn btn-danger mr-auto" name="host_del">
                                                         {% trans "Delete" %}
                                                     </button>
                                                     <button type="button" class="btn btn-secondary" data-dismiss="modal">
                                                         {% trans "Close" %}
                                                     </button>
-                                                    <button type="submit" class="btn btn-primary" name="host_edit">
+                                                    <button type="submit" class="btn btn-primary" name="host_edit" autofocus>
                                                         {% trans "Change" %}
                                                     </button>
                                                 </div>
diff --git a/instances/templates/instances.html b/instances/templates/instances.html
index f5409b6..cf001a8 100644
--- a/instances/templates/instances.html
+++ b/instances/templates/instances.html
@@ -53,10 +53,11 @@
     </div>
     <!-- /.row -->
     {% include 'errors_block.html' %}
+    {% include 'messages_block.html' %}
     <div class="row">
         {% if not  all_host_vms %}
             <div class="col-lg-12">
-                <div class="alert alert-warning alert-dismissable fade">
+                <div class="alert alert-warning alert-dismissable fade show">
                     <i class="fa fa-exclamation-triangle"></i> <strong>{% trans "Warning" %}:</strong> {% trans "Hypervisor doesn't have any Instances" %}
                     <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
                 </div>
diff --git a/storages/templates/create_stg_block.html b/storages/templates/create_stg_block.html
index 651ead4..183dd2b 100644
--- a/storages/templates/create_stg_block.html
+++ b/storages/templates/create_stg_block.html
@@ -9,8 +9,8 @@
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                     <h5 class="modal-title">{% trans "Create Storage Pool" %}</h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 </div>
                 <div class="tabbable">
                     <ul class="nav nav-tabs">
diff --git a/storages/templates/create_stg_vol_block.html b/storages/templates/create_stg_vol_block.html
index 99c8f99..13851e6 100644
--- a/storages/templates/create_stg_vol_block.html
+++ b/storages/templates/create_stg_vol_block.html
@@ -11,8 +11,8 @@
                 <div class="modal-dialog">
                     <div class="modal-content">
                         <div class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                             <h5 class="modal-title">{% trans "Upload ISO Image" %}</h5>
+                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                         </div>
                         <div class="modal-body">
                             <form enctype="multipart/form-data" method="post" role="form">{% csrf_token %}
diff --git a/storages/templates/storage.html b/storages/templates/storage.html
index c7a505d..0760b2c 100644
--- a/storages/templates/storage.html
+++ b/storages/templates/storage.html
@@ -91,8 +91,8 @@
                 </div>
              </div>
             {% if volumes  %}
-            <div class="table-responsive">
-                <table class="table table-striped sortable-theme-bootstrap" data-sortable>
+            <div>
+                <table class="table table-hover sortable-theme-bootstrap" data-sortable>
                     <thead>
                     <tr>
                         <th>#</th>
@@ -192,8 +192,8 @@
                 </div>
             </div>
             {% endif %}
-            {% endif %}
-        </div>
+        {% endif %}
+    </div>
 
     {% include 'pleasewaitdialog.html' %}
 {% endblock %}
diff --git a/templates/pleasewaitdialog.html b/templates/pleasewaitdialog.html
index e0a1b24..84b0d6e 100644
--- a/templates/pleasewaitdialog.html
+++ b/templates/pleasewaitdialog.html
@@ -8,7 +8,7 @@
                 </div>
                 <div class="modal-body">
                     <div class="progress">
-                        <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="10" aria-valuemin="0" aria-valuemax="10" style="width:100%">
+                        <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width:100%">
                         </div>
                     </div>
                 </div>