diff --git a/computes/templatetags/__init__.py b/computes/templatetags/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/computes/templatetags/tags_activebtn.py b/computes/templatetags/tags_activebtn.py
deleted file mode 100644
index 70360c8..0000000
--- a/computes/templatetags/tags_activebtn.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from django import template
-import re
-
-register = template.Library()
-
-
-@register.simple_tag
-def class_activebtn(request, pattern):
-    if re.search(pattern, request.path):
-        return 'btn-primary'
-    return ''
\ No newline at end of file
diff --git a/static/css/webvirtcloud.css b/static/css/webvirtcloud.css
new file mode 100644
index 0000000..2c90ad5
--- /dev/null
+++ b/static/css/webvirtcloud.css
@@ -0,0 +1,65 @@
+/*!
+ * WebVirtCloud (http://github.com/retspen/webvirtcloud)
+ * Code licensed under the Apache License v2.0.
+ * For details, see http://www.apache.org/licenses/LICENSE-2.0.
+ */
+
+/* Global Styles */
+
+body {
+    background-color: #FFF;
+}
+
+.side-nav {
+    background-color: #FFF;
+    font-size: 1.2em;
+}
+
+.side-nav li a:hover,
+.side-nav li a:focus {
+    color: #FFF;
+    background-color: #5CD062 !important;
+}
+
+.navbar-inverse {
+    background-color: #6F5499;
+    border-color: #6F5499;
+}
+
+.navbar-inverse .navbar-brand {
+    color: #FFF;
+    font-size: 2em;
+}
+
+.navbar-inverse .navbar-nav>li>a {
+    color: #767676;
+}
+
+.navbar-inverse .navbar-nav>li>a:focus,
+.navbar-inverse .navbar-nav>li>a:hover {
+    color: #FFF;
+    background-color: #5CD062;
+}
+
+.navbar-inverse .navbar-nav>.active>a, 
+.navbar-inverse .navbar-nav>.active>a:focus, 
+.navbar-inverse .navbar-nav>.active>a:hover {
+    color: #FFF;
+    background-color: #5CD062;
+}
+
+.top-nav>li>a {
+    color: #FFF6F6;
+}
+
+.top-nav>li>a:hover,
+.top-nav>li>a:focus, 
+.top-nav>.open>a,
+.top-nav>.open>a:hover, 
+.top-nav>.open>a:focus {
+    background-color: #5CD062;
+}
+
+.page-header {
+    margin: 0 0 20px;
+}
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index 2af1dcf..16633c8 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -15,9 +15,12 @@
     <!-- Bootstrap Core CSS -->
     <link href="{% static "css/bootstrap.min.css" %}" rel="stylesheet">
 
-    <!-- Custom CSS -->
+    <!-- SB admin CSS -->
     <link href="{% static "css/sb-admin.css" %}" rel="stylesheet">
 
+    <!-- WebVirtCloud CSS -->
+    <link href="{% static "css/webvirtcloud.css" %}" rel="stylesheet">
+
     <!-- Morris Charts CSS -->
     <link href="{% static "css/plugins/morris.css" %}" rel="stylesheet">
 
diff --git a/templates/compute_block_link.html b/templates/compute_block_link.html
deleted file mode 100644
index ffbaca2..0000000
--- a/templates/compute_block_link.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% load i18n %}
-{% load tags_activebtn %}
-<a href="{% url 'overview' compute.id %}" class="btn btn-default {% class_activebtn request "^/compute/overview" %}">{% trans "Overview" %}</a>
-<a href="{% url 'storages' compute.id %}" class="btn btn-default {% class_activebtn request "^/compute/stg" %}">{% trans "Storages" %}</a>
-<a href="{% url 'networks' compute.id %}" class="btn btn-default {% class_activebtn request "^/compute/net" %}">{% trans "Networks" %}</a>
-<a href="{% url 'interfaces' compute.id %}" class="btn btn-default {% class_activebtn request "^/compute/iface" %}">{% trans "Interfaces" %}</a>
-<a href="{% url 'secrets' compute.id %}" class="btn btn-default {% class_activebtn request "^/compute/secret" %}">{% trans "Secrets" %}</a>
-
-<hr>
\ No newline at end of file
diff --git a/templates/computes.html b/templates/computes.html
index e419c94..2601238 100644
--- a/templates/computes.html
+++ b/templates/computes.html
@@ -2,16 +2,14 @@
 {% load i18n %}
 {% block title %}{% trans "Computes" %}{% endblock %}
 {% block content %}
