diff --git a/app/views/api_settings/index.html.erb b/app/views/api_settings/index.html.erb
index e91bbe47..454db03b 100644
--- a/app/views/api_settings/index.html.erb
+++ b/app/views/api_settings/index.html.erb
@@ -8,10 +8,12 @@
     <div class="card bg-base-200">
       <div class="card-body p-6">
         <label for="api_key" class="text-sm font-semibold">X-Auth-Token</label>
-        <div class="flex flex-row space-x-4">
-          <input id="api_key" type="text" value="<%= current_user.access_token.token %>" class="input font-mono input-bordered w-full" autocomplete="off" readonly>
-          <%= render 'shared/clipboard_copy', icon: 'copy', text: current_user.access_token.token, class: 'base-button', icon_class: 'w-6 h-6 text-white', copy_title: 'Copy', copied_title: 'Copied' %>
-          <%= button_to button_title(title: 'Rotate', disabled_with: 'Rotate', icon: svg_icon('reload', class: 'w-6 h-6')), settings_api_index_path, class: 'white-button', data: { turbo_confirm: 'Remove existing API token and generated a new one. Are you sure?' } %>
+        <div class="flex flex-col md:flex-row gap-4">
+          <div class="flex w-full space-x-4">
+            <input id="api_key" type="text" value="<%= current_user.access_token.token %>" class="input font-mono input-bordered w-full" autocomplete="off" readonly>
+            <%= render 'shared/clipboard_copy', icon: 'copy', text: current_user.access_token.token, class: 'base-button', icon_class: 'w-6 h-6 text-white', copy_title: 'Copy', copied_title: 'Copied' %>
+          </div>
+          <%= button_to button_title(title: 'Rotate', disabled_with: 'Rotate', icon: svg_icon('reload', class: 'w-6 h-6')), settings_api_index_path, class: 'white-button w-full', data: { turbo_confirm: 'Remove existing API token and generated a new one. Are you sure?' } %>
         </div>
       </div>
     </div>
diff --git a/app/views/mfa_setup/_form.html.erb b/app/views/mfa_setup/_form.html.erb
index 5b59d451..a010eb7d 100644
--- a/app/views/mfa_setup/_form.html.erb
+++ b/app/views/mfa_setup/_form.html.erb
@@ -3,7 +3,7 @@
     Use an authenticator mobile app like Google Authenticator or 1Password to scan the QR code below.
   </p>
   <div>
-    <%== RQRCode::QRCode.new(@provision_url).as_svg(viewbox: true, svg_attributes: { class: 'w-80 h-80 my-4 mx-auto' }) %>
+    <%== RQRCode::QRCode.new(@provision_url).as_svg(viewbox: true, svg_attributes: { class: 'md:w-80 md:h-80 my-4 mx-auto' }) %>
   </div>
   <div class="form-control my-6 space-y-2">
     <%= f.text_field :otp_attempt, required: true, placeholder: 'XXX-XXX', class: 'base-input text-center' %>
diff --git a/app/views/notifications_settings/_reminder_form.html.erb b/app/views/notifications_settings/_reminder_form.html.erb
index 5c4254c3..9e0d7f9c 100644
--- a/app/views/notifications_settings/_reminder_form.html.erb
+++ b/app/views/notifications_settings/_reminder_form.html.erb
@@ -2,7 +2,7 @@
   <%= f.hidden_field :key %>
   <div class="form-control">
     <% record = Struct.new(:first_duration, :second_duration, :third_duration).new(*(f.object.value || {}).values_at('first_duration', 'second_duration', 'third_duration')) %>
-    <div class="flex space-x-4">
+    <div class="flex flex-col md:flex-row gap-4">
       <div class="w-full">
         <%= f.fields_for :value, record  do |ff| %>
           <%= ff.label :first_duration, 'First reminder in', class: 'label' %>
diff --git a/app/views/shared/_test_alert.html.erb b/app/views/shared/_test_alert.html.erb
index 13e9876c..39bbae6e 100644
--- a/app/views/shared/_test_alert.html.erb
+++ b/app/views/shared/_test_alert.html.erb
@@ -1,5 +1,5 @@
 <% if signed_in? && current_user != true_user && current_account.testing? %>
