diff --git a/admin/views.py b/admin/views.py
index 73579e5..3a5f72e 100644
--- a/admin/views.py
+++ b/admin/views.py
@@ -33,7 +33,7 @@ def group_create(request):
 
     return render(
         request,
-        'admin/common/form.html',
+        'common/form.html',
         {
             'form': form,
             'title': _('Create Group'),
@@ -51,7 +51,7 @@ def group_update(request, pk):
 
     return render(
         request,
-        'admin/common/form.html',
+        'common/form.html',
         {
             'form': form,
             'title': _('Update Group'),
diff --git a/static/css/webvirtcloud.css b/static/css/webvirtcloud.css
index 81a99c2..d1fbdf7 100644
--- a/static/css/webvirtcloud.css
+++ b/static/css/webvirtcloud.css
@@ -169,3 +169,7 @@ p {
     vertical-align: middle;
 }
 
+/* remove ugly dotted outline on tabs */
+a {
+    outline: 0;
+}
diff --git a/admin/templates/admin/common/form.html b/templates/common/form.html
similarity index 91%
rename from admin/templates/admin/common/form.html
rename to templates/common/form.html
index 542eb45..03b40ef 100644
--- a/admin/templates/admin/common/form.html
+++ b/templates/common/form.html
@@ -3,7 +3,7 @@
 {% load icons %}
 {% load i18n %}
 
-{% block title %}{% trans "User" %}{% endblock %}
+{% block title %}{{ title }}{% endblock %}
 
 {% block content %}
 <div class="row">