-<div class="container-fluid">
-    <div class="row">
-
-        {% include 'sidebar.html' %}
-
-        <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
-
-            {% include 'create_comp_block.html' %}
-
-            <h1 class="page-header">Computes</h1>
+            <!-- Page Heading -->
+            <div class="row">
+                <div class="col-lg-12">
+                    {% include 'create_comp_block.html' %}
+                    <h1 class="page-header">{% trans "Computes" %}</h1>
+                </div>
+            </div>
+            <!-- /.row -->
 
             {% include 'errors_block.html' %}
 
@@ -216,17 +214,13 @@
                             </div>
                         </div>
                     {% endfor %}
-
                 {% else %}
-                    <div class="col-sm-12">
-                        <div class="well">
-                            <h4>{% trans "You have no connection" %}</h4>
+                   <div class="col-lg-12">
+                        <div class="alert alert-warning alert-dismissable">
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+                            <i class="fa fa-exclamation-triangle"></i> <strong>{% trans "Warning:" %}</strong> {% trans "Hypervisor doesn't have any Computes" %}
                         </div>
                     </div>
                 {% endif %}
             </div>
-
-        </div>
-    </div>
-</div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/instances.html b/templates/instances.html
index ccb6ad1..bbf0b4b 100644
--- a/templates/instances.html
+++ b/templates/instances.html
@@ -2,7 +2,6 @@
 {% load i18n %}
 {% block title %}{% trans "Instances" %}{% endblock %}
 {% block content %}
-
                 <!-- Page Heading -->
                 <div class="row">
                     <div class="col-lg-12">
diff --git a/templates/interfaces.html b/templates/interfaces.html
index c93898c..4f27504 100644
--- a/templates/interfaces.html
+++ b/templates/interfaces.html
@@ -2,26 +2,41 @@
 {% load i18n %}
 {% block title %}{% trans "Interfaces" %} - {{ compute.name }}{% endblock %}
 {% block content %}
-<div class="container-fluid">
-    <div class="row">
-
-        {% include 'sidebar.html' %}
-
-        <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
-
-            {% include "create_stg_block.html" %}
-
-            <h1 class="page-header">{{ compute.name }}</h1>
-
-            {% include 'compute_block_link.html' %}
+           <!-- Page Heading -->
+            <div class="row">
+                <div class="col-lg-12">
+                    {% include 'create_iface_block.html' %}
+                    <h1 class="page-header">{{ compute.name }}</h1>
+                    <ol class="breadcrumb">
+                        <li class="active">
+                            <i class="fa fa-dashboard"></i> <a href="{% url 'overview' compute.id %}">{% trans "Overview" %}</a>
+                        </li>
+                        <li>
+                            <i class="fa fa-hdd-o"></i> <a href="{% url 'storages' compute.id %}">{% trans "Storages" %}</a>
+                        </li>
+                        <li>
+                            <i class="fa fa-sitemap"></i> <a href="{% url 'networks' compute.id %}">{% trans "Networks" %}</a>
+                        </li>
+                        <li>
+                            <i class="fa fa-wifi"></i> {% trans "Interfaces" %}
+                        </li>
+                        <li>
+                            <i class="fa fa-key"></i> <a href="{% url 'secrets' compute.id %}">{% trans "Secrets" %}</a>
+                        </li>
+                    </ol>
+                </div>
+            </div>
+            <!-- /.row -->
 
             {% include 'errors_block.html' %}
 
             <div class="row">
-
                 {% if not  ifaces_all %}
