diff --git a/storages/templates/storage.html b/storages/templates/storage.html
index 0760b2c..c089f60 100644
--- a/storages/templates/storage.html
+++ b/storages/templates/storage.html
@@ -82,117 +82,116 @@
         </dd>
     </dl>
     
-    <div class="col-lg-12">
-        {% if state %}
-            <div class="row">
-                <h5 class="page-header mr-auto">{% trans "Volumes" %}</h5>
-                <div class="col-3 ">
-                    <input id="filter" class="form-control" type="text" placeholder="Search">
-                </div>
-             </div>
-            {% if volumes  %}
-            <div>
-                <table class="table table-hover sortable-theme-bootstrap" data-sortable>
-                    <thead>
-                    <tr>
-                        <th>#</th>
-                        <th>{% trans "Name" %}</th>
-                        <th>{% trans "Allocated" %}</th>
-                        <th>{% trans "Size" %}</th>
-                        <th>{% trans "Format" %}</th>
-                        <th data-sortable="false" colspan="2">{% trans "Action" %}</th>
-                    </tr>
-                    </thead>
-                    <tbody class="searchable">
-                    {% for volume in volumes %}
-                    <tr>
-                        <td>{{ forloop.counter }}</td>
-                        <td>{{ volume.name }}</td>
-                        <td>{{ volume.allocation|filesizeformat }}</td>
-                        <td>{{ volume.size|filesizeformat }}</td>
-                        <td>{{ volume.type }}</td>
-                        <td>
-                            <!-- Modal Clone -->
-                            <div class="modal fade" id="Clone{{ forloop.counter }}" tabindex="-1" role="dialog"
-                                 aria-labelledby="addHostLabel" aria-hidden="true">
-                                <div class="modal-dialog">
-                                    <div class="modal-content">
-                                        <div class="modal-header">
-                                            <h5 class="modal-title">{% trans "Clone image" %} <span class="text-danger">{{ volume.name }}</span></h5>
-                                            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>  
-                                        </div>
-                                        <form method="post" role="form">{% csrf_token %}
-                                            <div class="modal-body">
-                                                <div class="form-group row">
-                                                    <label class="col-sm-3 col-form-label">{% trans "Name" %}</label>
-                                                    <div class="col-sm-6">
-                                                        <input type="text" class="form-control" name="name" placeholder="{% trans "Name" %}" required pattern="[a-zA-Z0-9\.\-_]+">
-                                                        <input type="hidden" name="image" value="{{ volume.name }}">
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row" id="image_format">
-                                                    <label class="col-sm-3 col-form-label">{% trans "Convert" %}</label>
-                                                    <div class="col-sm-6">
-                                                        <input class="volume-convert" type="checkbox" name="convert" value="true">
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row format-convert">
-                                                    <label class="col-sm-3 col-form-label">{% trans "Format" %}</label>
-                                                    <div class="col-sm-6">
-                                                        <select name="format" class="custom-select image-format">
-                                                            <option value="raw">{% trans "raw" %}</option>
-                                                            <option value="qcow">{% trans "qcow" %}</option>
-                                                            <option value="qcow2">{% trans "qcow2" %}</option>
-                                                        </select>
-                                                    </div>
-                                                </div>
-                                                <div class="form-group row meta-prealloc" style="display: none;">
-                                                    <label class="col-sm-3 col-form-label">{% trans "Metadata" %}</label>
-                                                    <div class="col-sm-6">
-                                                        <input type="checkbox" name="meta_prealloc" value="true">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="modal-footer">
-                                                <button type="button" class="btn btn-secondary" data-dismiss="modal">{% trans "Close" %}</button>
-                                                <button type="submit" class="btn btn-primary" name="cln_volume" onclick="showPleaseWaitDialog();">{% trans "Clone" %}</button>
-                                            </div>
-                                        </form>
-                                    </div> <!-- /.modal-content -->
-                                </div> <!-- /.modal-dialog -->
-                            </div> <!-- /.modal -->
-                            {% ifnotequal volume.type "iso" %}
-                                <button class="btn btn-sm btn-secondary" data-toggle="modal" data-target="#Clone{{ forloop.counter }}" title="{% trans "Clone" %}">
-                                    <i class="fa fa-files-o"></i>
-                                </button>
-                            {% else %}
-                                <button class="btn btn-sm btn-secondary disabled">
-                                    <i class="fa fa-files-o"></i>
-                                </button>
-                            {% endifnotequal %}
-                        </td>  
-                        <td>  
-                            <form action="" method="post" role="form">{% csrf_token %}
-                                <input type="hidden" name="volname" value="{{ volume.name }}">
-                                <button type="submit" class="btn btn-sm btn-secondary" name="del_volume" title="{% trans "Delete" %}" onclick="return confirm('{% trans "Are you sure?" %}')">
-                                    <i class="fa fa-trash"></i>
-                                </button>
-                            </form>
-                        </td>
-                    </tr>
-                    {% endfor %}
-                    </tbody>
-                </table>
+    
+    {% if state %}
+        <div class="row">
+            <h5 class="page-header mr-auto">{% trans "Volumes" %}</h5>
+            <div class="col-3 ">
+                <input id="filter" class="form-control" type="text" placeholder="Search">
             </div>
