diff --git a/app/views/templates/show.html.erb b/app/views/templates/show.html.erb
index 1adefed3..1cc8dd7f 100644
--- a/app/views/templates/show.html.erb
+++ b/app/views/templates/show.html.erb
@@ -15,7 +15,7 @@
           <%= render 'shared/clipboard_copy', text: start_form_url(slug: @template.slug), class: 'base-button', icon_class: 'w-6 h-6 text-white', copy_title: 'Copy Share Link', copied_title: 'Copied to Clipboard', copy_title_md: 'Copy', copied_title_md: 'Copied' %>
         </span>
       <% end %>
-      <% if (!@pagy.count.zero? || params[:q].present?) && !@template.deleted_at? && can?(:create, Submission) %>
+      <% if !@template.deleted_at? && can?(:create, Submission) %>
         <%= link_to new_template_submission_path(@template), class: 'order-1 btn btn-primary text-base', data: { turbo_frame: 'modal' } do %>
           <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
           <span>Add <span class="hidden md:inline">Recipients</span></span>
@@ -48,8 +48,8 @@
       <div class="max-w-lg mx-auto">
         <p class="text-3xl font-bold text-base-content mb-4">There are no Submissions</p>
         <% if @template.deleted_at.blank? && params[:q].blank? %>
-          <p class="text-gray-600">Send an invitation to fill and complete the form</p>
-          <div class="space-x-2">
+          <p>Send an invitation to fill and complete the form</p>
+          <div class="space-y-2 flex flex-col">
             <% if can?(:create, Submission) %>
               <%= link_to new_template_submission_path(@template), class: 'base-button mt-6', data: { turbo_frame: 'modal' } do %>
                 <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
@@ -58,7 +58,7 @@
             <% end %>
             <%= link_to start_form_url(slug: @template.slug), class: 'white-button mt-6', target: '_blank', rel: 'noopener' do %>
               <%= svg_icon('writing', class: 'w-6 h-6') %>
-              <span class="mr-1">Submit it Yourself</span>
+              <span class="mr-1">Sign it Yourself</span>
             <% end %>
           <% end %>
         </div>
diff --git a/spec/system/template_spec.rb b/spec/system/template_spec.rb
index dd092a43..5f41b691 100644
--- a/spec/system/template_spec.rb
+++ b/spec/system/template_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe 'Template' do
       expect(page).to have_content('There are no Submissions')
       expect(page).to have_content('Send an invitation to fill and complete the form')
       expect(page).to have_link('Add Recipients', href: new_template_submission_path(template))
-      expect(page).to have_link('Submit it Yourself')
+      expect(page).to have_link('Sign it Yourself')
     end
   end