diff --git a/package-lock.json b/package-lock.json
index fe142785..c77413fa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "@types/jest": "27.0.3",
         "@types/node": "16.11.19",
         "@types/react": "17.0.38",
-        "@types/react-bootstrap": "0.32.28",
+        "@types/react-bootstrap": "0.32.29",
         "@types/react-dom": "17.0.11",
         "@types/react-redux": "7.1.22",
         "@types/react-router-dom": "5.3.3",
@@ -23,7 +23,7 @@
         "bootstrap": "4.6.1",
         "eslint-plugin-react-hooks": "4.3.0",
         "react": "17.0.2",
-        "react-bootstrap": "1.6.4",
+        "react-bootstrap": "2.1.1",
         "react-dom": "17.0.2",
         "react-dropzone": "11.4.2",
         "react-redux": "7.2.6",
@@ -2550,23 +2550,50 @@
       }
     },
     "node_modules/@popperjs/core": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
-      "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==",
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz",
+      "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"
       }
     },
-    "node_modules/@restart/context": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz",
-      "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q=="
+    "node_modules/@react-aria/ssr": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.1.0.tgz",
+      "integrity": "sha512-RxqQKmE8sO7TGdrcSlHTcVzMP450hqowtBSd2bBS9oPlcokVkaGq28c3Rwa8ty5ctw4EBCjXqjP7xdcKMGDzug==",
+      "dependencies": {
+        "@babel/runtime": "^7.6.2"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0-rc.1"
+      }
+    },
+    "node_modules/@restart/ui": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-0.2.6.tgz",
+      "integrity": "sha512-lcutEWPvsxz0uEyRxuysCbHBfXDFnMKNMNTsnuPmLFjZXgW9fVmhksS6rpFklXHMwxOM9g6hRTBq0gS3QRKgzQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.13.16",
+        "@popperjs/core": "^2.10.1",
+        "@react-aria/ssr": "^3.0.1",
+        "@restart/hooks": "^0.4.0",
+        "@types/warning": "^3.0.0",
+        "dequal": "^2.0.2",
+        "dom-helpers": "^5.2.0",
+        "prop-types": "^15.7.2",
+        "uncontrollable": "^7.2.1",
+        "warning": "^4.0.3"
+      },
+      "peerDependencies": {
+        "react": ">=16.14.0",
+        "react-dom": ">=16.14.0"
+      }
     },
-    "node_modules/@restart/hooks": {
-      "version": "0.3.27",
-      "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.27.tgz",
-      "integrity": "sha512-s984xV/EapUIfkjlf8wz9weP2O9TNKR96C68FfMEy2bE69+H4cNv3RD4Mf97lW7Htt7PjZrYTjSC8f3SB9VCXw==",
+    "node_modules/@restart/ui/node_modules/@restart/hooks": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.5.tgz",
+      "integrity": "sha512-tLGtY0aHeIfT7aPwUkvQuhIy3+q3w4iqmUzFLPlOAf/vNUacLaBt1j/S//jv/dQhenRh8jvswyMojCwmLvJw8A==",
       "dependencies": {
         "dequal": "^2.0.2"
       },
@@ -5943,9 +5970,9 @@
       }
     },
     "node_modules/@types/react-bootstrap": {
-      "version": "0.32.28",
-      "resolved": "https://registry.npmjs.org/@types/react-bootstrap/-/react-bootstrap-0.32.28.tgz",
-      "integrity": "sha512-+cGcRsnKZrmBhb1wV/fg/gC5LxgcP33O1QhQD/G5HtV0D2nID8tU6nU1M8bM6k72uc2X/0fHezt9Cdv8qBmG3A==",
+      "version": "0.32.29",
+      "resolved": "https://registry.npmjs.org/@types/react-bootstrap/-/react-bootstrap-0.32.29.tgz",
+      "integrity": "sha512-ynKNFi1lvLLOCC+/G3HMQ2hGE6dzfgCOt6S2+sQy6Y6jVYh2m5Qrc/e1OQN5B2DkUsQAtxr908OpW9lOup6Pgw==",
       "dependencies": {
         "@types/react": "*"
       }
@@ -22474,13 +22501,13 @@
       }
     },
     "node_modules/react-bootstrap": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.6.4.tgz",
