diff --git a/src/lib/components/paginationInline.svelte b/src/lib/components/paginationInline.svelte
index 6c1c861e5..3e718cf0a 100644
--- a/src/lib/components/paginationInline.svelte
+++ b/src/lib/components/paginationInline.svelte
@@ -1,32 +1,36 @@
-{#if totalPages > 1}
-
+{#if !hidePages}
+
+{:else}
+
handleButtonPage('prev')}
- disabled={currentPage <= 1}>
+ on:click={prev}
+ disabled={currentPage <= 1 || totalPages <= 1}>
Prev
- {#if !hidePages}
-
- {/if}
+
handleButtonPage('next')}
- disabled={currentPage === totalPages}>
+ on:click={next}
+ disabled={currentPage === totalPages || totalPages <= 1}>
Next
-{:else}
-
{/if}
diff --git a/src/lib/components/paginator.svelte b/src/lib/components/paginator.svelte
index ef951d58e..7b5c6cb50 100644
--- a/src/lib/components/paginator.svelte
+++ b/src/lib/components/paginator.svelte
@@ -1,15 +1,22 @@
@@ -17,12 +24,15 @@
{#if !hideFooter}
-
- Total results: {total}
-
-
+ {#if hasLimit}
+
+ {:else}
+
+ Total results: {total}
+
+ {/if}
+
+
{/if}
diff --git a/src/routes/(console)/project-[project]/sites/create-site/templates/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/templates/+page.svelte
index 21ca6638e..f52d138c0 100644
--- a/src/routes/(console)/project-[project]/sites/create-site/templates/+page.svelte
+++ b/src/routes/(console)/project-[project]/sites/create-site/templates/+page.svelte
@@ -1,6 +1,6 @@