diff --git a/lib/screens/clients/clients.dart b/lib/screens/clients/clients.dart
index 3d494ae..1549bb6 100644
--- a/lib/screens/clients/clients.dart
+++ b/lib/screens/clients/clients.dart
@@ -23,7 +23,7 @@ class _ClientsState extends State<Clients> with TickerProviderStateMixin {
     return Scaffold(
       body: LayoutBuilder(
         builder: (context, constraints) {
-          if (constraints.maxWidth > 1000) {
+          if (constraints.maxWidth > 900) {
             return SplitView.material(
               hideDivider: true,
               flexWidth: const FlexWidth(mainViewFlexWidth: 1, secondaryViewFlexWidth: 2),
diff --git a/lib/screens/filters/add_button.dart b/lib/screens/filters/add_button.dart
index 7f7663e..be9f0f4 100644
--- a/lib/screens/filters/add_button.dart
+++ b/lib/screens/filters/add_button.dart
@@ -6,8 +6,8 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-import 'package:adguard_home_manager/screens/filters/modals/add_custom_rule/edit_custom_rules.dart';
-import 'package:adguard_home_manager/screens/filters/modals/add_custom_rule/add_custom_rule.dart';
+import 'package:adguard_home_manager/screens/filters/modals/custom_rules/edit_custom_rules.dart';
+import 'package:adguard_home_manager/screens/filters/modals/custom_rules/add_custom_rule.dart';
 import 'package:adguard_home_manager/screens/filters/details/add_list_modal.dart';
 
 import 'package:adguard_home_manager/providers/filtering_provider.dart';
diff --git a/lib/screens/filters/filters_triple_column.dart b/lib/screens/filters/filters_triple_column.dart
index 7d15639..686ee15 100644
--- a/lib/screens/filters/filters_triple_column.dart
+++ b/lib/screens/filters/filters_triple_column.dart
@@ -247,21 +247,34 @@ class FiltersTripleColumn extends StatelessWidget {
                           child: Row(
                             mainAxisAlignment: MainAxisAlignment.spaceBetween,
                             children: [
-                              Text(
-                                AppLocalizations.of(context)!.customRules,
-                                style: const TextStyle(
-                                  fontSize: 18,
-                                  fontWeight: FontWeight.w500
+                              Flexible(
+                                child: Text(
+                                  AppLocalizations.of(context)!.customRules,
+                                  overflow: TextOverflow.ellipsis,
+                                  style: const TextStyle(
+                                    fontSize: 18,
+                                    fontWeight: FontWeight.w500
+                                  ),
                                 ),
                               ),
+                              const SizedBox(width: 16),
                               AddFiltersButton(
-                                type: '', 
+                                type: 'edit_custom_rule', 
+                                widget: (fn) => IconButton(
+                                  onPressed: fn, 
+                                  icon: const Icon(Icons.edit_rounded),
+                                  tooltip: AppLocalizations.of(context)!.editCustomRules,
+                                )
+                              ),
+                              const SizedBox(width: 8),
+                              AddFiltersButton(
+                                type: 'add_custom_rule', 
                                 widget: (fn) => IconButton(
                                   onPressed: fn, 
                                   icon: const Icon(Icons.add_rounded),
                                   tooltip: AppLocalizations.of(context)!.addCustomRule,
                                 )
-                              )
+                              ),
                             ],
                           ),
                         ),
diff --git a/lib/screens/filters/modals/add_custom_rule/add_custom_rule.dart b/lib/screens/filters/modals/custom_rules/add_custom_rule.dart
similarity index 99%
rename from lib/screens/filters/modals/add_custom_rule/add_custom_rule.dart
rename to lib/screens/filters/modals/custom_rules/add_custom_rule.dart
index ad43ebb..00fe303 100644
--- a/lib/screens/filters/modals/add_custom_rule/add_custom_rule.dart
+++ b/lib/screens/filters/modals/custom_rules/add_custom_rule.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:segmented_button_slide/segmented_button_slide.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-import 'package:adguard_home_manager/screens/filters/modals/add_custom_rule/custom_rule_docs.dart';
+import 'package:adguard_home_manager/screens/filters/modals/custom_rules/custom_rule_docs.dart';
 
 enum _BlockingPresets { block, unblock, custom }
 
diff --git a/lib/screens/filters/modals/add_custom_rule/custom_rule_docs.dart b/lib/screens/filters/modals/custom_rules/custom_rule_docs.dart
similarity index 100%
rename from lib/screens/filters/modals/add_custom_rule/custom_rule_docs.dart
rename to lib/screens/filters/modals/custom_rules/custom_rule_docs.dart
diff --git a/lib/screens/filters/modals/add_custom_rule/edit_custom_rules.dart b/lib/screens/filters/modals/custom_rules/edit_custom_rules.dart
similarity index 95%
rename from lib/screens/filters/modals/add_custom_rule/edit_custom_rules.dart
rename to lib/screens/filters/modals/custom_rules/edit_custom_rules.dart
index e1fc1d1..ba02ab0 100644
--- a/lib/screens/filters/modals/add_custom_rule/edit_custom_rules.dart
+++ b/lib/screens/filters/modals/custom_rules/edit_custom_rules.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-import 'package:adguard_home_manager/screens/filters/modals/add_custom_rule/custom_rule_docs.dart';
+import 'package:adguard_home_manager/screens/filters/modals/custom_rules/custom_rule_docs.dart';
 
 import 'package:adguard_home_manager/providers/filtering_provider.dart';
 
@@ -26,7 +26,6 @@ class _EditCustomRulesState extends State<EditCustomRules> {
   @override
   void initState() {
     final filteringProvider = Provider.of<FilteringProvider>(context, listen: false);
-    print(filteringProvider.filtering!.userRules);
     if (filteringProvider.filtering != null) {
       _fieldController.text = filteringProvider.filtering!.userRules.join("\n");
     }
@@ -87,7 +86,7 @@ class _EditCustomRulesState extends State<EditCustomRules> {
                         ),
                         const SizedBox(width: 8),
                         Text(
-                          AppLocalizations.of(context)!.addCustomRule,
+                          AppLocalizations.of(context)!.editCustomRules,
                           style: const TextStyle(
                             fontSize: 22
                           ),
diff --git a/lib/screens/settings/settings.dart b/lib/screens/settings/settings.dart
index e16a84e..9ebe282 100644
--- a/lib/screens/settings/settings.dart
+++ b/lib/screens/settings/settings.dart
@@ -83,6 +83,8 @@ class _SettingsWidget extends StatefulWidget {
 }
 
 class _SettingsWidgetState extends State<_SettingsWidget> {
+  final scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
+
   @override
   void initState() {
     Provider.of<AppConfigProvider>(context, listen: false).setSelectedSettingsScreen(screen: null);
@@ -102,7 +104,7 @@ class _SettingsWidgetState extends State<_SettingsWidget> {
     }
 
     return ScaffoldMessenger(
-      key: widget.twoColumns ? GlobalKey() : null,
+      key: widget.twoColumns ? scaffoldMessengerKey : null,
       child: Scaffold(
         body: NestedScrollView(
           headerSliverBuilder: (context, innerBoxIsScrolled) => [