-      "integrity": "sha512-z3BhBD4bEZuLP8VrYqAD7OT7axdcSkkyvWBWnS2U/4MhyabUihrUyucPWkan7aMI1XIHbmH4LCpEtzWGfx/yfA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.1.1.tgz",
+      "integrity": "sha512-Igagk6LziNW/HgBlMVx+QiwPVt/oqrZ7tiBKgv31VYc/56kJEU0Y+BCJS6hrQP6QmmIpdVtX8TRaanv9xsmW5A==",
       "dependencies": {
         "@babel/runtime": "^7.14.0",
-        "@restart/context": "^2.1.4",
-        "@restart/hooks": "^0.3.26",
+        "@restart/hooks": "^0.4.5",
+        "@restart/ui": "^0.2.5",
         "@types/invariant": "^2.2.33",
         "@types/prop-types": "^15.7.3",
         "@types/react": ">=16.14.8",
@@ -22491,14 +22518,24 @@
         "invariant": "^2.2.4",
         "prop-types": "^15.7.2",
         "prop-types-extra": "^1.1.0",
-        "react-overlays": "^5.1.1",
         "react-transition-group": "^4.4.1",
         "uncontrollable": "^7.2.1",
         "warning": "^4.0.3"
       },
       "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
+        "react": ">=16.14.0",
+        "react-dom": ">=16.14.0"
+      }
+    },
+    "node_modules/react-bootstrap/node_modules/@restart/hooks": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.5.tgz",
+      "integrity": "sha512-tLGtY0aHeIfT7aPwUkvQuhIy3+q3w4iqmUzFLPlOAf/vNUacLaBt1j/S//jv/dQhenRh8jvswyMojCwmLvJw8A==",
+      "dependencies": {
+        "dequal": "^2.0.2"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0"
       }
     },
     "node_modules/react-colorful": {
@@ -23036,25 +23073,6 @@
       "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
       "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
     },
-    "node_modules/react-overlays": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-5.1.1.tgz",
-      "integrity": "sha512-eCN2s2/+GVZzpnId4XVWtvDPYYBD2EtOGP74hE+8yDskPzFy9+pV1H3ZZihxuRdEbQzzacySaaDkR7xE0ydl4Q==",
-      "dependencies": {
-        "@babel/runtime": "^7.13.8",
-        "@popperjs/core": "^2.8.6",
-        "@restart/hooks": "^0.3.26",
-        "@types/warning": "^3.0.0",
-        "dom-helpers": "^5.2.0",
-        "prop-types": "^15.7.2",
-        "uncontrollable": "^7.2.1",
-        "warning": "^4.0.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.3.0",
-        "react-dom": ">=16.3.0"
-      }
-    },
     "node_modules/react-popper": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
@@ -31434,21 +31452,43 @@
       }
     },
     "@popperjs/core": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
-      "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q=="
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz",
+      "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA=="
     },
-    "@restart/context": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz",
-      "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q=="
+    "@react-aria/ssr": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.1.0.tgz",
+      "integrity": "sha512-RxqQKmE8sO7TGdrcSlHTcVzMP450hqowtBSd2bBS9oPlcokVkaGq28c3Rwa8ty5ctw4EBCjXqjP7xdcKMGDzug==",
+      "requires": {
+        "@babel/runtime": "^7.6.2"
+      }
     },
