diff --git a/templates/wireguard/wireguard_manage_server.html b/templates/wireguard/wireguard_manage_server.html
index 4448450..9d9a5ba 100644
--- a/templates/wireguard/wireguard_manage_server.html
+++ b/templates/wireguard/wireguard_manage_server.html
@@ -6,19 +6,6 @@
 <div class="card card-primary card-outline">
     
     <div class="card-body">
-        <ul class="nav nav-tabs"  role="tablist">
-            {% for wgconf in wireguard_instances %}
-            <li class="nav-item">
-                <a class="nav-link {%if wgconf == current_instance%}active{%endif%}" href="/server/manage/?uuid={{wgconf.uuid}}" role="tab" >
-                    wg{{wgconf.instance_id}} {%if wgconf.name %}({{wgconf.name}}){%endif%}
-                </a>
-            </li>
-            {% endfor %}
-            <li class="nav-item">
-                <a class="nav-link {%if not current_instance%}active{%endif%}" href="/server/manage/?action=create" role="tab" >{% trans 'Create Instance' %}</a>
-            </li>
-
-          </ul>
         <div class="tab-content" id="custom-content-below-tabContent">
             <div class="tab-pane fade show active" id="custom-content-below-home" role="tabpanel" aria-labelledby="custom-content-below-home-tab">
                 <form method="post">
@@ -128,6 +115,7 @@
                     <div class="card-footer">
                         <button type="submit" class="btn btn-primary">{% trans 'Save' %}</button>
                         {% if current_instance.uuid %}
+                            <a href="{% url 'wireguard_server_list' %}" class='btn btn-outline-secondary' >{% trans 'Back' %}</a>
                         <a href='javascript:void(0)' class='btn btn-outline-danger' data-command='delete' onclick='openCommandDialog(this)'>{% trans 'Delete Configuration' %}</a>
                         {% endif %}
                     </div>
diff --git a/wireguard/views.py b/wireguard/views.py
index a91adcf..011f71f 100644
--- a/wireguard/views.py
+++ b/wireguard/views.py
@@ -4,7 +4,7 @@ from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.db import models
-from django.shortcuts import get_object_or_404, redirect, render
+from django.shortcuts import get_object_or_404, redirect, render, Http404
 from django.utils.translation import gettext as _
 from django.utils.translation import gettext_lazy as _
 
@@ -124,7 +124,8 @@ def view_wireguard_manage_instance(request):
         if request.GET.get('action') == 'create':
             current_instance = None
         else:
-            current_instance = wireguard_instances.first()
+            raise Http404
+
     if current_instance:
         page_title = f'wg{current_instance.instance_id}'
         message_title = _('Update WireGuard Instance')
@@ -154,7 +155,7 @@ def view_wireguard_manage_instance(request):
             this_form.pending_changes = True
             this_form.save()
             messages.success(request, message_title + '|WireGuard instance updated: wg' + str(form.instance.instance_id))
-            return redirect('/server/manage/?uuid=' + str(form.instance.uuid))
+            return redirect('/server/detail/?uuid=' + str(form.instance.uuid))
     else:
         if not current_instance:
             form = WireGuardInstanceForm(initial=generate_instance_defaults())