diff --git a/computes/templates/computes/instances.html b/computes/templates/computes/instances.html
index d5a02b3..f69143f 100644
--- a/computes/templates/computes/instances.html
+++ b/computes/templates/computes/instances.html
@@ -6,7 +6,7 @@
 {% block style %}
 <link rel="stylesheet" href="{% static "css/sortable-theme-bootstrap.css" %}" />
 {% endblock %}
-{% block page_heading %}{{ compute.name }}{% endblock page_heading %}
+{% block page_heading %}{{ compute.name }} - {% trans "Instances" %}{% endblock page_heading %}
 
 {% block page_heading_extra %}
 <a href="{% url 'instances:create_instance_select_type' compute.id %}"
diff --git a/interfaces/templates/interfaces.html b/interfaces/templates/interfaces.html
index c103de6..413691f 100644
--- a/interfaces/templates/interfaces.html
+++ b/interfaces/templates/interfaces.html
@@ -4,7 +4,7 @@
 
 {% block title %}{% trans "Interfaces" %} - {{ compute.name }}{% endblock %}
 
-{% block page_heading%}{% trans "Interfaces" %} - {{ compute.name }}{% endblock page_heading %}
+{% block page_heading %}{{ compute.name }} - {% trans "Interfaces" %}{% endblock page_heading %}
 
 {% block page_heading_extra %}{% include 'create_iface_block.html' %}{% endblock page_heading_extra %}
 
diff --git a/networks/templates/networks.html b/networks/templates/networks.html
index 5415acd..b847749 100644
--- a/networks/templates/networks.html
+++ b/networks/templates/networks.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block title %}{{ compute.name }} - {% trans "Networks" %}{% endblock %}
+{% block title %}{% trans "Networks" %} - {{ compute.name }}{% endblock %}
 
 {% block page_heading %}{{ compute.name }} - {% trans "Networks" %}{% endblock page_heading %}
 
diff --git a/nwfilters/templates/nwfilters.html b/nwfilters/templates/nwfilters.html
index d4110af..eac9c96 100644
--- a/nwfilters/templates/nwfilters.html
+++ b/nwfilters/templates/nwfilters.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block title %}{{ compute.name }} - {% trans "NWFilters" %}{% endblock %}
+{% block title %}{% trans "NWFilters" %} - {{ compute.name }}{% endblock %}
 
 {% block page_heading %}{{ compute.name }} - {% trans "NWFilters" %}{% endblock page_heading %}
 
diff --git a/secrets/templates/secrets.html b/secrets/templates/secrets.html
index b5e21ba..7536032 100644
--- a/secrets/templates/secrets.html
+++ b/secrets/templates/secrets.html
@@ -14,7 +14,6 @@
 {% block content %}
     <div class="row">
         <div class="col-lg-12">
-            <h2 class="page-header"></h2>
             <nav aria-label="breadcrumb">
                 <ol class="breadcrumb bg-light shadow-sm">
                     <li class="breadcrumb-item active">
diff --git a/storages/templates/storages.html b/storages/templates/storages.html
index fddcc58..21edf6f 100644
--- a/storages/templates/storages.html
+++ b/storages/templates/storages.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block title %}{{ compute.name }} - {% trans "Storages" %}{% endblock %}
+{% block title %}{% trans "Storages" %} - {{ compute.name }}{% endblock %}
 
 {% block page_heading %}{{ compute.name }} - {% trans "Storages" %}{% endblock page_heading %}
 
@@ -37,6 +37,7 @@
             </nav>
         </div>
     </div>
+
     <div class="row">
         {% if not storages %}
             <div class="col-lg-12">
diff --git a/templates/base.html b/templates/base.html
index 99e0923..52d30cd 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -40,18 +40,17 @@
 
     <div role="main" class="container">
       <div class"row">
-        <div class="col-sm-12">
+        <div>
           <div class="float-right">
             {% block page_heading_extra %}
             {% endblock page_heading_extra %}
           </div>
-          <h3 class="page-header">
+          <h3 class="ml-0 page-header">
             {% block page_heading %}
             {% endblock page_heading %}
           </h3>
         </div>
       </div>
-      <hr>
       {% bootstrap_messages %}
       {% block content %}{% endblock %}
     </div>