diff --git a/config/agents/RAG_AGENT/1.0.0.yaml b/config/agents/RAG_AGENT/1.0.0.yaml
index 37591c8..f979b7e 100644
--- a/config/agents/RAG_AGENT/1.0.0.yaml
+++ b/config/agents/RAG_AGENT/1.0.0.yaml
@@ -13,7 +13,7 @@ backstory: >
   language the context provided to you is in. You are participating in a conversation, not writing e.g. an email. Do not
   include a salutation or closing greeting in your answer.
   {custom_backstory}
-full_model_name: "mistral.mistral-large-latest"
+full_model_name: "mistral.mistral-small-latest"
 temperature: 0.3
 metadata:
   author: "Josako"
diff --git a/eveai_app/templates/document/catalogs.html b/eveai_app/templates/document/catalogs.html
index 5827e43..f7ad3df 100644
--- a/eveai_app/templates/document/catalogs.html
+++ b/eveai_app/templates/document/catalogs.html
@@ -9,11 +9,14 @@
 
 {% block content %}
 <div class="container">
-    <form method="POST" action="{{ url_for('document_bp.handle_catalog_selection') }}">
+    <form method="POST" action="{{ url_for('document_bp.handle_catalog_selection') }}" id="catalogsForm">
         {{ render_selectable_table(headers=["Catalog ID", "Name", "Type"], rows=rows, selectable=True, id="catalogsTable") }}
-        <div class="form-group mt-3">
-            <button type="submit" name="action" value="set_session_catalog" class="btn btn-primary">Set Session Catalog</button>
-            <button type="submit" name="action" value="edit_catalog" class="btn btn-primary">Edit Catalog</button>
+        <div class="form-group mt-3 d-flex justify-content-between">
+            <div>
+                <button type="submit" name="action" value="set_session_catalog" class="btn btn-primary" onclick="return validateTableSelection('catalogsForm')">Set Session Catalog</button>
+                <button type="submit" name="action" value="edit_catalog" class="btn btn-primary" onclick="return validateTableSelection('catalogsForm')">Edit Catalog</button>
+            </div>
+            <button type="submit" name="action" value="create_catalog" class="btn btn-success">Register Catalog</button>
         </div>
     </form>
 </div>
diff --git a/eveai_app/templates/document/document_versions_list_view.html b/eveai_app/templates/document/document_versions_list_view.html
index 149bafe..7359736 100644
--- a/eveai_app/templates/document/document_versions_list_view.html
+++ b/eveai_app/templates/document/document_versions_list_view.html
@@ -24,7 +24,7 @@
     {{ render_collapsible_section('Filter', 'Filter Options', filter_form) }}
 
     <div class="form-group mt-3">
-        <form method="POST" action="{{ url_for('document_bp.handle_document_version_selection') }}">
+        <form method="POST" action="{{ url_for('document_bp.handle_document_version_selection') }}" id="documentVersionsForm">
             <!-- Document Versions Table -->
             {{ render_selectable_sortable_table(
                 headers=["ID", "File Type", "Processing", "Processing Start", "Processing Finish", "Processing Error"],
@@ -34,9 +34,11 @@
                 sort_by=sort_by,
                 sort_order=sort_order
             ) }}
-            <div class="form-group mt-4">
-                <button type="submit" name="action" value="edit_document_version" class="btn btn-primary">Edit Document Version</button>
-                <button type="submit" name="action" value="process_document_version" class="btn btn-danger">Process Document Version</button>
+            <div class="form-group mt-3 d-flex justify-content-between">
+                <div>
+                    <button type="submit" name="action" value="edit_document_version" class="btn btn-primary" onclick="return validateTableSelection('documentVersionsForm')">Edit Document Version</button>
+                    <button type="submit" name="action" value="process_document_version" class="btn btn-danger" onclick="return validateTableSelection('documentVersionsForm')">Process Document Version</button>
+                </div>
             </div>
         </form>
     </div>
diff --git a/eveai_app/templates/document/documents.html b/eveai_app/templates/document/documents.html
index ed11e6b..8dcc1dc 100644
--- a/eveai_app/templates/document/documents.html
+++ b/eveai_app/templates/document/documents.html
@@ -21,7 +21,7 @@
     {{ render_collapsible_section('Filter', 'Filter Options', filter_form) }}
 
     <div class="form-group mt-3">
