diff --git a/web/repertory/lib/main.dart b/web/repertory/lib/main.dart
index d0d98e6c..e5448b0c 100644
--- a/web/repertory/lib/main.dart
+++ b/web/repertory/lib/main.dart
@@ -104,7 +104,7 @@ class _MyAppState extends State<MyApp> {
               child: EditMountScreen(
                 mount: mount,
                 title:
-                    '${mount.provider} [${formatMountName(mount.type, mount.name)}] Settings',
+                    '${mount.provider} Settings • ${formatMountName(mount.type, mount.name)}',
               ),
             );
           },
diff --git a/web/repertory/lib/screens/add_mount_screen.dart b/web/repertory/lib/screens/add_mount_screen.dart
index 6dc2c585..02718b3e 100644
--- a/web/repertory/lib/screens/add_mount_screen.dart
+++ b/web/repertory/lib/screens/add_mount_screen.dart
@@ -168,39 +168,17 @@ class _AddMountScreenState extends State<AddMountScreen> {
             if (_mount != null) ...[
               const SizedBox(height: constants.padding),
               Expanded(
-                child: Container(
-                  decoration: BoxDecoration(
-                    color: scheme.primary.withValues(
-                      alpha: constants.primaryAlpha,
-                    ),
-                    borderRadius: BorderRadius.circular(constants.borderRadius),
-                    border: Border.all(
-                      color: scheme.outlineVariant.withValues(alpha: 0.06),
-                      width: 1,
-                    ),
-                    gradient: const LinearGradient(
-                      begin: Alignment.topCenter,
-                      end: Alignment.bottomCenter,
-                      colors: constants.gradientColors2,
-                    ),
-                    boxShadow: [
-                      BoxShadow(
-                        color: Colors.black.withValues(alpha: 0.22),
-                        blurRadius: constants.borderRadius,
-                        offset: Offset(0, constants.borderRadius),
-                      ),
-                    ],
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: constants.padding,
                   ),
                   child: ClipRRect(
                     borderRadius: BorderRadius.circular(constants.borderRadius),
-                    child: Padding(
-                      padding: const EdgeInsets.all(constants.padding),
-                      child: MountSettingsWidget(
-                        isAdd: true,
-                        mount: _mount!,
-                        settings: _settings[_mountType]!,
-                        showAdvanced: false,
-                      ),
+                    child: MountSettingsWidget(
+                      isAdd: true,
+                      mount: _mount!,
+                      settings: _settings[_mountType]!,
+                      showAdvanced: false,
                     ),
                   ),
                 ),
diff --git a/web/repertory/lib/screens/edit_mount_screen.dart b/web/repertory/lib/screens/edit_mount_screen.dart
index ea4bfdbb..9cf6be3a 100644
--- a/web/repertory/lib/screens/edit_mount_screen.dart
+++ b/web/repertory/lib/screens/edit_mount_screen.dart
@@ -169,49 +169,18 @@ class _EditMountScreenState extends State<EditMountScreen> {
               padding: const EdgeInsets.symmetric(
                 horizontal: constants.padding,
               ),
-              child: Material(
-                color: Colors.transparent,
-                child: Container(
-                  decoration: BoxDecoration(
-                    color: scheme.primary.withValues(
-                      alpha: constants.primaryAlpha,
-                    ),
-                    borderRadius: BorderRadius.circular(constants.borderRadius),
-                    border: Border.all(
-                      color: scheme.outlineVariant.withValues(alpha: 0.06),
-                      width: 1,
-                    ),
-                    gradient: const LinearGradient(
-                      begin: Alignment.topCenter,
-                      end: Alignment.bottomCenter,
-                      colors: constants.gradientColors2,
-                    ),
-                    boxShadow: [
-                      BoxShadow(
-                        color: Colors.black.withValues(alpha: 0.22),
-                        blurRadius: constants.borderRadius,
-                        offset: Offset(0, constants.borderRadius),
-                      ),
-                    ],
-                  ),
-                  child: ClipRRect(
-                    borderRadius: BorderRadius.circular(constants.borderRadius),
-                    child: Padding(
-                      padding: const EdgeInsets.all(constants.padding),
-                      child: MountSettingsWidget(
-                        mount: widget.mount,
-                        settings: jsonDecode(
-                          jsonEncode(widget.mount.mountConfig.settings),
-                        ),
-                        showAdvanced: _showAdvanced,
-                      ),
-                    ),
+              child: ClipRRect(
+                borderRadius: BorderRadius.circular(constants.borderRadius),
+                child: MountSettingsWidget(
+                  mount: widget.mount,
+                  settings: jsonDecode(
+                    jsonEncode(widget.mount.mountConfig.settings),
                   ),
+                  showAdvanced: _showAdvanced,
                 ),
               ),
             ),
           ),
-
           const SizedBox(height: constants.padding),
         ],
       ),
diff --git a/web/repertory/lib/screens/edit_settings_screen.dart b/web/repertory/lib/screens/edit_settings_screen.dart
index 60bfaf10..2e12e3dd 100644
--- a/web/repertory/lib/screens/edit_settings_screen.dart
+++ b/web/repertory/lib/screens/edit_settings_screen.dart
@@ -122,51 +122,24 @@ class _EditSettingsScreenState extends State<EditSettingsScreen> {
               padding: const EdgeInsets.symmetric(
                 horizontal: constants.padding,
               ),
-              child: Material(
-                color: Colors.transparent,
-                child: Container(
-                  decoration: BoxDecoration(
-                    color: scheme.surface.withValues(alpha: 0.40),
-                    borderRadius: BorderRadius.circular(constants.borderRadius),
-                    border: Border.all(
-                      color: scheme.outlineVariant.withValues(alpha: 0.06),
-                      width: 1,
-                    ),
-                    gradient: const LinearGradient(
-                      begin: Alignment.topCenter,
-                      end: Alignment.bottomCenter,
-                      colors: constants.gradientColors2,
-                    ),
-                    boxShadow: [
-                      BoxShadow(
-                        color: Colors.black.withValues(alpha: 0.22),
-                        blurRadius: constants.borderRadius,
-                        offset: Offset(0, constants.borderRadius),
-                      ),
-                    ],
-                  ),
-                  child: ClipRRect(
-                    borderRadius: BorderRadius.circular(constants.borderRadius),
-                    child: FutureBuilder<Map<String, dynamic>>(
-                      future: _grabSettings(),
-                      initialData: const <String, dynamic>{},
-                      builder: (context, snapshot) {
-                        if (!snapshot.hasData) {
-                          return const Center(
-                            child: CircularProgressIndicator(),
-                          );
-                        }
+              child: ClipRRect(
+                borderRadius: BorderRadius.circular(constants.borderRadius),
+                child: FutureBuilder<Map<String, dynamic>>(
+                  future: _grabSettings(),
+                  initialData: const <String, dynamic>{},
+                  builder: (context, snapshot) {
+                    if (!snapshot.hasData) {
+                      return const Center(child: CircularProgressIndicator());
+                    }
 
-                        return UISettingsWidget(
-                          origSettings: jsonDecode(
-                            jsonEncode(snapshot.requireData),
-                          ),
-                          settings: snapshot.requireData,
-                          showAdvanced: false,
-                        );
-                      },
-                    ),
-                  ),
+                    return UISettingsWidget(
+                      origSettings: jsonDecode(
+                        jsonEncode(snapshot.requireData),
+                      ),
+                      settings: snapshot.requireData,
+                      showAdvanced: false,
+                    );
+                  },
                 ),
               ),
             ),