-                    <div class="well">
-                        <h4>{% trans "You do not have any storage pools" %}</h4>
+                    <div class="col-lg-12">
+                        <div class="alert alert-warning alert-dismissable">
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+                            <i class="fa fa-exclamation-triangle"></i> <strong>{% trans "Warning:" %}</strong> {% trans "Hypervisor doesn't have any Interfaces" %}
+                        </div>
                     </div>
                 {% else %}
                     {% for iface in ifaces_all %}
@@ -32,18 +47,20 @@
                                     </h3>
                                 </div>
                                 <div class="panel-body">
-                                    <p>{% trans "Type" %}: {{ iface.type }}</p>
-
-                                    <p>{% trans "MAC" %}: {{ iface.mac }}</p>
+                                    <div class="row">
+                                        <div class="col-xs-4 col-sm-4">
+                                            <p><strong>{% trans "Type:" %}</strong></p>
+                                            <p><strong>{% trans "MAC:" %}</strong></p>
+                                        </div>
+                                        <div class="col-xs-6 col-sm-7">
+                                            <p>{{ iface.type }}</p>
+                                            <p>{{ iface.mac }}</p>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     {% endfor %}
                 {% endif %}
-
             </div>
-
-        </div>
-    </div>
-</div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/navbar.html b/templates/navbar.html
index 92fe9a6..6c58389 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -13,7 +13,7 @@
             <!-- Top Menu Items -->
             <ul class="nav navbar-right top-nav">
                 <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i> John Smith <b class="caret"></b></a>
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i> {{ request.user.username }} <b class="caret"></b></a>
                     <ul class="dropdown-menu">
                         <li>
                             <a href="#"><i class="fa fa-fw fa-user"></i> Profile</a>
diff --git a/templates/networks.html b/templates/networks.html
index e9e0fe9..553e00d 100644
--- a/templates/networks.html
+++ b/templates/networks.html
@@ -2,47 +2,64 @@
 {% load i18n %}
 {% block title %}{% trans "Networks" %} - {{ compute.name }}{% endblock %}
 {% block content %}
-<div class="container-fluid">
-    <div class="row">
-
-        {% include 'sidebar.html' %}
-
-        <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
-
-            {% include "create_stg_block.html" %}
-
-            <h1 class="page-header">{{ compute.name }}</h1>
-
-            {% include 'compute_block_link.html' %}
+           <!-- Page Heading -->
+            <div class="row">
+                <div class="col-lg-12">
+                    {% include 'create_net_block.html' %}
+                    <h1 class="page-header">{{ compute.name }}</h1>
+                    <ol class="breadcrumb">
+                        <li class="active">
+                            <i class="fa fa-dashboard"></i> <a href="{% url 'overview' compute.id %}">{% trans "Overview" %}</a>
+                        </li>
+                        <li>
+                            <i class="fa fa-hdd-o"></i> <a href="{% url 'storages' compute.id %}">{% trans "Storages" %}</a>
+                        </li>
+                        <li>
+                            <i class="fa fa-sitemap"></i> {% trans "Networks" %}
+                        </li>
+                        <li>
+                            <i class="fa fa-wifi"></i> <a href="{% url 'interfaces' compute.id %}">{% trans "Interfaces" %}</a>
+                        </li>
+                        <li>
+                            <i class="fa fa-key"></i> <a href="{% url 'secrets' compute.id %}">{% trans "Secrets" %}</a>
+                        </li>
+                    </ol>
+                </div>
+            </div>
+            <!-- /.row -->
 
             {% include 'errors_block.html' %}
 
             <div class="row">
-
                 {% if not networks %}
-                    <div class="well">
-                        <h4>{% trans "You do not have any virtual networks" %}</h4>
+                    <div class="col-lg-12">
+                        <div class="alert alert-warning alert-dismissable">
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+                            <i class="fa fa-exclamation-triangle"></i> <strong>{% trans "Warning:" %}</strong> {% trans "Hypervisor doesn't have any Networks" %}
+                        </div>
                     </div>
                 {% else %}
                     {% for pool in networks %}
