diff --git a/src/route-widgets/GlobalSettingsRoute/SettingsForm.tsx b/src/route-widgets/GlobalSettingsRoute/SettingsForm.tsx
index d89ab24..db9faa9 100644
--- a/src/route-widgets/GlobalSettingsRoute/SettingsForm.tsx
+++ b/src/route-widgets/GlobalSettingsRoute/SettingsForm.tsx
@@ -2,20 +2,23 @@ import * as yup from "yup"
 import {useFormik} from "formik"
 import {TbCursorText} from "react-icons/tb"
 import {useTranslation} from "react-i18next"
+import {MdCheck, MdOutlineChangeCircle, MdTextFormat} from "react-icons/md"
+import {BsImage} from "react-icons/bs"
 
 import {
 	Checkbox,
 	FormControlLabel,
 	FormGroup,
 	FormHelperText,
+	Grid,
 	InputAdornment,
 	TextField,
+	Typography,
 } from "@mui/material"
+import {LoadingButton} from "@mui/lab"
 
 import {AdminSettings} from "~/server-types"
-import {SimpleForm, StringPoolField, createPool} from "~/components"
-import {MdOutlineChangeCircle, MdTextFormat} from "react-icons/md"
-import {BsImage} from "react-icons/bs"
+import {StringPoolField, createPool} from "~/components"
 
 export interface SettingsFormProps {
 	settings: AdminSettings
@@ -79,285 +82,356 @@ export default function SettingsForm({settings}: SettingsFormProps) {
 
 	return (
 		<form onSubmit={formik.handleSubmit}>
-			<SimpleForm
-				isSubmitting={formik.isSubmitting}
-				title={t("routes.AdminRoute.settings.title")}
-				description={t("routes.AdminRoute.settings.description")}
-				continueActionLabel={t("general.saveLabel")}
+			<Grid
+				container
+				spacing={4}
+				paddingX={2}
+				paddingY={4}
+				direction="column"
+				alignItems="center"
+				justifyContent="center"
 			>
-				{[
-					<TextField
-						key="random_email_id_min_length"
-						fullWidth
-						label={t("routes.AdminRoute.forms.settings.randomEmailIdMinLength.label")}
-						name="randomEmailIdMinLength"
-						value={formik.values.randomEmailIdMinLength}
-						onChange={formik.handleChange}
-						error={
-							formik.touched.randomEmailIdMinLength &&
-							Boolean(formik.errors.randomEmailIdMinLength)
-						}
-						helperText={
-							(formik.touched.randomEmailIdMinLength &&
-								formik.errors.randomEmailIdMinLength) ||
-							t("routes.AdminRoute.forms.settings.randomEmailIdMinLength.description")
-						}
-						type="number"
-						disabled={formik.isSubmitting}
-						inputMode="numeric"
-						InputProps={{
-							startAdornment: (
-								<InputAdornment position="start">
-									<TbCursorText />
-								</InputAdornment>
-							),
-						}}
-					/>,
-					<StringPoolField
-						fullWidth
-						allowCustom
-						key="random_email_id_chars"
-						pools={DEFAULT_POOLS}
-						id="random_email_id_chars"
-						label={t("routes.AdminRoute.forms.settings.randomEmailIdChars.label")}
-						name="randomEmailIdChars"
-						value={formik.values.randomEmailIdChars}
-						onChange={formik.handleChange}
-						error={
-							formik.touched.randomEmailIdChars &&
-							Boolean(formik.errors.randomEmailIdChars)
-						}
-						helperText={
-							(formik.touched.randomEmailIdChars &&
-								formik.errors.randomEmailIdChars) ||
-							(t(
-								"routes.AdminRoute.forms.settings.randomEmailIdChars.description",
-							) as string)
-						}
-						disabled={formik.isSubmitting}
-						startAdornment={
-							<InputAdornment position="start">
-								<MdTextFormat />
-							</InputAdornment>
-						}
-					/>,
-					<TextField
-						key="random_email_length_increase_on_percentage"
-						fullWidth
-						label={t(
-							"routes.AdminRoute.forms.settings.randomEmailLengthIncreaseOnPercentage.label",
-						)}
-						name="randomEmailIdLengthIncreaseOnPercentage"
-						value={formik.values.randomEmailLengthIncreaseOnPercentage}
-						onChange={formik.handleChange}
-						error={
-							formik.touched.randomEmailLengthIncreaseOnPercentage &&
-							Boolean(formik.errors.randomEmailLengthIncreaseOnPercentage)
-						}
-						helperText={
-							(formik.touched.randomEmailLengthIncreaseOnPercentage &&
-								formik.errors.randomEmailLengthIncreaseOnPercentage) ||
-							t(
-								"routes.AdminRoute.forms.settings.randomEmailLengthIncreaseOnPercentage.description",
-							)
-						}
-						type="number"
-						disabled={formik.isSubmitting}
-						inputMode="numeric"
-						InputProps={{
-							startAdornment: (
-								<InputAdornment position="start">
-									<MdOutlineChangeCircle />
-								</InputAdornment>
-							),
-						}}
-					/>,
-					<TextField
-						key="custom_email_suffix_length"
-						fullWidth
-						label={t("routes.AdminRoute.forms.settings.customEmailSuffixLength.label")}
-						name="customEmailSuffixLength"
-						value={formik.values.customEmailSuffixLength}
-						onChange={formik.handleChange}
-						error={
-							formik.touched.customEmailSuffixLength &&
-							Boolean(formik.errors.customEmailSuffixLength)
-						}
-						helperText={
-							(formik.touched.customEmailSuffixLength &&
-								formik.errors.customEmailSuffixLength) ||
-							t(
-								"routes.AdminRoute.forms.settings.customEmailSuffixLength.description",
-							)
-						}
-						type="number"
-						disabled={formik.isSubmitting}
-						inputMode="numeric"
-						InputProps={{
-							startAdornment: (
-								<InputAdornment position="start">
-									<TbCursorText />
-								</InputAdornment>
-							),
-						}}
-					/>,
-					<StringPoolField
-						key="custom_email_suffix_chars"
-						allowCustom
-						fullWidth
-						pools={DEFAULT_POOLS}
-						id="custom_email_suffix_chars"
-						label={t("routes.AdminRoute.forms.settings.customEmailSuffixChars.label")}
-						name="customEmailSuffixChars"
-						value={formik.values.customEmailSuffixChars}
-						onChange={formik.handleChange}
-						error={
-							formik.touched.customEmailSuffixChars &&
-							Boolean(formik.errors.customEmailSuffixChars)
-						}
-						helperText={
-							(formik.touched.customEmailSuffixChars &&
-								formik.errors.customEmailSuffixChars) ||
-							(t(
-								"routes.AdminRoute.forms.settings.customEmailSuffixChars.description",
-							) as string)
-						}
-						disabled={formik.isSubmitting}
-						InputProps={{
-							startAdornment: (
-								<InputAdornment position="start">
-									<MdTextFormat />
-								</InputAdornment>
-							),
-						}}
-					/>,
-					<TextField
-						key="image_proxy_storage_life_time_in_hours"
-						fullWidth
-						label={t(
-							"routes.AdminRoute.forms.settings.imageProxyStorageLifeTimeInHours.label",
-						)}
-						name="imageProxyStorageLifeTimeInHours"
-						value={formik.values.imageProxyStorageLifeTimeInHours}
-						onChange={formik.handleChange}
-						error={
-							formik.touched.imageProxyStorageLifeTimeInHours &&
-							Boolean(formik.errors.imageProxyStorageLifeTimeInHours)
-						}
-						helperText={
-							(formik.touched.imageProxyStorageLifeTimeInHours &&
-								formik.errors.imageProxyStorageLifeTimeInHours) ||
-							t(
-								"routes.AdminRoute.forms.settings.imageProxyStorageLifeTimeInHours.description",
-							)
-						}
-						type="number"
-						disabled={formik.isSubmitting}
-						inputMode="numeric"
-						InputProps={{
-							startAdornment: (
-								<InputAdornment position="start">
-									<BsImage />
-								</InputAdornment>
-							),
-						}}
-					/>,
-					<FormGroup key="enable_image_proxy">
-						<FormControlLabel
-							control={
-								<Checkbox
-									checked={formik.values.enableImageProxy}
-									onChange={formik.handleChange}
-									name="enableImageProxy"
-								/>
-							}
-							label={t("routes.AdminRoute.forms.settings.enableImageProxy.label")}
-						/>
-						<FormHelperText
-							error={
-								formik.touched.enableImageProxy &&
-								Boolean(formik.errors.enableImageProxy)
-							}
-						>
-							{(formik.touched.enableImageProxy && formik.errors.enableImageProxy) ||
-								t("routes.AdminRoute.forms.settings.enableImageProxy.description")}
-						</FormHelperText>
-					</FormGroup>,
-					<FormGroup key="user_email_enable_disposable_emails">
-						<FormControlLabel
-							control={
-								<Checkbox
-									checked={formik.values.userEmailEnableDisposableEmails}
-									onChange={formik.handleChange}
-									name="userEmailEnableDisposableEmails"
-								/>
-							}
-							label={t(
-								"routes.AdminRoute.forms.settings.userEmailEnableDisposableEmails.label",
-							)}
-						/>
-						<FormHelperText
-							error={
-								formik.touched.userEmailEnableDisposableEmails &&
-								Boolean(formik.errors.userEmailEnableDisposableEmails)
-							}
-						>
-							{(formik.touched.userEmailEnableDisposableEmails &&
-								formik.errors.userEmailEnableDisposableEmails) ||
-								t(
-									"routes.AdminRoute.forms.settings.userEmailEnableDisposableEmails.description",
+				<Grid item>
+					<Grid container spacing={2} direction="column">
+						<Grid item>
+							<Typography variant="h4" component="h1" align="center">
+								{t("routes.AdminRoute.settings.title")}
+							</Typography>
+						</Grid>
+						<Grid item>
+							<Typography variant="subtitle1" component="p">
+								{t("routes.AdminRoute.settings.description")}
+							</Typography>
+						</Grid>
+					</Grid>
+				</Grid>
+				<Grid item>
+					<Grid container spacing={3} direction="row" alignItems="start">
+						<Grid item md={6}>
+							<TextField
+								key="random_email_id_min_length"
+								fullWidth
+								label={t(
+									"routes.AdminRoute.forms.settings.randomEmailIdMinLength.label",
 								)}
-						</FormHelperText>
-					</FormGroup>,
-					<FormGroup key="user_email_enable_other_relays">
-						<FormControlLabel
-							control={
-								<Checkbox
-									checked={formik.values.userEmailEnableOtherRelays}
-									onChange={formik.handleChange}
-									name="userEmailEnableOtherRelays"
-								/>
-							}
-							label={t(
-								"routes.AdminRoute.forms.settings.userEmailEnableOtherRelays.label",
-							)}
-						/>
-						<FormHelperText
-							error={
-								formik.touched.userEmailEnableOtherRelays &&
-								Boolean(formik.errors.userEmailEnableOtherRelays)
-							}
-						>
-							{(formik.touched.userEmailEnableOtherRelays &&
-								formik.errors.userEmailEnableOtherRelays) ||
-								t(
-									"routes.AdminRoute.forms.settings.userEmailEnableOtherRelays.description",
+								name="randomEmailIdMinLength"
+								value={formik.values.randomEmailIdMinLength}
+								onChange={formik.handleChange}
+								error={
+									formik.touched.randomEmailIdMinLength &&
+									Boolean(formik.errors.randomEmailIdMinLength)
+								}
+								helperText={
+									(formik.touched.randomEmailIdMinLength &&
+										formik.errors.randomEmailIdMinLength) ||
+									t(
+										"routes.AdminRoute.forms.settings.randomEmailIdMinLength.description",
+									)
+								}
+								type="number"
+								disabled={formik.isSubmitting}
+								inputMode="numeric"
+								InputProps={{
+									startAdornment: (
+										<InputAdornment position="start">
+											<TbCursorText />
+										</InputAdornment>
+									),
+								}}
+							/>
+						</Grid>
+						<Grid item md={6}>
+							<StringPoolField
+								fullWidth
+								allowCustom
+								key="random_email_id_chars"
+								pools={DEFAULT_POOLS}
+								id="random_email_id_chars"
+								label={t(
+									"routes.AdminRoute.forms.settings.randomEmailIdChars.label",
 								)}
-						</FormHelperText>
-					</FormGroup>,
-					<FormGroup key="allow_statistics">
-						<FormControlLabel
-							control={
-								<Checkbox
-									checked={formik.values.allowStatistics}
-									onChange={formik.handleChange}
-									name="allowStatistics"
+								name="randomEmailIdChars"
+								value={formik.values.randomEmailIdChars}
+								onChange={formik.handleChange}
+								error={
+									formik.touched.randomEmailIdChars &&
+									Boolean(formik.errors.randomEmailIdChars)
+								}
+								helperText={
+									(formik.touched.randomEmailIdChars &&
+										formik.errors.randomEmailIdChars) ||
+									(t(
+										"routes.AdminRoute.forms.settings.randomEmailIdChars.description",
+									) as string)
+								}
+								disabled={formik.isSubmitting}
+								startAdornment={
+									<InputAdornment position="start">
+										<MdTextFormat />
+									</InputAdornment>
+								}
+							/>
+						</Grid>
+						<Grid item>
+							<TextField
+								key="random_email_length_increase_on_percentage"
+								fullWidth
+								label={t(
+									"routes.AdminRoute.forms.settings.randomEmailLengthIncreaseOnPercentage.label",
+								)}
+								name="randomEmailIdLengthIncreaseOnPercentage"
+								value={formik.values.randomEmailLengthIncreaseOnPercentage}
+								onChange={formik.handleChange}
+								error={
+									formik.touched.randomEmailLengthIncreaseOnPercentage &&
+									Boolean(formik.errors.randomEmailLengthIncreaseOnPercentage)
+								}
+								helperText={
+									(formik.touched.randomEmailLengthIncreaseOnPercentage &&
+										formik.errors.randomEmailLengthIncreaseOnPercentage) ||
+									t(
+										"routes.AdminRoute.forms.settings.randomEmailLengthIncreaseOnPercentage.description",
+									)
+								}
+								type="number"
+								disabled={formik.isSubmitting}
+								inputMode="numeric"
+								InputProps={{
+									startAdornment: (
+										<InputAdornment position="start">
+											<MdOutlineChangeCircle />
+										</InputAdornment>
+									),
+								}}
+							/>
+						</Grid>
+						<Grid item md={6}>
+							<TextField
+								key="custom_email_suffix_length"
+								fullWidth
+								label={t(
+									"routes.AdminRoute.forms.settings.customEmailSuffixLength.label",
+								)}
+								name="customEmailSuffixLength"
+								value={formik.values.customEmailSuffixLength}
+								onChange={formik.handleChange}
+								error={
+									formik.touched.customEmailSuffixLength &&
+									Boolean(formik.errors.customEmailSuffixLength)
+								}
+								helperText={
+									(formik.touched.customEmailSuffixLength &&
+										formik.errors.customEmailSuffixLength) ||
+									t(
+										"routes.AdminRoute.forms.settings.customEmailSuffixLength.description",
+									)
+								}
+								type="number"
+								disabled={formik.isSubmitting}
+								inputMode="numeric"
+								InputProps={{
+									startAdornment: (
+										<InputAdornment position="start">
+											<TbCursorText />
+										</InputAdornment>
+									),
+								}}
+							/>
+						</Grid>
+						<Grid item md={6}>
+							<StringPoolField
+								key="custom_email_suffix_chars"
+								allowCustom
+								fullWidth
+								pools={DEFAULT_POOLS}
+								id="custom_email_suffix_chars"
+								label={t(
+									"routes.AdminRoute.forms.settings.customEmailSuffixChars.label",
+								)}
+								name="customEmailSuffixChars"
+								value={formik.values.customEmailSuffixChars}
+								onChange={formik.handleChange}
+								error={
+									formik.touched.customEmailSuffixChars &&
+									Boolean(formik.errors.customEmailSuffixChars)
+								}
+								helperText={
+									(formik.touched.customEmailSuffixChars &&
+										formik.errors.customEmailSuffixChars) ||
+									(t(
+										"routes.AdminRoute.forms.settings.customEmailSuffixChars.description",
+									) as string)
+								}
+								disabled={formik.isSubmitting}
+								startAdornment={
+									<InputAdornment position="start">
+										<MdTextFormat />
+									</InputAdornment>
+								}
+							/>
+						</Grid>
+						<Grid item>
+							<TextField
+								key="image_proxy_storage_life_time_in_hours"
+								fullWidth
+								label={t(
+									"routes.AdminRoute.forms.settings.imageProxyStorageLifeTimeInHours.label",
+								)}
+								name="imageProxyStorageLifeTimeInHours"
+								value={formik.values.imageProxyStorageLifeTimeInHours}
+								onChange={formik.handleChange}
+								error={
+									formik.touched.imageProxyStorageLifeTimeInHours &&
+									Boolean(formik.errors.imageProxyStorageLifeTimeInHours)
+								}
+								helperText={
+									(formik.touched.imageProxyStorageLifeTimeInHours &&
+										formik.errors.imageProxyStorageLifeTimeInHours) ||
+									t(
+										"routes.AdminRoute.forms.settings.imageProxyStorageLifeTimeInHours.description",
+									)
+								}
+								type="number"
+								disabled={formik.isSubmitting}
+								inputMode="numeric"
+								InputProps={{
+									startAdornment: (
+										<InputAdornment position="start">
+											<BsImage />
+										</InputAdornment>
+									),
+								}}
+							/>
+						</Grid>
+						<Grid item>
+							<FormGroup key="user_email_enable_disposable_emails">
+								<FormControlLabel
+									control={
+										<Checkbox
+											checked={formik.values.userEmailEnableDisposableEmails}
+											onChange={formik.handleChange}
+											name="userEmailEnableDisposableEmails"
+										/>
+									}
+									label={t(
+										"routes.AdminRoute.forms.settings.userEmailEnableDisposableEmails.label",
+									)}
 								/>
-							}
-							label={t("routes.AdminRoute.forms.settings.allowStatistics.label")}
-						/>
-						<FormHelperText
-							error={
-								formik.touched.allowStatistics &&
-								Boolean(formik.errors.allowStatistics)
-							}
-						>
-							{(formik.touched.allowStatistics && formik.errors.allowStatistics) ||
-								t("routes.AdminRoute.forms.settings.allowStatistics.description")}
-						</FormHelperText>
-					</FormGroup>,
-				]}
-			</SimpleForm>
+								<FormHelperText
+									error={
+										formik.touched.userEmailEnableDisposableEmails &&
+										Boolean(formik.errors.userEmailEnableDisposableEmails)
+									}
+								>
+									{(formik.touched.userEmailEnableDisposableEmails &&
+										formik.errors.userEmailEnableDisposableEmails) ||
+										t(
+											"routes.AdminRoute.forms.settings.userEmailEnableDisposableEmails.description",
+										)}
+								</FormHelperText>
+							</FormGroup>
+						</Grid>
+						<Grid item>
+							<FormGroup key="user_email_enable_other_relays">
+								<FormControlLabel
+									control={
+										<Checkbox
+											checked={formik.values.userEmailEnableOtherRelays}
+											onChange={formik.handleChange}
+											name="userEmailEnableOtherRelays"
+										/>
+									}
+									label={t(
+										"routes.AdminRoute.forms.settings.userEmailEnableOtherRelays.label",
+									)}
+								/>
+								<FormHelperText
+									error={
+										formik.touched.userEmailEnableOtherRelays &&
+										Boolean(formik.errors.userEmailEnableOtherRelays)
+									}
+								>
+									{(formik.touched.userEmailEnableOtherRelays &&
+										formik.errors.userEmailEnableOtherRelays) ||
+										t(
+											"routes.AdminRoute.forms.settings.userEmailEnableOtherRelays.description",
+										)}
+								</FormHelperText>
+							</FormGroup>
+						</Grid>
+						<Grid item>
+							<FormGroup key="enable_image_proxy">
+								<FormControlLabel
+									control={
+										<Checkbox
+											checked={formik.values.enableImageProxy}
+											onChange={formik.handleChange}
+											name="enableImageProxy"
+										/>
+									}
+									label={t(
+										"routes.AdminRoute.forms.settings.enableImageProxy.label",
+									)}
+								/>
+								<FormHelperText
+									error={
+										formik.touched.enableImageProxy &&
+										Boolean(formik.errors.enableImageProxy)
+									}
+								>
+									{(formik.touched.enableImageProxy &&
+										formik.errors.enableImageProxy) ||
+										t(
+											"routes.AdminRoute.forms.settings.enableImageProxy.description",
+										)}
+								</FormHelperText>
+							</FormGroup>
+						</Grid>
+						<Grid item>
+							<FormGroup key="allow_statistics">
+								<FormControlLabel
+									control={
+										<Checkbox
+											checked={formik.values.allowStatistics}
+											onChange={formik.handleChange}
+											name="allowStatistics"
+										/>
+									}
+									label={t(
+										"routes.AdminRoute.forms.settings.allowStatistics.label",
+									)}
+								/>
+								<FormHelperText
+									error={
+										formik.touched.allowStatistics &&
+										Boolean(formik.errors.allowStatistics)
+									}
+								>
+									{(formik.touched.allowStatistics &&
+										formik.errors.allowStatistics) ||
+										t(
+											"routes.AdminRoute.forms.settings.allowStatistics.description",
+										)}
+								</FormHelperText>
+							</FormGroup>
+						</Grid>
+					</Grid>
+				</Grid>
+				<Grid item>
+					<Grid container justifyContent="center">
+						<Grid item>
+							<LoadingButton
+								loading={formik.isSubmitting}
+								variant="contained"
+								type="submit"
+								startIcon={<MdCheck />}
+							>
+								{t("general.saveLabel")}
+							</LoadingButton>
+						</Grid>
+					</Grid>
+				</Grid>
+			</Grid>
 		</form>
 	)
 }