diff --git a/src/templates/create_or_edit.html b/src/templates/create_or_edit.html
index b6a023f..e7157e6 100644
--- a/src/templates/create_or_edit.html
+++ b/src/templates/create_or_edit.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
+{% include "loader.html" %}
 <form hx-boost="true" hx-indicator="#loading" hx-push-url="true" hx-encoding="multipart/form-data" method="post" enctype="multipart/form-data">
     <input type="hidden" id="sort_by" name="sort_by" value="{{ sort_by }}">
     <input type="hidden" id="sort_order" name="sort_order" value="{{ sort_order }}">
@@ -38,7 +39,7 @@
                 "entities_per_page" : "{{ entities_per_page }}",
                 "search" : "{{ search }}",
                 "sort_by" : "{{ sort_by }}",
-                "sort_order" : "{{ sort_order }}"
+                "sort_order" : "{{ sort_order }}",
                 "page" : "{{ page }}"
                 }' hx-boost="true" hx-push-url="true" hx-indicator="#loading"
                 class="button is-link is-light" href="{{ base_path }}/list">
diff --git a/src/templates/list.html b/src/templates/list.html
index 83e2928..691e429 100644
--- a/src/templates/list.html
+++ b/src/templates/list.html
@@ -6,12 +6,12 @@
 <div class="columns">
     <div class="column">
         <div class="buttons">
-            <a class="button is-primary" href="create" hx-boost="true" hx-indicator="#loading">Create</a>
+            <a class="button is-primary" href="/admin/{{ entity_name }}/create" hx-boost="true" hx-indicator="#loading"><i class="fa-solid fa-circle-plus"></i></a>
 
             <div class="dropdown is-hoverable">
                 <div class="dropdown-trigger">
                     <button class="button" aria-haspopup="true" aria-controls="dropdown-menu4">
-                        <span>With selected</span>
+                        <span><i class="fa-solid fa-list"></i></span>
                         <span class="icon is-small">
                             <i class="fas fa-angle-down" aria-hidden="true"></i>
                         </span>
@@ -142,7 +142,7 @@
             <tr>
                 <td><input type="checkbox" name="ids" value="{{ entity.primary_key }}"></td>
                 <td>
-                    <a href="show/{{ entity.primary_key }}" hx-vals='{ 
+                    <a href="/admin/{{ entity_name }}/show/{{ entity.primary_key }}" hx-vals='{ 
                                 "page" : "{{ page }}",
                                 "entities_per_page" : "{{ entities_per_page }}",
                                 "search" : "{{ search }}",
@@ -165,7 +165,7 @@
                 {% endif %}
                 {%- endfor %}
                 <td>
-                    <a hx-target="body" href="edit/{{ entity.primary_key }}" hx-vals='{ 
+                    <a hx-target="body" href="/admin/{{ entity_name }}/edit/{{ entity.primary_key }}" hx-vals='{ 
                                 "page" : "{{ page }}",
                                 "entities_per_page" : "{{ entities_per_page }}",
                                 "search" : "{{ search }}",
diff --git a/src/templates/show.html b/src/templates/show.html
index d30e2d8..1845c78 100644
--- a/src/templates/show.html
+++ b/src/templates/show.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
+{% include "loader.html" %}
 {% for model_field in view_model.fields -%}
 <div class="columns">
     <div class="column">
@@ -26,7 +27,7 @@
                     "entities_per_page" : "{{ entities_per_page }}",
                     "search" : "{{ search }}",
                     "sort_by" : "{{ sort_by }}",
-                    "sort_order" : "{{ sort_order }}"
+                    "sort_order" : "{{ sort_order }}",
                     "page" : "{{ page }}"
                     }' hx-boost="true" hx-push-url="true" hx-indicator="#loading"
                     class="button is-link is-light" href="{{ base_path }}/list">Back</a>