diff --git a/templates/configurators/addbox.com.hamlet b/templates/configurators/addbox.com.hamlet
index ce85eda2e1..ee1bdb66a1 100644
--- a/templates/configurators/addbox.com.hamlet
+++ b/templates/configurators/addbox.com.hamlet
@@ -14,7 +14,7 @@
           ^{form}
           ^{webAppFormAuthToken}
           <div .form-group>
-            <div .col-sm-offset-2>
+            <div .col-sm-10 .col-sm-offset-2>
               <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
                 Add repository
 <div .modal .fade #workingmodal>
diff --git a/templates/configurators/adddrive.hamlet b/templates/configurators/adddrive.hamlet
index 06296889d2..35c4bdd750 100644
--- a/templates/configurators/adddrive.hamlet
+++ b/templates/configurators/adddrive.hamlet
@@ -8,27 +8,28 @@
       content will be synced with the content of this repository.
     <p>
     $if (null writabledrives)
-      <div .col-sm-6 .alert .alert-danger .alert-block>
-        $if (null removabledrives)
-          <h4 .alert-heading>
-            No removable drives found
-          Please make sure you have a removable drive plugged in and mounted.
-        $else
-          <h4 .alert-heading>
-            No usable removable drives found
-          Seems you cannot write to any of the removable drives that are #
-          currently mounted. Try plugging in a removable drive that you can #
-          write to, or correcting the write permissions.
-        <p>
-          <a .btn .btn-primary href="@{AddDriveR}">
-            Rescan for removable drives
+      <div .row>
+        <div .col-sm-6 .col-sm-offset-2 .alert .alert-danger .alert-block>
+          $if (null removabledrives)
+            <h4 .alert-heading>
+              No removable drives found
+            Please make sure you have a removable drive plugged in and mounted.
+          $else
+            <h4 .alert-heading>
+              No usable removable drives found
+            Seems you cannot write to any of the removable drives that are #
+            currently mounted. Try plugging in a removable drive that you can #
+            write to, or correcting the write permissions.
+          <p>
+            <a .btn .btn-primary href="@{AddDriveR}">
+              Rescan for removable drives
     $else
       <form method="post" enctype=#{enctype} .form-horizontal>
         <fieldset>
           ^{form}
           ^{webAppFormAuthToken}
           <div .form-group>
-            <div .col-sm-offset-2>
+            <div .col-sm-10 .col-sm-offset-2>
               <button .btn .btn-primary type=submit>Use this drive</button> #
               <a .btn .btn-default href="@{AddDriveR}">
                 Rescan for removable drives
diff --git a/templates/configurators/addglacier.hamlet b/templates/configurators/addglacier.hamlet
index 454229c371..32e5d5b8a1 100644
--- a/templates/configurators/addglacier.hamlet
+++ b/templates/configurators/addglacier.hamlet
@@ -24,7 +24,7 @@
           ^{form}
           ^{webAppFormAuthToken}
           <div .form-group>
-            <div .col-sm-offset-2>
+            <div .col-sm-10 .col-sm-offset-2>
               <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
                 Add Glacier repository
 <div .modal .fade #workingmodal>
diff --git a/templates/configurators/addia.hamlet b/templates/configurators/addia.hamlet
index 03fa3b1b1e..4a9ca1c01b 100644
--- a/templates/configurators/addia.hamlet
+++ b/templates/configurators/addia.hamlet
@@ -22,7 +22,7 @@
           ^{form}
           ^{webAppFormAuthToken}
           <div .form-group>
-            <div .col-sm-offset-2>
+            <div .col-sm-10 .col-sm-offset-2>
               <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
                 Add Internet Archive item
 <div .modal .fade #workingmodal>
diff --git a/templates/configurators/adds3.hamlet b/templates/configurators/adds3.hamlet
index e5b6203f30..c9ed09fe77 100644
--- a/templates/configurators/adds3.hamlet
+++ b/templates/configurators/adds3.hamlet
@@ -1,27 +1,27 @@
 <div .col-sm-9>
   <div .jumbotron>