-        <form method="POST" action="{{ url_for('document_bp.handle_document_selection') }}">
+        <form method="POST" action="{{ url_for('document_bp.handle_document_selection') }}" id="documentsForm">
             <!-- Documents Table -->
             {{ render_selectable_sortable_table_with_dict_headers(
                 headers=[
@@ -37,10 +37,12 @@
                 sort_by=sort_by,
                 sort_order=sort_order
             ) }}
-            <div class="form-group mt-4">
-                <button type="submit" name="action" value="edit_document" class="btn btn-primary">Edit Document</button>
-                <button type="submit" name="action" value="document_versions" class="btn btn-secondary">Show Document Versions</button>
-                <button type="submit" name="action" value="refresh_document" class="btn btn-secondary">Refresh Document (new version)</button>
+            <div class="form-group mt-3 d-flex justify-content-between">
+                <div>
+                    <button type="submit" name="action" value="edit_document" class="btn btn-primary" onclick="return validateTableSelection('documentsForm')">Edit Document</button>
+                    <button type="submit" name="action" value="document_versions" class="btn btn-secondary" onclick="return validateTableSelection('documentsForm')">Show Document Versions</button>
+                    <button type="submit" name="action" value="refresh_document" class="btn btn-secondary" onclick="return validateTableSelection('documentsForm')">Refresh Document (new version)</button>
+                </div>
             </div>
         </form>
     </div>
diff --git a/eveai_app/templates/document/processors.html b/eveai_app/templates/document/processors.html
index 38b7598..a2dfeea 100644
--- a/eveai_app/templates/document/processors.html
+++ b/eveai_app/templates/document/processors.html
@@ -9,10 +9,13 @@
 
 {% block content %}
 <div class="container">
-    <form method="POST" action="{{ url_for('document_bp.handle_processor_selection') }}">
+    <form method="POST" action="{{ url_for('document_bp.handle_processor_selection') }}" id="processorsForm">
         {{ render_selectable_table(headers=["Processor ID", "Name", "Type", "Catalog ID"], rows=rows, selectable=True, id="retrieversTable") }}
-        <div class="form-group mt-3">
-            <button type="submit" name="action" value="edit_processor" class="btn btn-primary">Edit Processor</button>
+        <div class="form-group mt-3 d-flex justify-content-between">
+            <div>
+                <button type="submit" name="action" value="edit_processor" class="btn btn-primary" onclick="return validateTableSelection('processorsForm')">Edit Processor</button>
+            </div>
+            <button type="submit" name="action" value="create_processor" class="btn btn-success">Register Processor</button>
         </div>
     </form>
 </div>
diff --git a/eveai_app/templates/document/retrievers.html b/eveai_app/templates/document/retrievers.html
index 3490552..73fadac 100644
--- a/eveai_app/templates/document/retrievers.html
+++ b/eveai_app/templates/document/retrievers.html
@@ -9,10 +9,13 @@
 
 {% block content %}
 <div class="container">
-    <form method="POST" action="{{ url_for('document_bp.handle_retriever_selection') }}">
+    <form method="POST" action="{{ url_for('document_bp.handle_retriever_selection') }}" id="retrieversForm">
         {{ render_selectable_table(headers=["Retriever ID", "Name", "Type", "Catalog ID"], rows=rows, selectable=True, id="retrieversTable") }}
-        <div class="form-group mt-3">
-            <button type="submit" name="action" value="edit_retriever" class="btn btn-primary">Edit Retriever</button>
+        <div class="form-group mt-3 d-flex justify-content-between">
+            <div>
+                <button type="submit" name="action" value="edit_retriever" class="btn btn-primary" onclick="return validateTableSelection('retrieversForm')">Edit Retriever</button>
+            </div>
+            <button type="submit" name="action" value="create_retriever" class="btn btn-success">Register Retriever</button>
         </div>
     </form>
 </div>
diff --git a/eveai_app/templates/entitlements/view_license_tiers.html b/eveai_app/templates/entitlements/view_license_tiers.html
index ea922f6..503ec75 100644
--- a/eveai_app/templates/entitlements/view_license_tiers.html
+++ b/eveai_app/templates/entitlements/view_license_tiers.html
@@ -6,11 +6,14 @@
 {% block content %}
 
 <!-- License Tier Selection Form -->
-<form method="POST" action="{{ url_for('entitlements_bp.handle_license_tier_selection') }}">
+<form method="POST" action="{{ url_for('entitlements_bp.handle_license_tier_selection') }}" id="licenseTiersForm">
     {{ render_selectable_table(headers=["ID", "Name", "Version", "Start Date", "End Date"], rows=rows, selectable=True, id="licenseTierTable") }}
-    <div class="form-group mt-3">
-        <button type="submit" name="action" value="edit_license_tier" class="btn btn-primary">Edit License Tier</button>
-        <button type="submit" name="action" value="create_license_for_tenant" class="btn btn-secondary">Create License for Current Tenant</button>
+    <div class="form-group mt-3 d-flex justify-content-between">
+        <div>
+            <button type="submit" name="action" value="edit_license_tier" class="btn btn-primary" onclick="return validateTableSelection('licenseTiersForm')">Edit License Tier</button>
+            <button type="submit" name="action" value="create_license_for_tenant" class="btn btn-secondary" onclick="return validateTableSelection('licenseTiersForm')">Create License for Current Tenant</button>
+        </div>
+        <button type="submit" name="action" value="create_license_tier" class="btn btn-success">Register License Tier</button>
     </div>
 </form>
 
diff --git a/eveai_app/templates/entitlements/view_licenses.html b/eveai_app/templates/entitlements/view_licenses.html
index 3beda2f..1aa8c5c 100644
--- a/eveai_app/templates/entitlements/view_licenses.html
+++ b/eveai_app/templates/entitlements/view_licenses.html
@@ -7,10 +7,12 @@
 {% block content_description %}View Licenses{% endblock %}
 
 {% block content %}
-<form action="{{ url_for('entitlements_bp.handle_license_selection') }}" method="POST">
+<form action="{{ url_for('entitlements_bp.handle_license_selection') }}" method="POST" id="licensesForm">
     {{ render_selectable_table(headers=["License ID", "Name", "Start Date", "End Date", "Active"], rows=rows, selectable=True, id="licensesTable") }}
-    <div class="form-group mt-3">
-        <button type="submit" name="action" value="edit_license" class="btn btn-primary">Edit License</button>
+    <div class="form-group mt-3 d-flex justify-content-between">
+        <div>
+            <button type="submit" name="action" value="edit_license" class="btn btn-primary" onclick="return validateTableSelection('licensesForm')">Edit License</button>
+        </div>
         <!-- Additional buttons can be added here for other actions -->
     </div>
 </form>
diff --git a/eveai_app/templates/interaction/chat_sessions.html b/eveai_app/templates/interaction/chat_sessions.html
index bee8f32..304643d 100644
--- a/eveai_app/templates/interaction/chat_sessions.html
+++ b/eveai_app/templates/interaction/chat_sessions.html
@@ -9,10 +9,12 @@
 
 {% block content %}
 <div class="container">
-    <form method="POST" action="{{ url_for('interaction_bp.handle_chat_session_selection') }}">
-        {{ render_selectable_table(headers=["ID", "Session ID", "Session Start", "Session End"], rows=rows, selectable=True, id="documentsTable") }}
-        <div class="form-group mt-3">
-            <button type="submit" name="action" value="view_chat_session" class="btn btn-primary">View Chat Session</button>
+    <form method="POST" action="{{ url_for('interaction_bp.handle_chat_session_selection') }}" id="chatSessionsForm">
+        {{ render_selectable_table(headers=["ID", "Session ID", "Session Start", "Session End"], rows=rows, selectable=True, id="chatSessionsTable") }}
+        <div class="form-group mt-3 d-flex justify-content-between">
+            <div>
+                <button type="submit" name="action" value="view_chat_session" class="btn btn-primary" onclick="return validateTableSelection('chatSessionsForm')">View Chat Session</button>
+            </div>
         </div>
     </form>
 </div>
diff --git a/eveai_app/templates/interaction/specialists.html b/eveai_app/templates/interaction/specialists.html
index 63d37d1..0e22d0d 100644
--- a/eveai_app/templates/interaction/specialists.html
+++ b/eveai_app/templates/interaction/specialists.html
@@ -9,10 +9,13 @@
 
 {% block content %}
 <div class="container">
-    <form method="POST" action="{{ url_for('interaction_bp.handle_specialist_selection') }}">
+    <form method="POST" action="{{ url_for('interaction_bp.handle_specialist_selection') }}" id="specialistsForm">
         {{ render_selectable_table(headers=["Specialist ID", "Name", "Type"], rows=rows, selectable=True, id="specialistsTable") }}
-        <div class="form-group mt-3">
-            <button type="submit" name="action" value="edit_specialist" class="btn btn-primary">Edit Specialist</button>
+        <div class="form-group mt-3 d-flex justify-content-between">
+            <div>
+                <button type="submit" name="action" value="edit_specialist" class="btn btn-primary" onclick="return validateTableSelection('specialistsForm')">Edit Specialist</button>
+            </div>
+            <button type="submit" name="action" value="create_specialist" class="btn btn-success">Register Specialist</button>
         </div>
     </form>
 </div>
diff --git a/eveai_app/templates/macros.html b/eveai_app/templates/macros.html
index d4a3039..59996e7 100644
--- a/eveai_app/templates/macros.html
+++ b/eveai_app/templates/macros.html
@@ -159,8 +159,6 @@
                          value="{{ row[0] }}"
                          {% if is_component_selector %}
                            data-component-selector="true"
-                         {% else %}
-                           required
                          {% endif %}>
               </td>
             {% endif %}
diff --git a/eveai_app/templates/navbar.html b/eveai_app/templates/navbar.html
index 9010aee..b9a6b6c 100644
--- a/eveai_app/templates/navbar.html
+++ b/eveai_app/templates/navbar.html
@@ -69,46 +69,37 @@
                         <ul class="navbar-nav navbar-nav-hover mx-auto">
                             {% if current_user.is_authenticated %}
                                 {{ dropdown('Tenant Configuration', 'source_environment', [
-                                    {'name': 'Tenant List', 'url': '/user/select_tenant', 'roles': ['Super User']},
-                                    {'name': 'Tenant Registration', 'url': '/user/tenant', 'roles': ['Super User']},
+                                    {'name': 'Tenants', 'url': '/user/select_tenant', 'roles': ['Super User']},
                                     {'name': 'Tenant Overview', 'url': '/user/tenant_overview', 'roles': ['Super User', 'Tenant Admin']},
                                     {'name': 'Edit Tenant', 'url': '/user/tenant/' ~ session['tenant'].get('id'), 'roles': ['Super User', 'Tenant Admin']},
                                     {'name': 'Tenant Domains', 'url': '/user/view_tenant_domains', 'roles': ['Super User', 'Tenant Admin']},
-                                    {'name': 'Tenant Domain Registration', 'url': '/user/tenant_domain', 'roles': ['Super User', 'Tenant Admin']},
                                     {'name': 'Tenant Projects', 'url': '/user/tenant_projects', 'roles': ['Super User', 'Tenant Admin']},
-                                    {'name': 'Tenant Project Registration', 'url': '/user/tenant_project', 'roles': ['Super User', 'Tenant Admin']},
-                                    {'name': 'User List', 'url': '/user/view_users', 'roles': ['Super User', 'Tenant Admin']},
-                                    {'name': 'User Registration', 'url': '/user/user', 'roles': ['Super User', 'Tenant Admin']},
+                                    {'name': 'Users', 'url': '/user/view_users', 'roles': ['Super User', 'Tenant Admin']},
                                 ]) }}
                             {% endif %}
                             {% if current_user.is_authenticated %}
                                 {{ dropdown('Document Mgmt', 'note_stack', [
-                                    {'name': 'Add Catalog', 'url': '/document/catalog', 'roles': ['Super User', 'Tenant Admin']},
-                                    {'name': 'All Catalogs', 'url': '/document/catalogs', 'roles': ['Super User', 'Tenant Admin']},
-                                    {'name': 'Add Processor', 'url': '/document/processor', 'roles': ['Super User', 'Tenant Admin']},
-                                    {'name': 'All Processors', 'url': '/document/processors', 'roles': ['Super User', 'Tenant Admin']},
-                                    {'name': 'Add Retriever', 'url': '/document/retriever', 'roles': ['Super User', 'Tenant Admin']},
-                                    {'name': 'All Retrievers', 'url': '/document/retrievers', 'roles': ['Super User', 'Tenant Admin']},
+                                    {'name': 'Catalogs', 'url': '/document/catalogs', 'roles': ['Super User', 'Tenant Admin']},
+                                    {'name': 'Processors', 'url': '/document/processors', 'roles': ['Super User', 'Tenant Admin']},
+                                    {'name': 'Retrievers', 'url': '/document/retrievers', 'roles': ['Super User', 'Tenant Admin']},
                                     {'name': 'Add Document', 'url': '/document/add_document', 'roles': ['Super User', 'Tenant Admin']},
                                     {'name': 'Add URL', 'url': '/document/add_url', 'roles': ['Super User', 'Tenant Admin']},
-                                    {'name': 'All Documents', 'url': '/document/documents', 'roles': ['Super User', 'Tenant Admin']},
-                                    {'name': 'All Document Versions', 'url': '/document/document_versions_list', 'roles': ['Super User', 'Tenant Admin']},
+                                    {'name': 'Documents', 'url': '/document/documents', 'roles': ['Super User', 'Tenant Admin']},
+                                    {'name': 'Document Versions', 'url': '/document/document_versions_list', 'roles': ['Super User', 'Tenant Admin']},
                                     {'name': 'Library Operations', 'url': '/document/library_operations', 'roles': ['Super User', 'Tenant Admin']},
                                 ]) }}
                             {% endif %}
                             {% if current_user.is_authenticated %}
                                 {{ dropdown('Interactions', 'hub', [
-                                    {'name': 'Add Specialist', 'url': '/interaction/specialist', 'roles': ['Super User', 'Tenant Admin']},
-                                    {'name': 'All Specialists', 'url': '/interaction/specialists', 'roles': ['Super User', 'Tenant Admin']},
+                                    {'name': 'Specialists', 'url': '/interaction/specialists', 'roles': ['Super User', 'Tenant Admin']},
                                     {'name': 'Chat Sessions', 'url': '/interaction/chat_sessions', 'roles': ['Super User', 'Tenant Admin']},
                                 ]) }}
                             {% endif %}
                             {% if current_user.is_authenticated %}
                                 {{ dropdown('Administration', 'settings', [
-                                    {'name': 'License Tier Registration', 'url': '/entitlements/license_tier', 'roles': ['Super User']},
-                                    {'name': 'All License Tiers', 'url': '/entitlements/view_license_tiers', 'roles': ['Super User']},
+                                    {'name': 'License Tiers', 'url': '/entitlements/view_license_tiers', 'roles': ['Super User']},
                                     {'name': 'Trigger Actions', 'url': '/administration/trigger_actions', 'roles': ['Super User']},
-                                    {'name': 'All Licenses', 'url': '/entitlements/view_licenses', 'roles': ['Super User', 'Tenant Admin']},
+                                    {'name': 'Licenses', 'url': '/entitlements/view_licenses', 'roles': ['Super User', 'Tenant Admin']},
                                     {'name': 'Usage', 'url': '/entitlements/view_usages', 'roles': ['Super User', 'Tenant Admin']},
                                 ]) }}
                             {% endif %}
diff --git a/eveai_app/templates/scripts.html b/eveai_app/templates/scripts.html
index d1fe28e..0e788db 100644
--- a/eveai_app/templates/scripts.html
+++ b/eveai_app/templates/scripts.html
@@ -145,8 +145,17 @@ document.addEventListener('DOMContentLoaded', function() {
     });
 });
 </script>
