diff --git a/core/views/auth.py b/core/views/auth.py
index f97d59e..abca065 100644
--- a/core/views/auth.py
+++ b/core/views/auth.py
@@ -10,7 +10,7 @@ from core.models.otp import LoginSession
 from core.helpers.otp import get_user_otps, get_otp_choices, get_otp_by_name
 
 class LoginView(FormView):
-    template_name = f"{settings.EXPEPHALON_BACKEND}/login.html"
+    template_name = f"{settings.EXPEPHALON_BACKEND}/auth/login.html"
     form_class = LoginForm
 
     def get(self, request, *args, **kwargs):
@@ -31,7 +31,7 @@ class LoginView(FormView):
         return super().form_invalid(form)
 
 class OTPSelectorView(FormView):
-    template_name = f"{settings.EXPEPHALON_BACKEND}/otp_selector.html"
+    template_name = f"{settings.EXPEPHALON_BACKEND}/auth/otp_selector.html"
     form_class = OTPSelectorForm
 
     def clean_session(self):
@@ -60,7 +60,7 @@ class OTPSelectorView(FormView):
         return redirect("login")
 
 class OTPValidatorView(FormView):
-    template_name = f"{settings.EXPEPHALON_BACKEND}/otp_verifier.html"
+    template_name = f"{settings.EXPEPHALON_BACKEND}/auth/otp_verifier.html"
     form_class = OTPVerificationForm
 
     def clean_session(self):
diff --git a/core/views/dbsettings.py b/core/views/dbsettings.py
index ad0ca0e..566cc4d 100644
--- a/core/views/dbsettings.py
+++ b/core/views/dbsettings.py
@@ -6,22 +6,22 @@ try:
     from dbsettings.models import Setting
 
     class DBSettingsListView(ListView):
-        template_name = f"{settings.EXPEPHALON_BACKEND}/dbsettings.html"
+        template_name = f"{settings.EXPEPHALON_BACKEND}/dbsettings/index.html"
         model = Setting
 
     class DBSettingsEditView(UpdateView):
-        template_name = f"{settings.EXPEPHALON_BACKEND}/dbsettings_update.html"
+        template_name = f"{settings.EXPEPHALON_BACKEND}/dbsettings/update.html"
         model = Setting
         success_url = reverse_lazy("dbsettings")
         fields = ["key", "value"]
     
     class DBSettingsDeleteView(DeleteView):
-        template_name = f"{settings.EXPEPHALON_BACKEND}/dbsettings_delete.html"
+        template_name = f"{settings.EXPEPHALON_BACKEND}/dbsettings/delete.html"
         model = Setting
         success_url = reverse_lazy("dbsettings")
 
     class DBSettingsCreateView(CreateView):
-        template_name = f"{settings.EXPEPHALON_BACKEND}/dbsettings_create.html"
+        template_name = f"{settings.EXPEPHALON_BACKEND}/dbsettings/create.html"
         model = Setting
         success_url = reverse_lazy("dbsettings")
         fields = ["key", "value"]
diff --git a/templates/backend/auth_base.html b/templates/backend/auth/base.html
similarity index 100%
rename from templates/backend/auth_base.html
rename to templates/backend/auth/base.html
diff --git a/templates/backend/login.html b/templates/backend/auth/login.html
similarity index 97%
rename from templates/backend/login.html
rename to templates/backend/auth/login.html
index 995e013..309a28f 100644
--- a/templates/backend/login.html
+++ b/templates/backend/auth/login.html
@@ -1,4 +1,4 @@
-{% extends "backend/auth_base.html" %}
+{% extends "backend/auth/base.html" %}
 {% load bootstrap4 %}
 {% block content %}
 <div class="mx-auto app-login-box col-sm-12 col-md-10 col-lg-9">