-  <div class="alert py-1 text-sm font-medium gap-x-2">
+  <div class="alert py-1 text-sm font-medium gap-x-2 flex whitespace-nowrap">
     <a href="<%= testing_api_settings_path %>" data-turbo-frame="modal" class="link font-semibold flex">
       <%= svg_icon('code_circle', class: 'w-5 h-5 mr-1') %>Testing Environment
     </a>
diff --git a/app/views/submissions/new.html.erb b/app/views/submissions/new.html.erb
index 4ca3e53a..2dd600a5 100644
--- a/app/views/submissions/new.html.erb
+++ b/app/views/submissions/new.html.erb
@@ -3,9 +3,9 @@
   <toggle-visible data-element-ids="<%= options.map(&:last).to_json %>" class="relative text-center mt-4 block">
     <div class="join">
       <% options.each_with_index do |(label, value), index| %>
-        <span>
+        <span class="<%= '!rounded-s-full' if index.zero? %> btn btn-focus btn-sm join-item md:w-28 normal-case">
           <%= radio_button_tag 'option', value, value == 'email', class: 'peer hidden', data: { action: 'change:toggle-visible#trigger' } %>
-          <label for="option_<%= value %>" class="<%= '!rounded-s-full' if index.zero? %> btn btn-focus btn-sm join-item w-28 peer-checked:btn-active normal-case">
+          <label for="option_<%= value %>" class="peer-checked:btn-active">
             <%= label %>
           </label>
         </span>
diff --git a/app/views/templates/new.html.erb b/app/views/templates/new.html.erb
index 32188d5b..0187f2d2 100644
--- a/app/views/templates/new.html.erb
+++ b/app/views/templates/new.html.erb
@@ -11,8 +11,8 @@
         <%= svg_icon('folder', class: 'w-6 h-6') %>
       </a>
       <folder-autocomplete class="flex justify-between w-full">
-        <input id="folder_name" placeholder="Folder Name" type="text" class="w-64 outline-none border-transparent focus:border-transparent focus:ring-0 bg-base-100 px-1 peer" name="folder_name" value="<%= params[:folder_name].presence || @base_template&.folder&.name || TemplateFolder::DEFAULT_NAME %>" onblur="window.folder_name.value = window.folder_name.value || 'Default'" autocomplete="off">
-        <a href="#" onclick="[event.preventDefault(), window.folder_name.value = '', window.folder_name.focus()]" class="link peer-focus:hidden mr-1.5">
+        <input id="folder_name" placeholder="Folder Name" type="text" class="w-full outline-none border-transparent focus:border-transparent focus:ring-0 bg-base-100 px-1 peer" name="folder_name" value="<%= params[:folder_name].presence || @base_template&.folder&.name || TemplateFolder::DEFAULT_NAME %>" onblur="window.folder_name.value = window.folder_name.value || 'Default'" autocomplete="off">
+        <a href="#" onclick="[event.preventDefault(), window.folder_name.value = '', window.folder_name.focus()]" class="shrink-0	link peer-focus:hidden mr-1.5">
           Change Folder
         </a>
       </folder-autocomplete>
diff --git a/app/views/user_signatures/edit.html.erb b/app/views/user_signatures/edit.html.erb
index f04a77f5..ae8a0bc2 100644
--- a/app/views/user_signatures/edit.html.erb
+++ b/app/views/user_signatures/edit.html.erb
@@ -3,9 +3,9 @@
   <toggle-visible data-element-ids="<%= options.map(&:last).to_json %>" class="relative text-center mt-4 block">
     <div class="join">
       <% options.each_with_index do |(label, value), index| %>
-        <span>
+        <span class="<%= '!rounded-s-full' if index.zero? %> btn btn-focus btn-sm join-item md:w-28 normal-case">
           <%= radio_button_tag 'option', value, value == 'draw', class: 'peer hidden', data: { action: 'change:toggle-visible#trigger' } %>
-          <label for="option_<%= value %>" class="<%= '!rounded-s-full' if index.zero? %> btn btn-focus btn-sm join-item w-28 peer-checked:btn-active normal-case">
+          <label for="option_<%= value %>" class="peer-checked:btn-active">
             <%= label %>
           </label>
         </span>