-
-
+<script>
+function validateTableSelection(formId) {
+    const form = document.getElementById(formId);
+    const selectedRow = form.querySelector('input[name="selected_row"]:checked');
+    if (!selectedRow) {
+        alert('Please select a row first');
+        return false;
+    }
+    return true;
+}
+</script>
 <style>
 .json-editor-container {
     height: 400px;
diff --git a/eveai_app/templates/user/select_tenant.html b/eveai_app/templates/user/select_tenant.html
index 54b81c1..e3a9219 100644
--- a/eveai_app/templates/user/select_tenant.html
+++ b/eveai_app/templates/user/select_tenant.html
@@ -29,7 +29,7 @@
             <button type="submit" name="action" value="select_tenant" class="btn btn-primary">Set Session Tenant</button>
             <button type="submit" name="action" value="edit_tenant" class="btn btn-secondary">Edit Tenant</button>
         </div>
-        <button type="submit" name="action" value="new_tenant" class="btn btn-secondary">New Tenant</button>
+        <button type="submit" name="action" value="create_tenant" class="btn btn-success">Register Tenant</button>
     </div>
 </form>
 
diff --git a/eveai_app/templates/user/tenant_projects.html b/eveai_app/templates/user/tenant_projects.html
index a583aee..37b6c23 100644
--- a/eveai_app/templates/user/tenant_projects.html
+++ b/eveai_app/templates/user/tenant_projects.html
@@ -9,12 +9,15 @@
 
 {% block content %}
 <div class="container">
-    <form method="POST" action="{{ url_for("user_bp.handle_tenant_project_selection") }}">
+    <form method="POST" action="{{ url_for('user_bp.handle_tenant_project_selection') }}" id="tenantProjectsForm">
         {{ render_selectable_table(headers=["Tenant Project ID", "Name", "API Clue", "Responsible", "Active"], rows=rows, selectable=True, id="catalogsTable") }}
-        <div class="form-group mt-3">
-            <button type="submit" name="action" value="edit_tenant_project" class="btn btn-primary">Edit Tenant Project</button>
-            <button type="submit" name="action" value="invalidate_tenant_project" class="btn btn-primary">Invalidate Tenant Project</button>
-            <button type="submit" name="action" value="delete_tenant_project" class="btn btn-danger">Delete Tenant Project</button>
+        <div class="form-group mt-3 d-flex justify-content-between">
+            <div>
+                <button type="submit" name="action" value="edit_tenant_project" class="btn btn-primary" onclick="return validateTableSelection('tenantProjectsForm')">Edit Tenant Project</button>
+                <button type="submit" name="action" value="invalidate_tenant_project" class="btn btn-primary" onclick="return validateTableSelection('tenantProjectsForm')">Invalidate Tenant Project</button>
+                <button type="submit" name="action" value="delete_tenant_project" class="btn btn-danger" onclick="return validateTableSelection('tenantProjectsForm')">Delete Tenant Project</button>
+            </div>
+            <button type="submit" name="action" value="create_tenant_project" class="btn btn-success">Register Project</button>
         </div>
     </form>
 </div>
diff --git a/eveai_app/templates/user/view_tenant_domains.html b/eveai_app/templates/user/view_tenant_domains.html
index 287ba32..2e2b2f4 100644
--- a/eveai_app/templates/user/view_tenant_domains.html
+++ b/eveai_app/templates/user/view_tenant_domains.html
@@ -7,10 +7,14 @@
 {% block content_description %}Select the domain you'd like to action upon{% endblock %}
 
 {% block content %}
-<form action="{{ url_for('user_bp.handle_tenant_domain_action') }}" method="POST">
+<form action="{{ url_for('user_bp.handle_tenant_domain_action') }}" method="POST" id="tenantDomainsForm">
     {{ render_selectable_table(headers=["ID", "Domain Name", "Valid To"], rows=rows, selectable=True, id="tenantDomainsTable") }}
-    <div class="form-group mt-3">
-        <button type="submit" name="action" value="edit_tenant_domain" class="btn btn-primary">Edit Selected Domain</button>
+    <div class="form-group mt-3 d-flex justify-content-between">
+        <div>
+            <button type="submit" name="action" value="edit_tenant_domain" class="btn btn-primary" onclick="return validateTableSelection('tenantDomainsForm')">Edit Selected Domain</button>
+        </div>
+        <button type="submit" name="action" value="create_tenant_domain" class="btn btn-success">Register Domain</button>
+
         <!-- Additional buttons can be added here for other actions -->
     </div>
 </form>
@@ -21,30 +25,4 @@
 {% endblock %}
 
 {% block scripts %}
-{#<script>#}
-{#$(document).ready(function() {#}
-{#    $('#tenantDomainsTable').DataTable({#}
-{#        'columnDefs': [#}
-{#            {#}
-{#                'targets': 0,#}
-{#                'searchable': false,#}
-{#                'orderable': false,#}
-{#                'className': 'dt-body-center',#}
-{#                'render': function (data, type, full, meta) {#}
-{#                    return '<input type="radio" name="user_id" value="' + $('<div/>').text(data).html() + '">';#}
-{#                }#}
-{#            },#}
-{#            {#}
-{#                'targets': 1,#}
-{#                'orderable': true,#}
-{#            },#}
-{#            {#}
-{#                'targets': 2,#}
-{#                'orderable': true,#}
-{#            },#}
-{#        ],#}
-{#        'order': [[1, 'asc']]#}
-{#    });#}
-{#});#}
-{#</script>#}
 {% endblock %}
\ No newline at end of file
diff --git a/eveai_app/templates/user/view_users.html b/eveai_app/templates/user/view_users.html
index 8e63af9..b32753a 100644
--- a/eveai_app/templates/user/view_users.html
+++ b/eveai_app/templates/user/view_users.html
@@ -7,13 +7,16 @@
 {% block content_description %}Select the user you'd like to action upon{% endblock %}
 
 {% block content %}
-<form action="{{ url_for('user_bp.handle_user_action') }}" method="POST">
+<form action="{{ url_for('user_bp.handle_user_action') }}" method="POST" id="usersForm">
     {{ render_selectable_table(headers=["User ID", "User Name", "Email"], rows=rows, selectable=True, id="usersTable") }}
-    <div class="form-group mt-3">
-        <button type="submit" name="action" value="edit_user" class="btn btn-primary">Edit Selected User</button>
-        <button type="submit" name="action" value="resend_confirmation_email" class="btn btn-secondary">Resend Confirmation Email</button>
-        <button type="submit" name="action" value="send_password_reset_email" class="btn btn-secondary">Send Password Reset Email</button>
-        <button type="submit" name="action" value="reset_uniquifier" class="btn btn-secondary">Reset Uniquifier</button>
+    <div class="form-group mt-3 d-flex justify-content-between">
+        <div>
+            <button type="submit" name="action" value="edit_user" class="btn btn-primary" onclick="return validateTableSelection('usersForm')">Edit User</button>
+            <button type="submit" name="action" value="resend_confirmation_email" class="btn btn-secondary" onclick="return validateTableSelection('usersForm')">Resend Confirmation</button>
+            <button type="submit" name="action" value="send_password_reset_email" class="btn btn-secondary" onclick="return validateTableSelection('usersForm')">Password Reset</button>
+            <button type="submit" name="action" value="reset_uniquifier" class="btn btn-secondary" onclick="return validateTableSelection('usersForm')">Reset Uniquifier</button>
+        </div>
+        <button type="submit" name="action" value="create_user" class="btn btn-success">Register User</button>
         <!-- Additional buttons can be added here for other actions -->
     </div>
 </form>
@@ -22,36 +25,3 @@
 {% block content_footer %}
     {{ render_pagination(pagination, 'user_bp.select_tenant') }}
 {% endblock %}
-
-{% block scripts %}
-{#<script>#}
-{#$(document).ready(function() {#}
-{#    $('#usersTable').DataTable({#}
-{#        'columnDefs': [#}
-{#            {#}
-{#                'targets': 0,#}
-{#                'searchable': false,#}
-{#                'orderable': false,#}
-{#                'className': 'dt-body-center',#}
-{#                'render': function (data, type, full, meta) {#}
-{#                    return '<input type="radio" name="user_id" value="' + $('<div/>').text(data).html() + '">';#}
-{#                }#}
-{#            },#}
-{#            {#}
-{#                'targets': 1,#}
-{#                'orderable': true,#}
-{#            },#}
-{#            {#}
-{#                'targets': 2,#}
-{#                'orderable': true,#}
-{#            },#}
-{#            {#}
-{#                'targets': 3,#}
-{#                'orderable': true,#}
-{#            }#}
-{#        ],#}
-{#        'order': [[1, 'asc']]#}
-{#    });#}
-{#});#}
-{#</script>#}
-{% endblock %}
\ No newline at end of file
diff --git a/eveai_app/views/document_views.py b/eveai_app/views/document_views.py
index bf15abb..ce676a1 100644
--- a/eveai_app/views/document_views.py
+++ b/eveai_app/views/document_views.py
@@ -101,9 +101,11 @@ def catalogs():
 @document_bp.route('/handle_catalog_selection', methods=['POST'])
 @roles_accepted('Super User', 'Tenant Admin')
 def handle_catalog_selection():
+    action = request.form['action']
+    if action == 'create_catalog':
+        return redirect(prefixed_url_for('document_bp.catalog'))
     catalog_identification = request.form.get('selected_row')
     catalog_id = ast.literal_eval(catalog_identification).get('value')
-    action = request.form['action']
     catalog = Catalog.query.get_or_404(catalog_id)
 
     if action == 'set_session_catalog':
@@ -248,9 +250,11 @@ def processors():
 @document_bp.route('/handle_processor_selection', methods=['POST'])
 @roles_accepted('Super User', 'Tenant Admin')
 def handle_processor_selection():
+    action = request.form['action']
+    if action == 'create_processor':
+        return redirect(prefixed_url_for('document_bp.processor'))
     processor_identification = request.form.get('selected_row')
     processor_id = ast.literal_eval(processor_identification).get('value')
-    action = request.form['action']
 
     if action == 'edit_processor':
         return redirect(prefixed_url_for('document_bp.edit_processor', processor_id=processor_id))
@@ -359,9 +363,11 @@ def retrievers():
 @document_bp.route('/handle_retriever_selection', methods=['POST'])
 @roles_accepted('Super User', 'Tenant Admin')
 def handle_retriever_selection():
+    action = request.form['action']
+    if action == 'create_retriever':
+        return redirect(prefixed_url_for('document_bp.retriever'))
     retriever_identification = request.form.get('selected_row')
     retriever_id = ast.literal_eval(retriever_identification).get('value')
-    action = request.form['action']
 
     if action == 'edit_retriever':
         return redirect(prefixed_url_for('document_bp.edit_retriever', retriever_id=retriever_id))
diff --git a/eveai_app/views/entitlements_views.py b/eveai_app/views/entitlements_views.py
index 397e655..b7fbc41 100644
--- a/eveai_app/views/entitlements_views.py
+++ b/eveai_app/views/entitlements_views.py
@@ -70,12 +70,14 @@ def view_license_tiers():
 @entitlements_bp.route('/handle_license_tier_selection', methods=['POST'])
 @roles_required('Super User')
 def handle_license_tier_selection():
+    action = request.form['action']
+    if action == 'create_license_tier':
+        return redirect(prefixed_url_for('entitlements_bp.license_tier'))
+
     license_tier_identification = request.form['selected_row']
     license_tier_id = ast.literal_eval(license_tier_identification).get('value')
     the_license_tier = LicenseTier.query.get(license_tier_id)
 
-    action = request.form['action']
-
     match action:
         case 'edit_license_tier':
             return redirect(prefixed_url_for('entitlements_bp.edit_license_tier',
diff --git a/eveai_app/views/interaction_views.py b/eveai_app/views/interaction_views.py
index 76089db..04726ca 100644
--- a/eveai_app/views/interaction_views.py
+++ b/eveai_app/views/interaction_views.py
@@ -294,9 +294,12 @@ def specialists():
 @interaction_bp.route('/handle_specialist_selection', methods=['POST'])
 @roles_accepted('Super User', 'Tenant Admin')
 def handle_specialist_selection():
+    action = request.form.get('action')
+    if action == 'create_specialist':
+        return redirect(prefixed_url_for('interaction_bp.specialist'))
+
     specialist_identification = request.form.get('selected_row')
     specialist_id = ast.literal_eval(specialist_identification).get('value')
-    action = request.form.get('action')
 
     if action == "edit_specialist":
         return redirect(prefixed_url_for('interaction_bp.edit_specialist', specialist_id=specialist_id))
diff --git a/eveai_app/views/user_views.py b/eveai_app/views/user_views.py
index f8aaa4d..ae8fd3f 100644
--- a/eveai_app/views/user_views.py
+++ b/eveai_app/views/user_views.py
@@ -219,6 +219,10 @@ def select_tenant():
 @user_bp.route('/handle_tenant_selection', methods=['POST'])
 @roles_required('Super User')
 def handle_tenant_selection():
+    action = request.form['action']
+    if action == 'create_tenant':
+        return redirect(prefixed_url_for('user_bp.tenant'))
+
     tenant_identification = request.form['selected_row']
     tenant_id = ast.literal_eval(tenant_identification).get('value')
     the_tenant = Tenant.query.get(tenant_id)
@@ -231,8 +235,6 @@ def handle_tenant_selection():
     session.pop('catalog_id', None)
     session.pop('catalog_name', None)
 
-    action = request.form['action']
-
     match action:
         case 'view_users':
             return redirect(prefixed_url_for('user_bp.view_users', tenant_id=tenant_id))
@@ -269,10 +271,13 @@ def view_users():
 @user_bp.route('/handle_user_action', methods=['POST'])
 @roles_accepted('Super User', 'Tenant Admin')
 def handle_user_action():
+    action = request.form['action']
+    if action == 'create_user':
+        return redirect(prefixed_url_for('user_bp.user'))
+
     user_identification = request.form['selected_row']
     user_id = ast.literal_eval(user_identification).get('value')
     user = User.query.get_or_404(user_id)
-    action = request.form['action']
 
     if action == 'edit_user':
         return redirect(prefixed_url_for('user_bp.edit_user', user_id=user_id))
@@ -311,9 +316,12 @@ def view_tenant_domains():
 @user_bp.route('/handle_tenant_domain_action', methods=['POST'])
 @roles_accepted('Super User', 'Tenant Admin')
 def handle_tenant_domain_action():
+    action = request.form['action']
+    if action == 'create_tenant_domain':
+        return redirect(prefixed_url_for('user_bp.tenant_domain'))
+
     tenant_domain_identification = request.form['selected_row']
     tenant_domain_id = ast.literal_eval(tenant_domain_identification).get('value')
-    action = request.form['action']
 
     if action == 'edit_tenant_domain':
         return redirect(prefixed_url_for('user_bp.edit_tenant_domain', tenant_domain_id=tenant_domain_id))
@@ -462,9 +470,11 @@ def tenant_projects():
 @user_bp.route('/handle_tenant_project_selection', methods=['POST'])
 @roles_accepted('Super User', 'Tenant Admin')
 def handle_tenant_project_selection():
+    action = request.form.get('action')
+    if action == 'create_tenant_project':
+        return redirect(prefixed_url_for('user_bp.tenant_project'))
     tenant_project_identification = request.form.get('selected_row')
     tenant_project_id = ast.literal_eval(tenant_project_identification).get('value')
-    action = request.form.get('action')
     tenant_project = TenantProject.query.get_or_404(tenant_project_id)
 
     if action == 'edit_tenant_project':
diff --git a/nginx/static/assets/css/eveai.css b/nginx/static/assets/css/eveai.css
index c1a29bf..314f1b7 100644
--- a/nginx/static/assets/css/eveai.css
+++ b/nginx/static/assets/css/eveai.css
@@ -228,6 +228,12 @@ input[type="radio"] {
     color: var(--bs-white) !important;
 }
 
+.btn-success {
+    background-color: var(--bs-warning) !important;
+    border-color: var(--bs-warning) !important;
+    color: var(--bs-white) !important;
+}
+
 /* Adjust the form group margin */
 .form-group {
     margin-top: 1.5rem; /* Adjust for better spacing */