diff --git a/app/javascript/elements/clipboard_copy.js b/app/javascript/elements/clipboard_copy.js
index d0b83a12..da7b9ec3 100644
--- a/app/javascript/elements/clipboard_copy.js
+++ b/app/javascript/elements/clipboard_copy.js
@@ -1,5 +1,7 @@
 export default class extends HTMLElement {
   connectedCallback () {
+    this.clearChecked()
+
     this.addEventListener('click', (e) => {
       e.stopPropagation()
 
@@ -7,7 +9,7 @@ export default class extends HTMLElement {
     })
   }
 
-  disconnectedCallback () {
+  clearChecked () {
     this.querySelectorAll('input').forEach((e) => {
       e.checked = false
     })
diff --git a/app/javascript/template_builder/area.vue b/app/javascript/template_builder/area.vue
index 6b1a543d..4e10d2f4 100644
--- a/app/javascript/template_builder/area.vue
+++ b/app/javascript/template_builder/area.vue
@@ -240,8 +240,8 @@ export default {
       this.save()
     },
     onResizeCell (e) {
-      if (e.toElement.id === 'mask') {
-        const positionX = e.layerX / (e.toElement.clientWidth - 1)
+      if (e.target.id === 'mask') {
+        const positionX = e.layerX / (e.target.clientWidth - 1)
 
         if (positionX > this.area.x) {
           this.area.cell_w = positionX - this.area.x
@@ -282,17 +282,17 @@ export default {
       this.$refs.name.blur()
     },
     resize (e) {
-      if (e.toElement.id === 'mask') {
-        this.area.w = e.layerX / e.toElement.clientWidth - this.area.x
-        this.area.h = e.layerY / e.toElement.clientHeight - this.area.y
+      if (e.target.id === 'mask') {
+        this.area.w = e.layerX / e.target.clientWidth - this.area.x
+        this.area.h = e.layerY / e.target.clientHeight - this.area.y
       }
     },
     drag (e) {
-      if (e.toElement.id === 'mask') {
+      if (e.target.id === 'mask') {
         this.isDragged = true
 
-        this.area.x = (e.layerX - this.dragFrom.x) / e.toElement.clientWidth
-        this.area.y = (e.layerY - this.dragFrom.y) / e.toElement.clientHeight
+        this.area.x = (e.layerX - this.dragFrom.x) / e.target.clientWidth
+        this.area.y = (e.layerY - this.dragFrom.y) / e.target.clientHeight
       }
     },
     startDrag (e) {
diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index 51bf35b3..38c4527d 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -431,8 +431,6 @@ export default {
           }
         }),
         headers: { 'Content-Type': 'application/json' }
-      }).then((resp) => {
-        console.log(resp)
       })
     }
   }
diff --git a/app/javascript/template_builder/field_submitter.vue b/app/javascript/template_builder/field_submitter.vue
index ac6e24e1..016e8b01 100644
--- a/app/javascript/template_builder/field_submitter.vue
+++ b/app/javascript/template_builder/field_submitter.vue
@@ -4,7 +4,7 @@
       v-if="compact"
       tabindex="0"
       :title="selectedSubmitter.name"
-      class="cursor-pointer text-base-100"
+      class="cursor-pointer text-base-100 flex h-full items-center justify-center"
     >
       <button
         class="mx-1 w-3 h-3 rounded-full"
diff --git a/app/views/submit_form/show.html.erb b/app/views/submit_form/show.html.erb
index 0b607238..e093761a 100644
--- a/app/views/submit_form/show.html.erb
+++ b/app/views/submit_form/show.html.erb
@@ -29,7 +29,7 @@
   <div class="mx-auto" style="max-width: 1000px">
     <div class="relative md:mx-32">
       <div class="shadow-md bg-base-100 absolute bottom-0 md:bottom-4 w-full border border-base-200 border p-4 rounded">
-        <submission-form data-submitter-uuid="<%= @submitter.uuid %>" data-submitter-slug="<%= @submitter.slug %>" data-can-send-email="<%= Accounts.can_send_emails?(OpenStruct.new(id: @submitter.submission.template.account_id)) %>" data-attachments="<%= attachments_index.values.select { |e| e.record_id == @submitter.id }.to_json(only: %i[uuid], methods: %i[url filename content_type]) %>" data-fields="<%= @submitter.submission.template.fields.select { |f| f['submitter_uuid'] == @submitter.uuid }.to_json %>" data-values="<%= @submitter.values.to_json %>" data-authenticity-token="<%= form_authenticity_token %>"></submission-form>
+        <submission-form data-submitter-uuid="<%= @submitter.uuid %>" data-submitter-slug="<%= @submitter.slug %>" data-can-send-email="<%= Accounts.can_send_emails?(Struct.new(:id).new(@submitter.submission.template.account_id)) %>" data-attachments="<%= attachments_index.values.select { |e| e.record_id == @submitter.id }.to_json(only: %i[uuid], methods: %i[url filename content_type]) %>" data-fields="<%= @submitter.submission.template.fields.select { |f| f['submitter_uuid'] == @submitter.uuid }.to_json %>" data-values="<%= @submitter.values.to_json %>" data-authenticity-token="<%= form_authenticity_token %>"></submission-form>
       </div>
     </div>
   </div>
diff --git a/app/views/templates/show.html.erb b/app/views/templates/show.html.erb
index 421a43f0..f3860cd5 100644
--- a/app/views/templates/show.html.erb
+++ b/app/views/templates/show.html.erb
@@ -3,7 +3,7 @@
     <%= @template.name %>
   </h1>
   <div class="flex md:justify-between space-x-2 flex-none">
-    <%= button_to button_title(title: 'Remove', icon: svg_icon('trash', class: 'w-6 h-6')), template_path(@template), class: 'btn btn-outline', method: :delete, data: { turbo_confirm: 'Are you sure?' } %>
+    <%= button_to button_title(title: 'Remove', disabled_with: 'Removing', icon: svg_icon('trash', class: 'w-6 h-6')), template_path(@template), class: 'btn btn-outline', method: :delete, data: { turbo_confirm: 'Are you sure?' } %>
     <%= link_to new_template_path(base_template_id: @template.id), class: 'btn btn-outline', data: { turbo_frame: :modal } do %>
       <%= svg_icon('copy', class: 'w-6 h-6') %>
       <span>Clone</span>
@@ -37,9 +37,10 @@
   <div class="space-y-4">
     <% @submissions.each do |submission| %>
       <a href="<%= submission_path(submission) %>" class="bg-base-200 w-full flex justify-between rounded-2xl px-6 py-5 items-center">
-        <% if submission.template.submitters.size == 1 %>
+        <% submitters = submission.template.submitters.filter_map { |item| submission.submitters.find { |e| e.uuid == item['uuid'] } } %>
+        <% if submitters.size == 1 %>
           <div>
-            <% submitter = submission.submitters.first %>
+            <% submitter = submitters.first %>
             <div class="flex items-center space-x-4">
               <span class="flex items-center space-x-2">
                 <%= svg_icon('user', class: 'w-6 h-6 stroke-2') %>
@@ -71,14 +72,13 @@
                 </button>
               </form>
             <% else %>
-              <%= render 'shared/clipboard_copy', text: submit_form_url(slug: submission.submitters.first.slug), class: 'btn btn-sm btn-neutral text-white w-36 flex', icon_class: 'w-6 h-6 text-white', copy_title: 'Copy Link' %>
+              <%= render 'shared/clipboard_copy', text: submit_form_url(slug: submitter.slug), class: 'btn btn-sm btn-neutral text-white w-36 flex', icon_class: 'w-6 h-6 text-white', copy_title: 'Copy Link' %>
             <% end %>
-            <%= button_to submitter.completed_at? ? 'Archive' : 'Remove', submission_path(submission), class: 'btn btn-outline btn-sm w-28', title: 'Delete', method: :delete, data: { turbo_confirm: 'Are you sure?' }, onclick: 'event.stopPropagation()' %>
+            <%= button_to button_title(title: submitter.completed_at? ? 'Archive' : 'Remove', disabled_with: 'Remov'), submission_path(submission), class: 'btn btn-outline btn-sm w-28', title: 'Delete', method: :delete, data: { turbo_confirm: 'Are you sure?' }, onclick: 'event.stopPropagation()' %>
           </div>
         <% else %>
           <div class="space-y-1 w-full mr-4">
-            <% submission.template.submitters.each_with_index do |item, index| %>
-              <% submitter = submission.submitters.find { |e| e.uuid == item['uuid'] } %>
+            <% submitters.each_with_index do |submitter, index| %>
               <div class="flex justify-between items-center">
                 <span class="flex items-center space-x-2 text-lg">
                   <%= render 'icons/user_number', class: 'w-6 h-6 stroke-2', number: index + 1 %>
@@ -86,7 +86,7 @@
                     <%= submitter.email %>
                   </span>
                 </span>
-                <% unless submission.submitters.all?(&:completed_at?) %>
+                <% unless submitters.all?(&:completed_at?) %>
                   <div class="flex items-center space-x-3">
                     <div class="tooltip flex" data-tip="<%= l(submitter.status_event_at.in_time_zone(current_account.timezone), format: :short, locale: current_account.locale) %>">
                       <span class="badge w-24 <%= status_badges[submitter.status] %> btn-xs uppercase text-xs font-medium border-1">
@@ -100,15 +100,16 @@
             <% end %>
           </div>
           <div class="flex space-x-2 items-center">
-            <% if submission.submitters.all?(&:completed_at?) %>
-              <div class="tooltip flex" data-tip="<%= l(submitter.status_event_at.in_time_zone(current_account.timezone), format: :short, locale: current_account.locale) %>">
-                <span class="badge <%= status_badges[submitter.status] %> w-32 badge-lg btn-sm uppercase text-sm font-medium border-1">
-                  <%= submitter.status %>
+            <% if submitters.all?(&:completed_at?) %>
+              <% latest_submitter = submitters.select(&:completed_at?).max_by(&:completed_at) %>
+              <div class="tooltip flex" data-tip="<%= l(latest_submitter.status_event_at.in_time_zone(current_account.timezone), format: :short, locale: current_account.locale) %>">
+                <span class="badge <%= status_badges[latest_submitter.status] %> w-32 badge-lg btn-sm uppercase text-sm font-medium border-1">
+                  <%= latest_submitter.status %>
                 </span>
               </div>
               <form onsubmit="event.preventDefault()">
                 <button onclick="event.stopPropagation()">
-                  <download-button data-src="<%= submitter_download_index_path(submission.submitters.select(&:completed_at?).max_by(&:completed_at).slug) %>" class="btn btn-sm btn-neutral text-white w-36">
+                  <download-button data-src="<%= submitter_download_index_path(latest_submitter.slug) %>" class="btn btn-sm btn-neutral text-white w-36">
                     <span class="flex items-center justify-center space-x-2" data-target="download-button.defaultButton">
                       <%= svg_icon('download', class: 'w-5 h-5 stroke-2') %>
                       <span>Download</span>
@@ -121,7 +122,7 @@
                 </button>
               </form>
             <% end %>
-            <%= button_to submitter.completed_at? ? 'Archive' : 'Remove', submission_path(submission), class: 'btn btn-outline btn-sm w-28', title: 'Delete', method: :delete, data: { turbo_confirm: 'Are you sure?' }, onclick: 'event.stopPropagation()' %>
+            <%= button_to button_title(title: submitters.all?(&:completed_at?) ? 'Archive' : 'Remove', disabled_with: 'Remov'), submission_path(submission), class: 'btn btn-outline btn-sm w-28', title: 'Delete', method: :delete, data: { turbo_confirm: 'Are you sure?' }, onclick: 'event.stopPropagation()' %>
           </div>
         <% end %>
       </a>