-            {% else %}
+        </div>
+            
+        {% if volumes  %}
+            <table class="table table-hover sortable-theme-bootstrap" data-sortable>
+                <thead>
+                <tr>
+                    <th>#</th>
+                    <th>{% trans "Name" %}</th>
+                    <th>{% trans "Allocated" %}</th>
+                    <th>{% trans "Size" %}</th>
+                    <th>{% trans "Format" %}</th>
+                    <th data-sortable="false" colspan="2">{% trans "Action" %}</th>
+                </tr>
+                </thead>
+                <tbody class="searchable">
+                {% for volume in volumes %}
+                <tr>
+                    <td>{{ forloop.counter }}</td>
+                    <td>{{ volume.name|truncatechars:55 }}</td>
+                    <td>{{ volume.allocation|filesizeformat }}</td>
+                    <td>{{ volume.size|filesizeformat }}</td>
+                    <td>{{ volume.type }}</td>
+                    <td>
+                        <!-- Modal Clone -->
+                        <div class="modal fade" id="Clone{{ forloop.counter }}" tabindex="-1" role="dialog"
+                                aria-labelledby="addHostLabel" aria-hidden="true">
+                            <div class="modal-dialog">
+                                <div class="modal-content">
+                                    <div class="modal-header">
+                                        <h5 class="modal-title">{% trans "Clone image" %} <span class="text-danger">{{ volume.name }}</span></h5>
+                                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>  
+                                    </div>
+                                    <form method="post" role="form">{% csrf_token %}
+                                        <div class="modal-body">
+                                            <div class="form-group row">
+                                                <label class="col-sm-3 col-form-label">{% trans "Name" %}</label>
+                                                <div class="col-sm-6">
+                                                    <input type="text" class="form-control" name="name" placeholder="{% trans "Name" %}" required pattern="[a-zA-Z0-9\.\-_]+">
+                                                    <input type="hidden" name="image" value="{{ volume.name }}">
+                                                </div>
+                                            </div>
+                                            <div class="form-group row" id="image_format">
+                                                <label class="col-sm-3 col-form-label">{% trans "Convert" %}</label>
+                                                <div class="col-sm-6">
+                                                    <input class="volume-convert" type="checkbox" name="convert" value="true">
+                                                </div>
+                                            </div>
+                                            <div class="form-group row format-convert">
+                                                <label class="col-sm-3 col-form-label">{% trans "Format" %}</label>
+                                                <div class="col-sm-6">
+                                                    <select name="format" class="custom-select image-format">
+                                                        <option value="raw">{% trans "raw" %}</option>
+                                                        <option value="qcow">{% trans "qcow" %}</option>
+                                                        <option value="qcow2">{% trans "qcow2" %}</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="form-group row meta-prealloc" style="display: none;">
+                                                <label class="col-sm-3 col-form-label">{% trans "Metadata" %}</label>
+                                                <div class="col-sm-6">
+                                                    <input type="checkbox" name="meta_prealloc" value="true">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="modal-footer">
+                                            <button type="button" class="btn btn-secondary" data-dismiss="modal">{% trans "Close" %}</button>
+                                            <button type="submit" class="btn btn-primary" name="cln_volume" onclick="showPleaseWaitDialog();">{% trans "Clone" %}</button>
+                                        </div>
+                                    </form>
+                                </div> <!-- /.modal-content -->
+                            </div> <!-- /.modal-dialog -->
+                        </div> <!-- /.modal -->
+                        {% ifnotequal volume.type "iso" %}
+                            <button class="btn btn-sm btn-secondary" data-toggle="modal" data-target="#Clone{{ forloop.counter }}" title="{% trans "Clone" %}">
+                                <i class="fa fa-files-o"></i>
+                            </button>
+                        {% else %}
+                            <button class="btn btn-sm btn-secondary disabled">
+                                <i class="fa fa-files-o"></i>
+                            </button>
+                        {% endifnotequal %}
+                    </td>  
+                    <td>  
+                        <form action="" method="post" role="form">{% csrf_token %}
+                            <input type="hidden" name="volname" value="{{ volume.name }}">
+                            <button type="submit" class="btn btn-sm btn-secondary" name="del_volume" title="{% trans "Delete" %}" onclick="return confirm('{% trans "Are you sure?" %}')">
+                                <i class="fa fa-trash"></i>
+                            </button>
+                        </form>
+                    </td>
+                </tr>
+                {% endfor %}
+                </tbody>
+            </table>
+        {% else %}
             <div class="col-lg-12">
                 <div class="alert alert-warning alert-dismissable">
                     <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
                     <i class="fa fa-exclamation-triangle"></i> <strong>{% trans "Warning" %}:</strong> {% trans "Hypervisor doesn't have any Volumes" %}
                 </div>
             </div>
-            {% endif %}
         {% endif %}
+    {% endif %}
     </div>
 
     {% include 'pleasewaitdialog.html' %}