diff --git a/templates/backend/otp_selector.html b/templates/backend/auth/otp_selector.html
similarity index 95%
rename from templates/backend/otp_selector.html
rename to templates/backend/auth/otp_selector.html
index 88b20cd..8d9387a 100644
--- a/templates/backend/otp_selector.html
+++ b/templates/backend/auth/otp_selector.html
@@ -1,4 +1,4 @@
-{% extends "backend/auth_base.html" %}
+{% extends "backend/auth/base.html" %}
 {% load bootstrap4 %}
 {% block content %}
 <div class="mx-auto app-login-box col-sm-12 col-md-10 col-lg-9">
diff --git a/templates/backend/otp_verifier.html b/templates/backend/auth/otp_verifier.html
similarity index 95%
rename from templates/backend/otp_verifier.html
rename to templates/backend/auth/otp_verifier.html
index 4191afc..0a27c53 100644
--- a/templates/backend/otp_verifier.html
+++ b/templates/backend/auth/otp_verifier.html
@@ -1,4 +1,4 @@
-{% extends "backend/auth_base.html" %}
+{% extends "backend/auth/base.html" %}
 {% load bootstrap4 %}
 {% block content %}
 <div class="mx-auto app-login-box col-sm-12 col-md-10 col-lg-9">
diff --git a/templates/backend/base.html b/templates/backend/base.html
index da30209..e37098b 100644
--- a/templates/backend/base.html
+++ b/templates/backend/base.html
@@ -8,7 +8,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta http-equiv="Content-Language" content="en">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>Analytics Dashboard - This is an example dashboard created using build-in elements and components.</title>
+    <title>{% if title %}{{ title }} - {% endif %}Expephalon</title>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no" />
     <meta name="description" content="This is an example dashboard created using build-in elements and components.">
     <meta name="msapplication-tap-highlight" content="no">
diff --git a/templates/backend/dbsettings/delete.html b/templates/backend/dbsettings/delete.html
index db40a5d..e52a164 100644
--- a/templates/backend/dbsettings/delete.html
+++ b/templates/backend/dbsettings/delete.html
@@ -8,8 +8,8 @@
                 <i class="fa fa-database">
                 </i>
             </div>
-            <div>Database Settings - Edit Setting
-                <div class="page-title-subheading">Edit key and value of a setting
+            <div>Database Settings - Delete Setting
+                <div class="page-title-subheading">Delete a setting from the system
                 </div>
             </div>
         </div>
@@ -27,7 +27,7 @@
             <div class="card-header-tab card-header-tab-animation card-header">
                 <div class="card-header-title">
                     <i class="header-icon lnr-apartment icon-gradient bg-love-kiss"> </i>
-                    Deleting {{ form.key.value }}
+                    Deleting {{ object.key }}
                 </div>
             </div>
             <div class="card-body">
@@ -35,7 +35,7 @@
                     <div class="tab-pane fade show active" id="tabs-eg-77">
                             <form method="POST">
                                 {% csrf_token %}
-                                Are you sure you wish to delete {{ form.key.value }}?
+                                Are you sure you wish to delete {{ object.key }}?
                                 {% buttons %}
                                 <button type="button" class="btn-shadow mr-3 btn btn-success">
                                     <i class="fa fa-check"></i> Save
diff --git a/templates/backend/dbsettings/index.html b/templates/backend/dbsettings/index.html
index bb7a05c..8e52bce 100644
--- a/templates/backend/dbsettings/index.html
+++ b/templates/backend/dbsettings/index.html
@@ -46,7 +46,7 @@
                                 <tr>
                                     <th scope="row">{{ setting.key }}</th>
                                     <td><a href="javascript:alert('{{ setting.value }}');">Click to display...</a></td>
-                                    <td><a href="{% url "dbsettings_edit" setting.key %}"><i class="fas fa-edit" title="Edit Setting"></i></a> <a href="#"><i style="color: darkred;" onclick="askdelete(20);" class="fas fa-trash-alt" title="Delete Setting"></i></a></td>
+                                    <td><a href="{% url "dbsettings_edit" setting.key %}"><i class="fas fa-edit" title="Edit Setting"></i></a> <a href="{% url "dbsettings_delete" setting.key %}"><i style="color: darkred;" class="fas fa-trash-alt" title="Delete Setting"></i></a></td>
                                 </tr>
                                 {% endfor %}
                                 </tbody>