-    "@restart/hooks": {
-      "version": "0.3.27",
-      "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.27.tgz",
-      "integrity": "sha512-s984xV/EapUIfkjlf8wz9weP2O9TNKR96C68FfMEy2bE69+H4cNv3RD4Mf97lW7Htt7PjZrYTjSC8f3SB9VCXw==",
+    "@restart/ui": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-0.2.6.tgz",
+      "integrity": "sha512-lcutEWPvsxz0uEyRxuysCbHBfXDFnMKNMNTsnuPmLFjZXgW9fVmhksS6rpFklXHMwxOM9g6hRTBq0gS3QRKgzQ==",
       "requires": {
-        "dequal": "^2.0.2"
+        "@babel/runtime": "^7.13.16",
+        "@popperjs/core": "^2.10.1",
+        "@react-aria/ssr": "^3.0.1",
+        "@restart/hooks": "^0.4.0",
+        "@types/warning": "^3.0.0",
+        "dequal": "^2.0.2",
+        "dom-helpers": "^5.2.0",
+        "prop-types": "^15.7.2",
+        "uncontrollable": "^7.2.1",
+        "warning": "^4.0.3"
+      },
+      "dependencies": {
+        "@restart/hooks": {
+          "version": "0.4.5",
+          "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.5.tgz",
+          "integrity": "sha512-tLGtY0aHeIfT7aPwUkvQuhIy3+q3w4iqmUzFLPlOAf/vNUacLaBt1j/S//jv/dQhenRh8jvswyMojCwmLvJw8A==",
+          "requires": {
+            "dequal": "^2.0.2"
+          }
+        }
       }
     },
     "@rollup/plugin-node-resolve": {
@@ -33840,9 +33880,9 @@
       }
     },
     "@types/react-bootstrap": {
-      "version": "0.32.28",
-      "resolved": "https://registry.npmjs.org/@types/react-bootstrap/-/react-bootstrap-0.32.28.tgz",
-      "integrity": "sha512-+cGcRsnKZrmBhb1wV/fg/gC5LxgcP33O1QhQD/G5HtV0D2nID8tU6nU1M8bM6k72uc2X/0fHezt9Cdv8qBmG3A==",
+      "version": "0.32.29",
+      "resolved": "https://registry.npmjs.org/@types/react-bootstrap/-/react-bootstrap-0.32.29.tgz",
+      "integrity": "sha512-ynKNFi1lvLLOCC+/G3HMQ2hGE6dzfgCOt6S2+sQy6Y6jVYh2m5Qrc/e1OQN5B2DkUsQAtxr908OpW9lOup6Pgw==",
       "requires": {
         "@types/react": "*"
       }
@@ -47300,13 +47340,13 @@
       }
     },
     "react-bootstrap": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.6.4.tgz",
-      "integrity": "sha512-z3BhBD4bEZuLP8VrYqAD7OT7axdcSkkyvWBWnS2U/4MhyabUihrUyucPWkan7aMI1XIHbmH4LCpEtzWGfx/yfA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.1.1.tgz",
+      "integrity": "sha512-Igagk6LziNW/HgBlMVx+QiwPVt/oqrZ7tiBKgv31VYc/56kJEU0Y+BCJS6hrQP6QmmIpdVtX8TRaanv9xsmW5A==",
       "requires": {
         "@babel/runtime": "^7.14.0",
-        "@restart/context": "^2.1.4",
-        "@restart/hooks": "^0.3.26",
+        "@restart/hooks": "^0.4.5",
+        "@restart/ui": "^0.2.5",
         "@types/invariant": "^2.2.33",
         "@types/prop-types": "^15.7.3",
         "@types/react": ">=16.14.8",
@@ -47317,10 +47357,19 @@
         "invariant": "^2.2.4",
         "prop-types": "^15.7.2",
         "prop-types-extra": "^1.1.0",
-        "react-overlays": "^5.1.1",
         "react-transition-group": "^4.4.1",
         "uncontrollable": "^7.2.1",
         "warning": "^4.0.3"
+      },
+      "dependencies": {
+        "@restart/hooks": {
+          "version": "0.4.5",
+          "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.5.tgz",
+          "integrity": "sha512-tLGtY0aHeIfT7aPwUkvQuhIy3+q3w4iqmUzFLPlOAf/vNUacLaBt1j/S//jv/dQhenRh8jvswyMojCwmLvJw8A==",
+          "requires": {
+            "dequal": "^2.0.2"
+          }
+        }
       }
     },
     "react-colorful": {
@@ -47742,21 +47791,6 @@
       "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
       "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
     },
-    "react-overlays": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-5.1.1.tgz",
-      "integrity": "sha512-eCN2s2/+GVZzpnId4XVWtvDPYYBD2EtOGP74hE+8yDskPzFy9+pV1H3ZZihxuRdEbQzzacySaaDkR7xE0ydl4Q==",
-      "requires": {
-        "@babel/runtime": "^7.13.8",
-        "@popperjs/core": "^2.8.6",
-        "@restart/hooks": "^0.3.26",
-        "@types/warning": "^3.0.0",
-        "dom-helpers": "^5.2.0",
-        "prop-types": "^15.7.2",
-        "uncontrollable": "^7.2.1",
-        "warning": "^4.0.3"
-      }
-    },
     "react-popper": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