-                        <div class="col-xs-6 col-sm-4">
+                        <div class="col-xs-12 col-sm-4">
                             <div class="panel {% if pool.status %}panel-success{% else %}panel-danger{% endif %} panel-data">
                                 <div class="panel-heading">
                                     <h3 class="panel-title"><a href="{% url 'network' compute.id pool.name %}">{{ pool.name }}</a></h3>
                                 </div>
                                 <div class="panel-body">
-                                    <p>{% trans "Device" %}: {{ pool.device }}</p>
-
-                                    <p>{% trans "Forward" %}: {{ pool.forward|upper }}</p>
+                                    <div class="row">
+                                        <div class="col-xs-4 col-sm-4">
+                                            <p><strong>{% trans "Device:" %}</strong></p>
+                                            <p><strong>{% trans "Forward:" %}</strong></p>
+                                        </div>
+                                        <div class="col-xs-6 col-sm-7">
+                                            <p>{{ pool.device }}</p>
+                                            <p>{{ pool.forward|upper }}</p>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     {% endfor %}
                 {% endif %}
-
             </div>
-
-        </div>
-    </div>
-</div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/overview.html b/templates/overview.html
index ad879cf..1d47128 100644
--- a/templates/overview.html
+++ b/templates/overview.html
@@ -2,57 +2,51 @@
 {% load i18n %}
 {% block title %}{% trans "Overview" %} - {{ compute.name }}{% endblock %}
 {% block content %}
-<div class="container-fluid">
-    <div class="row">
-
-        {% include 'sidebar.html' %}
-
-        <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
-
-            <h1 class="page-header">{{ compute.name }}</h1>
+            <!-- Page Heading -->
+            <div class="row">
+                <div class="col-lg-12">
+                    <h1 class="page-header">{{ compute.name }}</h1>
+                    <ol class="breadcrumb">
+                        <li class="active">
+                            <i class="fa fa-dashboard"></i> {% trans "Overview" %}
+                        </li>
+                        <li>
+                            <i class="fa fa-hdd-o"></i> <a href="{% url 'storages' compute.id %}">{% trans "Storages" %}</a>
+                        </li>
+                        <li>
+                            <i class="fa fa-sitemap"></i> <a href="{% url 'networks' compute.id %}">{% trans "Networks" %}</a>
+                        </li>
+                        <li>
+                            <i class="fa fa-wifi"></i> <a href="{% url 'interfaces' compute.id %}">{% trans "Interfaces" %}</a>
+                        </li>
+                        <li>
+                            <i class="fa fa-key"></i> <a href="{% url 'secrets' compute.id %}">{% trans "Secrets" %}</a>
+                        </li>
+                    </ol>
+                </div>
+            </div>
+            <!-- /.row -->
 
             {% include 'errors_block.html' %}
 
-            {% include 'compute_block_link.html' %}
-
-            <h4>{% trans "Basic details" %}</h4>
-
-            <div class="table-responsive">
-                <table class="table">
-                    <tbody>
-                        <tr>
-                            <td>{% trans "Connection" %}</td>
-                            <td>{{ uri_conn }}</td>
-                        </tr>
-                        <tr>
-                            <td>{% trans "Hostname" %}</td>
-                            <td>{{ hostname }}</td>
-                        </tr>
-                        <tr>
-                            <td>{% trans "Hypervisor" %}</td>
-                            <td>{{ hypervisor }}</td>
-                        </tr>
-                        <tr>
-                            <td>{% trans "Memory" %}</td>
-                            <td>{{ host_memory|filesizeformat }}</td>
-                        </tr>
-                        <tr>
-                            <td>{% trans "Logical CPUs" %}</td>
-                            <td>{{ logical_cpu }}</td>
-                        </tr>
-                        <tr>
-                            <td>{% trans "Processor" %}</td>
-                            <td>{{ model_cpu }}</td>
-                        </tr>
-                        <tr>
-                            <td>{% trans "Architecture" %}</td>
-                            <td>{{ host_arch }}</td>
-                        </tr>
-                    </tbody>
-                </table>
+            <div class="row">
+                <div class="col-xs-4 col-sm-3">
+                    <p>{% trans "Hostname" %}</p>
+                    <p>{% trans "Hypervisor" %}</p>
+                    <p>{% trans "Memory" %}</p>
+                    <p>{% trans "Architecture" %}</p>
+                    <p>{% trans "Logical CPUs" %}</p>
+                    <p>{% trans "Processor" %}</p>
+                    <p>{% trans "Connection" %}</p>
+                </div>
+                <div class="col-xs-8 col-sm-7">
+                    <p>{{ hostname }}</p>
+                    <p>{{ hypervisor }}</p>
+                    <p>{{ host_arch }}</p>
+                    <p>{{ host_memory|filesizeformat }}</p>
+                    <p>{{ logical_cpu }}</p>
+                    <p>{{ model_cpu }}</p>
+                    <p>{{ uri_conn }}</p>
+                </div>
             </div>