-  <h2>
-    Adding an Amazon S3 repository
-  <p>
-    <a href="http://aws.amazon.com/s3/">Amazon S3</a> is a cloud storage #
-    provider. If you need a professional level of storage for your data, #
-    this is a good choice.
-  <p>
-    <span .glyphicon .glyphicon-warning-sign>
-    \ You will be charged by Amazon for data #
-    uploaded to S3, as well as data downloaded from S3, and a monthly fee #
-    for data storage. #
-    <a href="http://aws.amazon.com/s3/pricing/">
-      Pricing details, including one year Free Usage Tier promotion
-  <p>
-    <form method="post" .form-horizontal enctype=#{enctype}>
-      <fieldset>
-        ^{form}
-        ^{webAppFormAuthToken}
-        <div .form-group>
-          <div .col-sm-offset-2>
-            <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
-              Add S3 repository
+    <h2>
+      Adding an Amazon S3 repository
+    <p>
+      <a href="http://aws.amazon.com/s3/">Amazon S3</a> is a cloud storage #
+      provider. If you need a professional level of storage for your data, #
+      this is a good choice.
+    <p>
+      <span .glyphicon .glyphicon-warning-sign>
+      \ You will be charged by Amazon for data #
+      uploaded to S3, as well as data downloaded from S3, and a monthly fee #
+      for data storage. #
+      <a href="http://aws.amazon.com/s3/pricing/">
+        Pricing details, including one year Free Usage Tier promotion
+    <p>
+      <form method="post" .form-horizontal enctype=#{enctype}>
+        <fieldset>
+          ^{form}
+          ^{webAppFormAuthToken}
+          <div .form-group>
+            <div .col-sm-10 .col-sm-offset-2>
+              <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
+                Add S3 repository
 <div .modal .fade #workingmodal>
   <div .modal-dialog>
     <div .modal-content>
diff --git a/templates/configurators/edit/repository.hamlet b/templates/configurators/edit/repository.hamlet
index 69ab955cec..86db12210a 100644
--- a/templates/configurators/edit/repository.hamlet
+++ b/templates/configurators/edit/repository.hamlet
@@ -22,7 +22,7 @@
           ^{form}
           ^{webAppFormAuthToken}
           <div .form-group>
-            <div .col-sm-offset-2>
+            <div .col-sm-10 .col-sm-offset-2>
               <button .btn .btn-primary type=submit>
                 Save Changes #
               <a .btn .btn-default href="@{DashboardR}">
diff --git a/templates/configurators/enableaws.hamlet b/templates/configurators/enableaws.hamlet
index a26d0e4109..95efc8a23f 100644
--- a/templates/configurators/enableaws.hamlet
+++ b/templates/configurators/enableaws.hamlet
@@ -20,7 +20,7 @@
           ^{form}
           ^{webAppFormAuthToken}
           <div .form-group>
-            <div .col-sm-offset-2>
+            <div .col-sm-10 .col-sm-offset-2>
               <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
                 Enable Amazon repository
 <div .modal .fade #workingmodal>
diff --git a/templates/configurators/enableia.hamlet b/templates/configurators/enableia.hamlet
index b6fc1df6f8..67403f98b8 100644
--- a/templates/configurators/enableia.hamlet
+++ b/templates/configurators/enableia.hamlet
@@ -12,7 +12,7 @@
           ^{form}
           ^{webAppFormAuthToken}
           <div .form-group>
-            <div .col-sm-offset-2>
+            <div .col-sm-10 .col-sm-offset-2>
               <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
                 Enable Internet Archive repository
 <div .modal .fade #workingmodal>
diff --git a/templates/configurators/enablewebdav.hamlet b/templates/configurators/enablewebdav.hamlet
index 4df585dae6..5b1610c665 100644
--- a/templates/configurators/enablewebdav.hamlet
+++ b/templates/configurators/enablewebdav.hamlet
@@ -12,7 +12,7 @@
           ^{form}
           ^{webAppFormAuthToken}
           <div .form-group>
-            <div .col-sm-offset-2>
+            <div .col-sm-10 .col-sm-offset-2>
               <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
                 Enable repository
 <div .modal .fade #workingmodal>
diff --git a/templates/configurators/fsck/preferencesform.hamlet b/templates/configurators/fsck/preferencesform.hamlet
index 2531d84679..e35897cced 100644
--- a/templates/configurators/fsck/preferencesform.hamlet
+++ b/templates/configurators/fsck/preferencesform.hamlet
@@ -2,6 +2,6 @@
   <form method="post" .form-horizontal action=@{ConfigFsckPreferencesR} enctype=#{enctype}>
     ^{form}
     <div .form-group>