diff --git a/package.json b/package.json
index 7a118183..c05ea4d1 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "@types/jest": "27.0.3",
     "@types/node": "16.11.19",
     "@types/react": "17.0.38",
-    "@types/react-bootstrap": "0.32.28",
+    "@types/react-bootstrap": "0.32.29",
     "@types/react-dom": "17.0.11",
     "@types/react-redux": "7.1.22",
     "@types/react-router-dom": "5.3.3",
@@ -18,7 +18,7 @@
     "bootstrap": "4.6.1",
     "eslint-plugin-react-hooks": "4.3.0",
     "react": "17.0.2",
-    "react-bootstrap": "1.6.4",
+    "react-bootstrap": "2.1.1",
     "react-dom": "17.0.2",
     "react-dropzone": "11.4.2",
     "react-redux": "7.2.6",
diff --git a/src/__tests__/__snapshots__/storybook.test.ts.snap b/src/__tests__/__snapshots__/storybook.test.ts.snap
index 1f5ef597..52f1f128 100644
--- a/src/__tests__/__snapshots__/storybook.test.ts.snap
+++ b/src/__tests__/__snapshots__/storybook.test.ts.snap
@@ -73,7 +73,6 @@ exports[`Storyshots Filesystem FilesystemContextMenu 1`] = `
 >
   <button
     aria-expanded={false}
-    aria-haspopup={true}
     className="no-after btn-sm dropdown-toggle btn btn-primary"
     disabled={false}
     id="fileListItemDropdownButton-34-button"
@@ -99,28 +98,16 @@ exports[`Storyshots Filesystem NewFolderModal 1`] = `
       Create new Directory
     </div>
     <button
-      className="close"
+      aria-label="Close"
+      className="btn-close"
       onClick={[Function]}
       type="button"
-    >
-      <span
-        aria-hidden="true"
-      >
-        ×
-      </span>
-      <span
-        className="sr-only"
-      >
-        Close
-      </span>
-    </button>
+    />
   </div>
   <div
     className="modal-body"
   >
-    <div
-      className="form-group"
-    >
+    <div>
       <label
         className="form-label"
         htmlFor="formFolderName"