-
-        </div>
-    </div>
-</div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/secrets.html b/templates/secrets.html
index 11e1db2..c171981 100644
--- a/templates/secrets.html
+++ b/templates/secrets.html
@@ -2,26 +2,41 @@
 {% load i18n %}
 {% block title %}{% trans "Secrets" %} - {{ compute.name }}{% endblock %}
 {% block content %}
-<div class="container-fluid">
-    <div class="row">
-
-        {% include 'sidebar.html' %}
-
-        <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
-
-            {% include "create_stg_block.html" %}
-
-            <h1 class="page-header">{{ compute.name }}</h1>
-
-            {% include 'compute_block_link.html' %}
+           <!-- Page Heading -->
+            <div class="row">
+                <div class="col-lg-12">
+                    {% include 'create_secret_block.html' %}
+                    <h1 class="page-header">{{ compute.name }}</h1>
+                    <ol class="breadcrumb">
+                        <li class="active">
+                            <i class="fa fa-dashboard"></i> <a href="{% url 'overview' compute.id %}">{% trans "Overview" %}</a>
+                        </li>
+                        <li>
+                            <i class="fa fa-hdd-o"></i> <a href="{% url 'storages' compute.id %}">{% trans "Storages" %}</a>
+                        </li>
+                        <li>
+                            <i class="fa fa-sitemap"></i> <a href="{% url 'networks' compute.id %}">{% trans "Networks" %}</a>
+                        </li>
+                        <li>
+                            <i class="fa fa-wifi"></i> <a href="{% url 'interfaces' compute.id %}">{% trans "Interfaces" %}</a>
+                        </li>
+                        <li>
+                            <i class="fa fa-key"></i> {% trans "Secrets" %}
+                        </li>
+                    </ol>
+                </div>
+            </div>
+            <!-- /.row -->
 
             {% include 'errors_block.html' %}
 
             <div class="row">
-
                 {% if not  secrets_all %}
-                    <div class="well" role="main">
-                        <h4>{% trans "You do not have any Secrets" %}</h4>
+                    <div class="col-lg-12">
+                        <div class="alert alert-warning alert-dismissable">
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+                            <i class="fa fa-exclamation-triangle"></i> <strong>{% trans "Warning:" %}</strong> {% trans "Hypervisor doesn't have any Secrets" %}
+                        </div>
                     </div>
                 {% else %}
                     <table class="table table-responsive">
@@ -91,18 +106,14 @@
                                                         </div>
                                                     </form>
                                                 </div> <!-- /.modal-content -->
-                                            </div> <!-- /.modal-dialog -->
-                                        </div> <!-- /.modal -->
+                                            </div> <!-- /.tab-content -->
+                                        </div> <!-- /.modal-dialog -->
+                                    </div> <!-- /.modal -->
                                 </td>
                             </tr>
                         {% endfor %}
                         </tbody>
                     </table>
                 {% endif %}
-
             </div>
-
-        </div>
-    </div>
-</div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/showlogs.html b/templates/showlogs.html
index 88c9d2d..6a0b951 100644
--- a/templates/showlogs.html
+++ b/templates/showlogs.html
@@ -2,19 +2,16 @@
 {% load i18n %}
 {% block title %}{% trans "Logs" %}{% endblock %}
 {% block content %}
