diff --git a/gnuviechadmin/static/css/gnuviechadmin.css b/gnuviechadmin/static/css/gnuviechadmin.css
index 5be5286..f165388 100644
--- a/gnuviechadmin/static/css/gnuviechadmin.css
+++ b/gnuviechadmin/static/css/gnuviechadmin.css
@@ -1 +1,10 @@
 /*! project specific CSS goes here. */
+table thead th.actions-column {
+  width: 5em;
+}
+table thead th.status-column {
+  width: 5em;
+}
+table thead th.name-column {
+  width: 15em;
+}
diff --git a/gnuviechadmin/templates/hostingpackages/customerhostingpackage_detail.html b/gnuviechadmin/templates/hostingpackages/customerhostingpackage_detail.html
index fe65c6f..ed95f4b 100644
--- a/gnuviechadmin/templates/hostingpackages/customerhostingpackage_detail.html
+++ b/gnuviechadmin/templates/hostingpackages/customerhostingpackage_detail.html
@@ -80,10 +80,10 @@
       <table class="table table-condensed">
         <thead>
           <tr>
-            <th>{% trans "Domain name" %}</th>
+            <th class="name-column">{% trans "Domain name" %}</th>
             <th>{% trans "Mail addresses" %}</th>
             <th>{% trans "Websites" %}</th>
-            <th title="{% trans "Domain actions" %}"><span class="sr-only">{% trans "Actions" %}</span></th>
+            <th title="{% trans "Domain actions" %}" class="actions-column"><span class="sr-only">{% trans "Actions" %}</span></th>
           </tr>
         </thead>
         <tbody>
@@ -130,10 +130,10 @@
       <table class="table table-condensed">
         <thead>
           <tr>
-            <th>{% trans "Mailbox" %}</th>
+            <th class="name-column">{% trans "Mailbox" %}</th>
             <th>{% trans "Mail addresses" %}</th>
-            <th>{% trans "Active" %}</th>
-            <th title="{% trans "Mailbox actions" %}"><span class="sr-only">{% trans "Actions" %}</span></th>
+            <th class="status-column">{% trans "Active" %}</th>
+            <th title="{% trans "Mailbox actions" %}" class="actions-column"><span class="sr-only">{% trans "Actions" %}</span></th>
           </tr>
         </thead>
         <tbody>
@@ -165,19 +165,21 @@
       <table class="table table-condensed">
         <thead>
           <tr>
+            <th class="name-column">{% trans "Database name" %}</th>
+            <th class="name-column">{% trans "Database user" %}</th>
             <th title="{% trans "Database type" %}"><span class="sr-only">{% trans "Type" %}</span></th>
-            <th>{% trans "Database name" %}</th>
-            <th>{% trans "Database user" %}</th>
-            <th title="{% trans "Database actions" %}"><span class="sr-only">{% trans "Actions" %}</span></th>
+            <th title="{% trans "Database actions" %}" class="actions-column"><span class="sr-only">{% trans "Actions" %}</span></th>
           </tr>
         </thead>
         <tbody>
           {% for database in databases %}
           <tr>
-            <td>{% include "userdbs/snippets/db_type.html" with db_type=database.db_user.db_type %}</td>
             <td>{{ database.db_name }}</td>
             <td>{{ database.db_user.name }}</td>
-            <td><a href="{% url 'change_dbuser_password' package=hostingpackage.id slug=database.db_user.name %}" title="{% trans "Set database user password" %}"><i class="fa fa-user-secret"></i><span class="sr-only"> {% trans "Set database user password" %}</span></a></td>
+            <td>{% include "userdbs/snippets/db_type.html" with db_type=database.db_user.db_type %}</td>
+            <td>
+              <a href="{% url 'change_dbuser_password' package=hostingpackage.id slug=database.db_user.name %}" title="{% trans "Set database user password" %}"><i class="fa fa-user-secret"></i><span class="sr-only"> {% trans "Set database user password" %}</span></a>
+            </td>
           </tr>
           {% endfor %}
         </tbody>