diff --git a/app/controllers/concerns/iframe_authentication.rb b/app/controllers/concerns/iframe_authentication.rb
index 0683b361..ea767ec1 100644
--- a/app/controllers/concerns/iframe_authentication.rb
+++ b/app/controllers/concerns/iframe_authentication.rb
@@ -31,7 +31,9 @@ module IframeAuthentication
       return
     end
 
-    Rails.logger.error "#{self.class.name}: Authentication failed"
+    Rails.logger.error "#{self.class.name}: Authentication failed - no token found. " \
+                       "Params: #{params.keys}, Session has token: #{session[:auth_token].present?}, " \
+                       "Referer: #{request.referer}"
     render json: { error: 'Authentication required' }, status: :unauthorized
   end
 end
diff --git a/app/javascript/elements/scroll_buttons.js b/app/javascript/elements/scroll_buttons.js
index 6525adf9..567829f7 100644
--- a/app/javascript/elements/scroll_buttons.js
+++ b/app/javascript/elements/scroll_buttons.js
@@ -36,6 +36,7 @@ export default class extends HTMLElement {
   }
 
   isHeaderNotVisible () {
+    if (!this.header) return true
     const rect = this.header.getBoundingClientRect()
     return rect.bottom <= 0 || rect.top >= window.innerHeight
   }
diff --git a/app/javascript/submission_form/completed.vue b/app/javascript/submission_form/completed.vue
index 43228f63..c33fd570 100644
--- a/app/javascript/submission_form/completed.vue
+++ b/app/javascript/submission_form/completed.vue
@@ -33,36 +33,6 @@
           {{ completedButton.title || 'Back to Website' }}
         </span>
       </a>
-      <button
-        v-if="canSendEmail && !isDemo && withSendCopyButton"
-        class="white-button !h-auto flex items-center space-x-1 w-full completed-form-send-copy-button"
-        :disabled="isSendingCopy"
-        @click.prevent="sendCopyToEmail"
-      >
-        <IconInnerShadowTop
-          v-if="isSendingCopy"
-          class="animate-spin"
-        />
-        <IconMail v-else />
-        <span>
-          {{ t('send_copy_via_email') }}
-        </span>
-      </button>
-      <button
-        v-if="!isWebView && withDownloadButton"
-        class="base-button flex items-center space-x-1 w-full completed-form-download-button"
-        :disabled="isDownloading"
-        @click.prevent="download"
-      >
-        <IconInnerShadowTop
-          v-if="isDownloading"
-          class="animate-spin"
-        />
-        <IconDownload v-else />
-        <span>
-          {{ t('download') }}
-        </span>
-      </button>
       <a
         v-if="isDemo"
         target="_blank"
@@ -85,17 +55,6 @@
         </span>
       </a>
     </div>
-    <div
-      v-if="attribution"
-      class="text-center mt-4"
-    >
-      {{ t('powered_by') }}
-      <a
-        href="https://www.docuseal.com/start"
-        target="_blank"
-        class="underline"
-      >DocuSeal</a> - {{ t('open_source_documents_software') }}
-    </div>
   </div>
 </template>
 
diff --git a/app/views/submissions/show.html.erb b/app/views/submissions/show.html.erb
index 122521b6..308dc3c2 100644
--- a/app/views/submissions/show.html.erb
+++ b/app/views/submissions/show.html.erb
@@ -4,10 +4,7 @@
 <% with_signature_id, is_combined_enabled = AccountConfig.where(account_id: @submission.account_id, key: [AccountConfig::COMBINE_PDF_RESULT_KEY, AccountConfig::WITH_SIGNATURE_ID], value: true).then { |configs| [configs.any? { |e| e.key == AccountConfig::WITH_SIGNATURE_ID }, configs.any? { |e| e.key == AccountConfig::COMBINE_PDF_RESULT_KEY }] } %>
 <div style="max-width: 1600px" class="mx-auto pl-4">
   <div class="flex justify-between py-1.5 items-center pr-4 sticky top-0 md:relative z-10 bg-base-100">
-    <a href="<%= signed_in? && @submission.account_id == current_account&.id && @submission.template ? template_path(@submission.template) : '/' %>" class="flex items-center space-x-3 py-1">
-      <span><%= render 'submissions/logo' %></span>
-      <span class="text-xl md:text-3xl font-semibold focus:text-clip" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;"><% (@submission.name || @submission.template.name).split(/(_)/).each do |item| %><%= item %><wbr><% end %></span>
-    </a>
+    <div></div>
     <div class="space-x-3 flex items-center">
       <% last_submitter = @submission.submitters.to_a.select(&:completed_at?).max_by(&:completed_at) %>
       <% is_all_completed = @submission.submitters.to_a.all?(&:completed_at?) %>