-<div class="container-fluid">
-    <div class="row">
-
-        {% include 'sidebar.html' %}
-
-        <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
-
-            <h1 class="page-header">{% trans "Logs" %}</h1>
+            <!-- Page Heading -->
+            <div class="row">
+                <div class="col-lg-12">
+                    <h1 class="page-header">{% trans "Logs" %}</h1>
+                </div>
+            </div>
+            <!-- /.row -->
 
             {% include 'errors_block.html' %}
 
-
-        </div>
-    </div>
-</div>
+            <div class="row">
+            </div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/sidebar.html b/templates/sidebar.html
index 0d9699d..22918d8 100644
--- a/templates/sidebar.html
+++ b/templates/sidebar.html
@@ -4,17 +4,17 @@
             <div class="collapse navbar-collapse navbar-ex1-collapse">
                 <ul class="nav navbar-nav side-nav">
                     <li {% class_active request "^/instance" %}">
-                        <a href="{% url 'instances' %}"><i class="fa fa-fw fa-dashboard"></i> {% trans "Instances" %}</a>
+                        <a href="{% url 'instances' %}"><i class="fa fa-fw fa-desktop"></i> {% trans "Instances" %}</a>
                     </li>
                     {% if request.user.is_superuser %}
                         <li {% class_active request "^/compute" %}>
-                            <a href="{% url 'computes' %}"><i class="fa fa-fw fa-bar-chart-o"></i> {% trans "Coputes" %}</a>
+                            <a href="{% url 'computes' %}"><i class="fa fa-fw fa-tasks"></i> {% trans "Coputes" %}</a>
                         </li>
                         <li {% class_active request "^/user" %}>
-                            <a href="{% url 'users' %}"><i class="fa fa-fw fa-table"></i> {% trans "User" %}</a>
+                            <a href="{% url 'users' %}"><i class="fa fa-fw fa-users"></i> {% trans "Users" %}</a>
                         </li>
                         <li {% class_active request "^/log" %}>
-                            <a href="{% url 'showlogs' %}"><i class="fa fa-fw fa-edit"></i> {% trans "Logs" %}</a>
+                            <a href="{% url 'showlogs' %}"><i class="fa fa-fw fa-list-alt"></i> {% trans "Logs" %}</a>
                         </li>
                     {% endif %}
                 </ul>
diff --git a/templates/storages.html b/templates/storages.html
index 9895dc9..fe82b55 100644
--- a/templates/storages.html
+++ b/templates/storages.html
@@ -2,51 +2,68 @@
 {% load i18n %}
 {% block title %}{% trans "Storages" %} - {{ compute.name }}{% endblock %}
 {% block content %}
-<div class="container-fluid">
-    <div class="row">
-
-        {% include 'sidebar.html' %}
-
-        <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
-
-            {% include "create_stg_block.html" %}
-
-            <h1 class="page-header">{{ compute.name }}</h1>
-
-            {% include 'compute_block_link.html' %}
+           <!-- Page Heading -->
+            <div class="row">
+                <div class="col-lg-12">
+                    {% include 'create_stg_block.html' %}
+                    <h1 class="page-header">{{ compute.name }}</h1>
+                    <ol class="breadcrumb">
+                        <li class="active">
+                            <i class="fa fa-dashboard"></i> <a href="{% url 'overview' compute.id %}">{% trans "Overview" %}</a>
+                        </li>
+                        <li>
+                            <i class="fa fa-hdd-o"></i> {% trans "Storages" %}
+                        </li>
+                        <li>
+                            <i class="fa fa-sitemap"></i> <a href="{% url 'networks' compute.id %}">{% trans "Networks" %}</a>
+                        </li>
+                        <li>
+                            <i class="fa fa-wifi"></i> <a href="{% url 'interfaces' compute.id %}">{% trans "Interfaces" %}</a>
+                        </li>
+                        <li>
+                            <i class="fa fa-key"></i> <a href="{% url 'secrets' compute.id %}">{% trans "Secrets" %}</a>
+                        </li>
+                    </ol>
+                </div>
+            </div>
+            <!-- /.row -->
 
             {% include 'errors_block.html' %}
 
             <div class="row">