@@ -178,9 +165,7 @@ Array [
       >
         Search for files or folders
       </div>
-      <div
-        className="form-group"
-      >
+      <div>
         <label
           className="form-label"
           htmlFor="searchValue"
@@ -198,21 +183,11 @@ Array [
       </div>
     </div>
     <button
-      className="close"
+      aria-label="Close"
+      className="btn-close"
       onClick={[Function]}
       type="button"
-    >
-      <span
-        aria-hidden="true"
-      >
-        ×
-      </span>
-      <span
-        className="sr-only"
-      >
-        Close
-      </span>
-    </button>
+    />
   </div>,
   <div
     className="modal-body"
@@ -237,21 +212,11 @@ Array [
       Uploading
     </div>
     <button
-      className="close"
+      aria-label="Close"
+      className="btn-close"
       onClick={[Function]}
       type="button"
-    >
-      <span
-        aria-hidden="true"
-      >
-        ×
-      </span>
-      <span
-        className="sr-only"
-      >
-        Close
-      </span>
-    </button>
+    />
   </div>,
   <div
     className="modal-body"
@@ -264,8 +229,7 @@ Array [
       >
         <div
           className="bg-body border list-group-item"
-          data-rb-event-key={null}
-          disabled={false}
+          data-rr-ui-event-key={null}
           onClick={[Function]}
         >
           fasel
@@ -273,8 +237,7 @@ Array [
         </div>
         <div
           className="bg-body border list-group-item"
-          data-rb-event-key={null}
-          disabled={false}
+          data-rr-ui-event-key={null}
           onClick={[Function]}
         >
           fasel/blub
@@ -290,8 +253,7 @@ Array [
       >
         <div
           className="bg-body border list-group-item"
-          data-rb-event-key={null}
-          disabled={false}
+          data-rr-ui-event-key={null}
           onClick={[Function]}
         >
           bla.txt
@@ -299,8 +261,7 @@ Array [
         </div>
         <div
           className="bg-body border list-group-item"
-          data-rb-event-key={null}
-          disabled={false}
+          data-rr-ui-event-key={null}
           onClick={[Function]}
         >
           fasel/bla.wow
@@ -408,10 +369,9 @@ exports[`Storyshots Filesystem default 1`] = `
                 <a
                   aria-disabled={true}
                   className="mx-1 btn btn-outline-secondary btn-sm disabled"
-                  href="http://localhost/data/download?ids="
                   onClick={[Function]}
                   onKeyDown={[Function]}
-                  tabIndex={-1}
+                  role="button"
                 >
                   Download
                 </a>
@@ -433,14 +393,14 @@ exports[`Storyshots Filesystem default 1`] = `
               className="col-md-1 col-2"
             >
               <div
-                className="form-group"
+                className="pl-3"
               >
                 <div
-                  className="form-check"
+                  className=""
                 >
                   <input
                     checked={false}
-                    className="form-check-input position-static"
+                    className="form-check-input"
                     disabled={false}
                     id="formBasicCheckbox"
                     onChange={[Function]}
@@ -619,7 +579,7 @@ exports[`Storyshots Login default 1`] = `
         onSubmit={[Function]}
       >
         <div
-          className="form-group"
+          className="mb-3"
         >
           <input
             autoComplete="username"
@@ -632,7 +592,7 @@ exports[`Storyshots Login default 1`] = `
           />
         </div>
         <div
-          className="form-group"
+          className="mb-3"
         >
           <input
             autoComplete="current-password"
@@ -650,7 +610,7 @@ exports[`Storyshots Login default 1`] = `
           </small>
         </div>
         <button
-          className="btn btn-primary btn-block"
+          className="w-100 btn btn-primary"
           disabled={false}
           type="submit"
         >
@@ -668,7 +628,7 @@ exports[`Storyshots Login default 1`] = `
           Sign in
         </button>
         <div
-          className="mt-3 justify-content-center form-group"
+          className="mt-3 justify-content-center"
         >
           <div
             className="form-check"
@@ -719,7 +679,7 @@ exports[`Storyshots Login interactionArea 1`] = `
         onSubmit={[Function]}
       >
         <div
-          className="form-group"
+          className="mb-3"
         >
           <input
             autoComplete="username"
@@ -732,7 +692,7 @@ exports[`Storyshots Login interactionArea 1`] = `
           />
         </div>
         <div
-          className="form-group"
+          className="mb-3"
         >
           <input
             autoComplete="current-password"
@@ -750,7 +710,7 @@ exports[`Storyshots Login interactionArea 1`] = `
           </small>
         </div>
         <button
-          className="btn btn-primary btn-block"
+          className="w-100 btn btn-primary"
           disabled={false}
           type="submit"
         >
@@ -768,7 +728,7 @@ exports[`Storyshots Login interactionArea 1`] = `
           Sign in
         </button>
         <div
-          className="mt-3 justify-content-center form-group"
+          className="mt-3 justify-content-center"
         >
           <div
             className="form-check"
@@ -850,7 +810,7 @@ exports[`Storyshots Login onlyInput 1`] = `
         onSubmit={[Function]}
       >
         <div
-          className="form-group"
+          className="mb-3"
         >
           <input
             autoComplete="username"
@@ -863,7 +823,7 @@ exports[`Storyshots Login onlyInput 1`] = `
           />
         </div>
         <div
-          className="form-group"
+          className="mb-3"
         >
           <input
             autoComplete="current-password"
@@ -881,7 +841,7 @@ exports[`Storyshots Login onlyInput 1`] = `
           </small>
         </div>
         <button
-          className="btn btn-primary btn-block"
+          className="w-100 btn btn-primary"
           disabled={false}
           type="submit"
         >
@@ -899,7 +859,7 @@ exports[`Storyshots Login onlyInput 1`] = `
           Sign in
         </button>
         <div
-          className="mt-3 justify-content-center form-group"
+          className="mt-3 justify-content-center"
         >
           <div
             className="form-check"
@@ -1005,9 +965,7 @@ exports[`Storyshots Registration default 1`] = `
         className=""
         onSubmit={[Function]}
       >
-        <div
-          className="form-group"
-        >
+        <div>
           <label
             className="form-label"
             htmlFor="formBasicUsername"
@@ -1022,9 +980,7 @@ exports[`Storyshots Registration default 1`] = `
             value=""
           />
         </div>
-        <div
-          className="form-group"
-        >
+        <div>
           <label
             className="form-label"
             htmlFor="formBasicPassword"
@@ -1104,9 +1060,7 @@ exports[`Storyshots Registration default 1`] = `
             </span>
           </div>
         </div>
-        <div
-          className="form-group"
-        >
+        <div>
           <label
             className="form-label"
             htmlFor="formConfirmPassword"
diff --git a/src/components/basicElements/login/Login.tsx b/src/components/basicElements/login/Login.tsx
index e24be3c9..eee1e3ae 100644
--- a/src/components/basicElements/login/Login.tsx
+++ b/src/components/basicElements/login/Login.tsx
@@ -146,7 +146,10 @@ export function LoginInput(props: LoginInputInterface) {
             <Row className="mt-4 justify-content-center">
                 <Col className="login-input">
                     <Form onSubmit={handleSubmit}>
-                        <Form.Group controlId="formBasicUsername">
+                        <Form.Group
+                            controlId="formBasicUsername"
+                            className="mb-3"
+                        >
                             <Form.Control
                                 autoFocus
                                 placeholder="Username"
@@ -158,7 +161,10 @@ export function LoginInput(props: LoginInputInterface) {
                             />
                         </Form.Group>
 
-                        <Form.Group controlId="formBasicPassword">
+                        <Form.Group
+                            controlId="formBasicPassword"
+                            className="mb-3"
+                        >
                             <Form.Control
                                 type="password"
                                 placeholder="Password"
@@ -174,7 +180,11 @@ export function LoginInput(props: LoginInputInterface) {
                             </Form.Text>
                         </Form.Group>
 
-                        <Button variant="primary" type="submit" block>
+                        <Button
+                            variant="primary"
+                            type="submit"
+                            className="w-100"
+                        >
                             <Spinner
                                 as="span"
                                 animation="grow"
diff --git a/src/components/basicElements/login/__snapshots__/Login.test.tsx.snap b/src/components/basicElements/login/__snapshots__/Login.test.tsx.snap
index 55676089..86250e72 100644
--- a/src/components/basicElements/login/__snapshots__/Login.test.tsx.snap
+++ b/src/components/basicElements/login/__snapshots__/Login.test.tsx.snap
@@ -16,7 +16,7 @@ Object {
               class=""
             >
               <div
-                class="form-group"
+                class="mb-3"
               >
                 <input
                   autocomplete="username"
@@ -27,7 +27,7 @@ Object {
                 />
               </div>
               <div
-                class="form-group"
+                class="mb-3"
               >
                 <input
                   autocomplete="current-password"
@@ -44,7 +44,7 @@ Object {
                 </small>
               </div>
               <button
-                class="btn btn-primary btn-block"
+                class="w-100 btn btn-primary"
                 type="submit"
               >
                 <span
@@ -61,7 +61,7 @@ Object {
                 Sign in
               </button>
               <div
-                class="mt-3 justify-content-center form-group"
+                class="mt-3 justify-content-center"
               >
                 <div
                   class="form-check"
@@ -107,7 +107,7 @@ Object {
             class=""
           >
             <div
-              class="form-group"
+              class="mb-3"
             >
               <input
                 autocomplete="username"
@@ -118,7 +118,7 @@ Object {
               />
             </div>
             <div
-              class="form-group"
+              class="mb-3"
             >
               <input
                 autocomplete="current-password"
@@ -135,7 +135,7 @@ Object {
               </small>
             </div>
             <button
-              class="btn btn-primary btn-block"
+              class="w-100 btn btn-primary"
               type="submit"
             >
               <span
@@ -152,7 +152,7 @@ Object {
               Sign in
             </button>
             <div
-              class="mt-3 justify-content-center form-group"
+              class="mt-3 justify-content-center"
             >
               <div
                 class="form-check"
diff --git a/src/components/pages/User/__snapshots__/Registration.test.tsx.snap b/src/components/pages/User/__snapshots__/Registration.test.tsx.snap
index 7def5ac5..e1212d4d 100644
--- a/src/components/pages/User/__snapshots__/Registration.test.tsx.snap
+++ b/src/components/pages/User/__snapshots__/Registration.test.tsx.snap
@@ -21,9 +21,7 @@ Object {
             <form
               class=""
             >
-              <div
-                class="form-group"
-              >
+              <div>
                 <label
                   class="form-label"
                   for="formBasicUsername"
@@ -37,9 +35,7 @@ Object {
                   value=""
                 />
               </div>
-              <div
-                class="form-group"
-              >
+              <div>
                 <label
                   class="form-label"
                   for="formBasicPassword"
@@ -118,9 +114,7 @@ Object {
                   </span>
                 </div>
               </div>
-              <div
-                class="form-group"
-              >
+              <div>
                 <label
                   class="form-label"
                   for="formConfirmPassword"
@@ -186,9 +180,7 @@ Object {
           <form
             class=""
           >
-            <div
-              class="form-group"
-            >
+            <div>
               <label
                 class="form-label"
                 for="formBasicUsername"
@@ -202,9 +194,7 @@ Object {
                 value=""
               />
             </div>
-            <div
-              class="form-group"
-            >
+            <div>
               <label
                 class="form-label"
                 for="formBasicPassword"
@@ -283,9 +273,7 @@ Object {
                 </span>
               </div>
             </div>
-            <div
-              class="form-group"
-            >
+            <div>
               <label
                 class="form-label"
                 for="formConfirmPassword"
diff --git a/src/components/pages/filesytem/FileListHeader.tsx b/src/components/pages/filesytem/FileListHeader.tsx
index e61119d8..ba0cd6eb 100644
--- a/src/components/pages/filesytem/FileListHeader.tsx
+++ b/src/components/pages/filesytem/FileListHeader.tsx
@@ -118,7 +118,7 @@ function FileListHeader(props: TReduxProps): ReactElement {
         <Row>
             {/*Checkbox*/}
             <Col xs={fileListSize.checkbox.xs} md={fileListSize.checkbox.md}>
-                <Form.Group controlId="formBasicCheckbox">
+                <Form.Group controlId="formBasicCheckbox" className={"pl-3"}>
                     <Form.Check
                         checked={allAreSelected}
                         type="checkbox"
diff --git a/src/components/pages/filesytem/FileListItem.tsx b/src/components/pages/filesytem/FileListItem.tsx
index 76a9da87..e963d63c 100644
--- a/src/components/pages/filesytem/FileListItem.tsx
+++ b/src/components/pages/filesytem/FileListItem.tsx
@@ -57,7 +57,7 @@ function FileListItem(props: Props): ReactElement {
                 md={fileListSize.checkbox.md}
                 className="fileRow"
             >
-                <Form.Group controlId="formBasicCheckbox">
+                <Form.Group controlId="formBasicCheckbox" className={"pl-3"}>
                     <Form.Check
                         checked={isSelected}
                         type="checkbox"
diff --git a/src/components/pages/filesytem/upload/UploadDecisionsModalContent.tsx b/src/components/pages/filesytem/upload/UploadDecisionsModalContent.tsx
index f1176968..cb3d106b 100644
--- a/src/components/pages/filesytem/upload/UploadDecisionsModalContent.tsx
+++ b/src/components/pages/filesytem/upload/UploadDecisionsModalContent.tsx
@@ -149,7 +149,7 @@ export const UploadDecisionsModalContent = ({
                         <th className="fw-40">New Name</th>
                         <th className="fw-20">
                             {isFolders ? "Merge" : "Overwrite"}
-                            <Form.Group>
+                            <Form.Group className="pl-4 mb-3">
                                 <Form.Check
                                     type="checkbox"
                                     checked={
diff --git a/src/components/pages/filesytem/upload/UploadDecisionsTableRow.tsx b/src/components/pages/filesytem/upload/UploadDecisionsTableRow.tsx
index aab09547..efc348ea 100644
--- a/src/components/pages/filesytem/upload/UploadDecisionsTableRow.tsx
+++ b/src/components/pages/filesytem/upload/UploadDecisionsTableRow.tsx
@@ -36,7 +36,7 @@ const UploadDecisionsTableRow = ({
         [preflightEntity.path, setPreflightResultDispatch]
     )
     const onNameInputLeaver = useCallback(
-        (event: React.ChangeEvent<HTMLInputElement>) => {
+        (event) => {
             console.log("onNameInputLeaver")
             let val = event.target.value
 
@@ -102,7 +102,7 @@ const UploadDecisionsTableRow = ({
                 )}
             </td>
             <td>
-                <Form.Group>
+                <Form.Group className="pl-4 mb-3">
                     <Form.Check
                         disabled={
                             !preflightEntity.nameIsValid ||