@@ -230,11 +227,6 @@
                 </a>
               </div>
             <% end %>
-            <% if signed_in? && submitter && submitter.completed_at? && submitter.email == current_user.email && submitter.completed_at > 1.month.ago && can?(:update, @submission) %>
-              <div class="mt-2 mb-1">
-                <%= button_to t('resubmit'), submitters_resubmit_path(submitter), method: :put, class: 'btn btn-sm btn-primary w-full', form: { target: '_blank' }, data: { turbo: false } %>
-              </div>
-            <% end %>
             <% if signed_in? && submitter && submitter.completed_at? && !submitter.declined_at? && !submitter.changes_requested_at? && current_user == @submission.template.author %>
               <div class="mt-2 mb-1">
                 <%= link_to 'Request Changes', request_changes_submitter_path(submitter.slug),
diff --git a/app/views/submit_form/_docuseal_logo.html.erb b/app/views/submit_form/_docuseal_logo.html.erb
index 3f3ac923..e69de29b 100644
--- a/app/views/submit_form/_docuseal_logo.html.erb
+++ b/app/views/submit_form/_docuseal_logo.html.erb
@@ -1,3 +0,0 @@
-<a href="<%= root_path %>" class="mx-auto text-2xl md:text-3xl font-bold items-center flex space-x-3">
-  <span><%= Docuseal.product_name %></span>
-</a>
diff --git a/app/views/submit_form/completed.html.erb b/app/views/submit_form/completed.html.erb
index 8fde2c79..be5ee7cf 100644
--- a/app/views/submit_form/completed.html.erb
+++ b/app/views/submit_form/completed.html.erb
@@ -16,36 +16,6 @@
       </div>
     </div>
     <div>
-      <% if (Docuseal.multitenant? || Accounts.can_send_emails?(@submitter.account)) && @submitter.email.present? %>
-        <toggle-submit>
-          <%= button_to button_title(title: t('send_copy_to_email'), disabled_with: t('sending'), icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, class: 'white-button w-full' %>
-        </toggle-submit>
-        <% if Templates.filter_undefined_submitters(@submitter.submission.template_submitters).size != 1 %>
-          <div class="divider uppercase"><%= t('or') %></div>
-        <% else %>
-          <div class="py-2"></div>
-        <% end %>
-      <% end %>
-      <% if @submitter.completed_at > 30.minutes.ago || (current_user && current_user.account.submitters.exists?(id: @submitter.id)) %>
-        <download-button data-src="<%= submitter_download_index_path(@submitter.slug) %>" class="base-button w-full">
-          <span class="flex items-center justify-center space-x-2" data-target="download-button.defaultButton">
-            <%= svg_icon('download', class: 'w-6 h-6') %>
-            <span><%= t('download_documents') %></span>
-          </span>
-          <span class="flex items-center justify-center space-x-2 hidden" data-target="download-button.loadingButton">
-            <%= svg_icon('loader', class: 'w-6 h-6 animate-spin') %>
-            <span><%= t('downloading') %></span>
-          </span>
-        </download-button>
-      <% end %>
     </div>
-    <% undefined_submitters = Templates.filter_undefined_submitters(@submitter.submission.template_submitters) %>
-    <% if undefined_submitters.size == 1 && undefined_submitters.first['uuid'] == @submitter.uuid && %w[api embed].exclude?(@submitter.submission.source) && @submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false && @submitter.template && !@submitter.template.archived_at? %>
-      <div class="divider uppercase"><%= t('or') %></div>
-      <toggle-submit class="block">
-        <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), resubmit_form_path, params: { resubmit: @submitter.slug }, method: :put, class: 'white-button w-full' %>
-      </toggle-submit>
-    <% end %>
   </div>
 </div>
-<%= render 'shared/attribution', link_path: '/start', account: @submitter.account %>
diff --git a/app/views/submit_form/show.html.erb b/app/views/submit_form/show.html.erb
index 8ec61a66..c9e7d340 100644
--- a/app/views/submit_form/show.html.erb
+++ b/app/views/submit_form/show.html.erb
@@ -14,44 +14,7 @@
       <%# flex block w-full sticky top-0 z-50 space-x-2 items-center bg-yellow-100 p-2 border-y border-yellow-200 transition-transform duration-300 %>
       <%= local_assigns[:banner_html] || capture do %>
         <%= render('submit_form/banner') %>