-
                 {% if not storages %}
-                    <div class="well">
-                        <h4>{% trans "You do not have any storage pools" %}</h4>
+                    <div class="col-lg-12">
+                        <div class="alert alert-warning alert-dismissable">
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+                            <i class="fa fa-exclamation-triangle"></i> <strong>{% trans "Warning:" %}</strong> {% trans "Hypervisor doesn't have any Storages" %}
+                        </div>
                     </div>
                 {% else %}
                     {% for pool in storages %}
-                        <div class="col-xs-6 col-sm-4">
+                        <div class="col-xs-12 col-sm-4">
                             <div class="panel {% if pool.status %}panel-success{% else %}panel-danger{% endif %} panel-data">
                                 <div class="panel-heading">
                                     <h3 class="panel-title"><a href="{% url 'storage' compute.id pool.name %}">{{ pool.name }}</a></h3>
                                 </div>
                                 <div class="panel-body">
-                                    <p>{% trans "Type" %}: {{ pool.type|upper }}</p>
-
-                                    <p>{% trans "Size" %}: {{ pool.size|filesizeformat }}</p>
-
-                                    <p>{% trans "Volumes" %}: {{ pool.volumes }}</p>
+                                    <div class="row">
+                                        <div class="col-xs-4 col-sm-4">
+                                            <p><strong>{% trans "Type:" %}</strong></p>
+                                            <p><strong>{% trans "Size:" %}</strong></p>
+                                            <p><strong>{% trans "Volumes:" %}</strong></p>
+                                        </div>
+                                        <div class="col-xs-6 col-sm-7">
+                                            <p>{{ pool.type|upper }}</p>
+                                            <p>{{ pool.size|filesizeformat }}</p>
+                                            <p>{{ pool.volumes }}</p>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     {% endfor %}
                 {% endif %}
-
             </div>
 
-        </div>
 
-    </div>
-
-</div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/user.html b/templates/user.html
index 376af13..bfa1275 100644
--- a/templates/user.html
+++ b/templates/user.html
@@ -1,21 +1,18 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% block title %}{% trans "Accounts" %}{% endblock %}
+{% block title %}{% trans "User" %} - {{ user }}{% endblock %}
 {% block content %}
-<div class="container-fluid">
-    <div class="row">
-
-        {% include 'sidebar.html' %}
-
-        <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
-            <button type="button" class="btn btn-success pull-right"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span></button>
-             <h1 class="page-header">{{ user.username }}</h1>
+            <!-- Page Heading -->
+            <div class="row">
+                <div class="col-lg-12">
+                    <h1 class="page-header">{{ user }}</h1>
+                </div>
+            </div>
+            <!-- /.row -->
 
             {% include 'errors_block.html' %}
 
+            <div class="row">
             {{ user }}
-
-        </div>
-    </div>
-</div>
+            </div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/users.html b/templates/users.html
index 095c6ad..faf7f9b 100644
--- a/templates/users.html
+++ b/templates/users.html
@@ -2,14 +2,14 @@
 {% load i18n %}
 {% block title %}{% trans "Users" %}{% endblock %}
 {% block content %}
-<div class="container-fluid">
-    <div class="row">
-
-        {% include 'sidebar.html' %}
-
-        <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
-            <button type="button" class="btn btn-success pull-right"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span></button>
-             <h1 class="page-header">{% trans "Accounts" %}</h1>
+            <!-- Page Heading -->
+            <div class="row">
+                <div class="col-lg-12">
+                    {% include 'create_user_block.html' %}
+                    <h1 class="page-header">{% trans "Users" %}</h1>
+                </div>
+            </div>
+            <!-- /.row -->
 
             {% include 'errors_block.html' %}
 
@@ -31,8 +31,4 @@
                     </div>
                 </div>
             {% endfor %}
-
-        </div>
-    </div>
-</div>
 {% endblock %}
\ No newline at end of file