-      <div .col-sm-offset-2>
+      <div .col-sm-10 .col-sm-offset-2>
         <button .btn .btn-primary type=submit>
           Save
diff --git a/templates/configurators/pairing/local/prompt.hamlet b/templates/configurators/pairing/local/prompt.hamlet
index b706780c08..eb0a839b4c 100644
--- a/templates/configurators/pairing/local/prompt.hamlet
+++ b/templates/configurators/pairing/local/prompt.hamlet
@@ -33,7 +33,7 @@
           ^{form}
           ^{webAppFormAuthToken}
           <div .form-group>
-            <div .col-sm-offset-2>
+            <div .col-sm-10 .col-sm-offset-2>
               <button .btn .btn-primary type=submit>
                 $if start
                   Start pairing
diff --git a/templates/configurators/preferences.hamlet b/templates/configurators/preferences.hamlet
index d46e1979cd..68eff198c5 100644
--- a/templates/configurators/preferences.hamlet
+++ b/templates/configurators/preferences.hamlet
@@ -8,7 +8,7 @@
           ^{form}
           ^{webAppFormAuthToken}
           <div .form-group>
-            <div .col-sm-offset-2>
+            <div .col-sm-10 .col-sm-offset-2>
               <button .btn .btn-primary type=submit>
                 Save Preferences
               <a .btn .btn-default href="@{ConfigurationR}">
diff --git a/templates/configurators/rsync.net/add.hamlet b/templates/configurators/rsync.net/add.hamlet
index f8fd753203..903dbc7e44 100644
--- a/templates/configurators/rsync.net/add.hamlet
+++ b/templates/configurators/rsync.net/add.hamlet
@@ -29,7 +29,7 @@
           ^{form}
           ^{webAppFormAuthToken}
           <div .form-group>
-            <div .col-sm-offset-2>
+            <div .col-sm-10 .col-sm-offset-2>
               <button .btn .btn-primary type=submit onclick="$('#setupmodal').modal('show');">
                 Use this rsync.net repository
   <div .modal .fade #setupmodal>
diff --git a/templates/configurators/ssh/add.hamlet b/templates/configurators/ssh/add.hamlet
index f3b7211f47..5e0d4b4da4 100644
--- a/templates/configurators/ssh/add.hamlet
+++ b/templates/configurators/ssh/add.hamlet
@@ -20,7 +20,7 @@
           ^{form}
           ^{webAppFormAuthToken}
           <div .form-group>
-            <div .col-sm-offset-2>
+            <div .col-sm-10 .col-sm-offset-2>
               <button .btn .btn-primary type=submit onclick="$('#testmodal').modal('show');">
                 Check this server
 ^{sshTestModal}
diff --git a/templates/configurators/ssh/enable.hamlet b/templates/configurators/ssh/enable.hamlet
index 2bae88e3a7..18d3f31466 100644
--- a/templates/configurators/ssh/enable.hamlet
+++ b/templates/configurators/ssh/enable.hamlet
@@ -10,7 +10,7 @@
       <form method="post" .form-horizontal enctype=#{enctype}>
         <fieldset>
           <div .form-group>
-            <div .col-sm-offset-2>
+            <div .col-sm-10 .col-sm-offset-2>
               <button .btn .btn-primary type=submit onclick="$('#testmodal').modal('show');">
                 Check this server
           $case status
diff --git a/templates/configurators/xmpp.hamlet b/templates/configurators/xmpp.hamlet
index b0d62932ee..3fd567bf43 100644
--- a/templates/configurators/xmpp.hamlet
+++ b/templates/configurators/xmpp.hamlet
@@ -26,11 +26,11 @@
           ^{form}
           ^{webAppFormAuthToken}
           <div .form-group>
-            <div .col-sm-offset-2>
+            <div .col-sm-10 .col-sm-offset-2>
               <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
                 Use this account
-          <a .btn .btn-default href="@{DisconnectXMPPR}">
-            Stop using this account
+              <a .btn .btn-default href="@{DisconnectXMPPR}">
+                Stop using this account
 <div .modal .fade #workingmodal>
   <div .modal-dialog>
     <div .modal-content>