-        <div id="signing_form_header" class="sticky min-[1230px]:static top-0 z-50 bg-base-100 py-2 px-2 flex items-center md:-mx-[8px]" style="margin-bottom: -16px">
-          <div class="text-xl md:text-2xl font-medium focus:text-clip" style="width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
-            <%= @submitter.submission.name || @submitter.submission.template.name %>
-          </div>
-          <div class="flex items-center space-x-2" style="margin-left: 20px; flex-shrink: 0">
-            <% if @form_configs[:with_decline] %>
-              <% decline_modal_checkbox_uuid = SecureRandom.uuid %>
-              <div>
-                <%= render 'shared/html_modal', title: t(:decline), btn_text: t(:decline), btn_class: 'btn btn-sm !px-5', button_id: 'decline_button', uuid: decline_modal_checkbox_uuid do %>
-                  <%= render 'submit_form/decline_form', submitter: @submitter %>
-                <% end %>
-              </div>
-            <% end %>
-            <% if @form_configs[:with_partial_download] %>
-              <download-button data-src="<%= submit_form_download_index_path(@submitter.slug) %>" class="btn btn-neutral text-white btn-sm !px-4">
-                <span class="flex items-center justify-center" data-target="download-button.defaultButton">
-                  <%= svg_icon('download', class: 'w-6 h-6 inline md:hidden') %>
-                  <span class="hidden md:inline"><%= t('download') %></span>
-                </span>
-                <span class="flex items-center justify-center space-x-2 hidden" data-target="download-button.loadingButton">
-                  <%= svg_icon('loader', class: 'w-6 h-6 animate-spin') %>
-                  <span class="hidden md:inline"><%= t('downloading') %></span>
-                </span>
-              </download-button>
-            <% end %>
-          </div>
-        </div>
         <scroll-buttons class="fixed right-5 top-2 hidden md:flex gap-1 z-50 ease-in-out opacity-0 -translate-y-10">
-          <% if @form_configs[:with_decline] %>
-            <label id="decline_button" for="<%= decline_modal_checkbox_uuid %>" class="btn btn-sm px-0">
-              <span class="min-[1366px]:inline hidden px-3">
-                <%= t(:decline) %>
-              </span>
-              <span class="inline min-[1366px]:hidden px-2">
-                <%= svg_icon('x', class: 'w-5 h-5') %>
-              </span>
-            </label>
-          <% end %>
           <download-button data-src="<%= submit_form_download_index_path(@submitter.slug) %>" class="btn btn-neutral text-white btn-sm px-2">
             <span data-target="download-button.defaultButton">
               <%= svg_icon('download', class: 'w-5 h-5') %>
diff --git a/app/views/templates_form_preview/show.html.erb b/app/views/templates_form_preview/show.html.erb
index 59a9bc1e..4fb55ada 100644
--- a/app/views/templates_form_preview/show.html.erb
+++ b/app/views/templates_form_preview/show.html.erb
@@ -1,11 +1,11 @@
 <% banner_html = capture do %>
-  <div class="sticky top-0 z-50 bg-base-100 py-2 px-2 flex items-center" style="margin: 0px -8px -16px -8px">
-    <div class="text-xl md:text-3xl font-semibold focus:text-clip" style="width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
-      <%= @template.name %>
-    </div>
-    <div class="flex items-center" style="margin-left: 20px; flex-shrink: 0">
+  <div class="sticky top-0 z-50 bg-base-100 py-2 px-2 flex items-center justify-end" style="margin: 0px -8px -16px -8px">
+    <div class="flex items-center" style="flex-shrink: 0">
       <% if @template.submitters.size > 1 %>
-          <form action="<%= template_form_path(@template, auth_token: params[:auth_token] || session[:auth_token]) %>" method="get" class="mr-3">
+          <form action="<%= template_form_path(@template) %>" method="get" class="mr-3">
+          <% if (auth_token = params[:auth_token] || session[:auth_token]) %>
+            <%= hidden_field_tag :auth_token, auth_token %>
+          <% end %>
           <select onchange="this.form.submit()" name="uuid" class="select base-input text-center font-normal" style="width: 180px; flex-shrink: 0;">
             <% @template.submitters.each do |submitter| %>
               <%= tag.option(value: submitter['uuid'], selected: submitter['uuid'] == @submitter.uuid) do %>
@@ -15,7 +15,7 @@
           </select>
         </form>
       <% end %>
-      <a href="<%= edit_template_path(@template, auth_token: params[:auth_token] || session[:auth_token]) %>" class="base-button" data-turbo="false" style="flex-shrink: 0; padding: 0px 24px;">
+      <a href="<%= edit_template_path(@template, params[:auth_token] || session[:auth_token] ? { auth_token: params[:auth_token] || session[:auth_token] } : {}) %>" class="base-button" data-turbo="false" style="flex-shrink: 0; padding: 0px 24px;">
         <%= t('exit_preview') %>
       </a>
     </div>