diff --git a/lib/screens/logs/configuration/config_widgets.dart b/lib/screens/logs/configuration/config_widgets.dart
new file mode 100644
index 0000000..44523f3
--- /dev/null
+++ b/lib/screens/logs/configuration/config_widgets.dart
@@ -0,0 +1,266 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+import 'package:adguard_home_manager/screens/logs/configuration/logs_config_modal.dart';
+
+class LogsConfigOptions extends StatelessWidget {
+  final bool generalSwitch;
+  final void Function(bool) updateGeneralSwitch;
+  final bool anonymizeClientIp;
+  final void Function(bool) updateAnonymizeClientIp;
+  final List<RetentionItem> retentionItems; 
+  final String? retentionTime;
+  final void Function(String?) updateRetentionTime;
+  final void Function() onClear;
+  final void Function() onConfirm;
+
+  const LogsConfigOptions({
+    Key? key,
+    required this.generalSwitch,
+    required this.updateGeneralSwitch,
+    required this.anonymizeClientIp,
+    required this.updateAnonymizeClientIp,
+    required this.retentionItems,
+    required this.retentionTime,
+    required this.updateRetentionTime,
+    required this.onClear,
+    required this.onConfirm
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Flexible(
+          child: SingleChildScrollView(
+            child: Wrap(
+              children: [
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Column(
+                      children: [
+                        Padding(
+                          padding: const EdgeInsets.only(top: 24),
+                          child: Icon(
+                            Icons.settings,
+                            size: 24,
+                            color: Theme.of(context).listTileTheme.iconColor
+                          ),
+                        ),
+                        const SizedBox(height: 16),
+                        Text(
+                          AppLocalizations.of(context)!.logsSettings,
+                          textAlign: TextAlign.center,
+                          style: TextStyle(
+                            fontSize: 24,
+                            color: Theme.of(context).colorScheme.onSurface
+                          ), 
+                        ),
+                        const SizedBox(height: 16),
+                      ],
+                    ),
+                  ],
+                ),
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 24),
+                  child: Material(
+                    color: Theme.of(context).colorScheme.primary.withOpacity(0.1),
+                    borderRadius: BorderRadius.circular(28),
+                    child: InkWell(
+                      onTap: () => updateGeneralSwitch(!generalSwitch),
+                      borderRadius: BorderRadius.circular(28),
+                      child: Padding(
+                        padding: const EdgeInsets.symmetric(
+                          horizontal: 20,
+                          vertical: 8
+                        ),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          children: [
+                            Text(
+                              AppLocalizations.of(context)!.enableLog,
+                              style: const TextStyle(
+                                fontSize: 18,
+                              ),
+                            ),
+                            Switch(
+                              value: generalSwitch, 
+                              onChanged: updateGeneralSwitch,
+                            )
+                          ],
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+                Container(height: 16),
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 14),
+                  child: Column(
+                    children: [
+                      Material(
+                        color: Colors.transparent,
+                        child: InkWell(
+                          onTap: () => updateAnonymizeClientIp(!anonymizeClientIp),
+                          child: Padding(
+                            padding: const EdgeInsets.symmetric(horizontal: 30),
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Text(
+                                  AppLocalizations.of(context)!.anonymizeClientIp,
+                                  style: const TextStyle(
+                                    fontSize: 16
+                                  ),
+                                ),
+                                Switch(
+                                  value: anonymizeClientIp, 
+                                  onChanged: updateAnonymizeClientIp,
+                                )
+                              ],
+                            ),
+                          ),
+                        ),
+                      ),
+                      Container(height: 16),
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 24),
+                        child: DropdownButtonFormField(
+                          items: retentionItems.map<DropdownMenuItem<String>>((item) {
+                            return DropdownMenuItem<String>(
+                              value: item.value.toString(),
+                              child: Text(item.label),
+                            );
+                          }).toList(),
+                          value: retentionTime,
+                          onChanged: (value) => updateRetentionTime(value),
+                          decoration: InputDecoration(
+                            border: const OutlineInputBorder(
+                              borderRadius: BorderRadius.all(
+                                Radius.circular(10)
+                              )
+                            ),
+                            label: Text(AppLocalizations.of(context)!.retentionTime)
+                          ),
+                          borderRadius: BorderRadius.circular(20),
+                        ),
+                      ),
+                    ],
+                  ),
+                )
+              ],
+            ),
+          ),
+        ),
+        Padding(
+          padding: const EdgeInsets.all(24),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              TextButton(
+                onPressed: () {
+                  Navigator.pop(context);
+                  onClear();
+                }, 
+                child: Text(AppLocalizations.of(context)!.clearLogs)
+              ),
+              Row(
+                children: [
+                  TextButton(
+                    onPressed: () => Navigator.pop(context), 
+                    child: Text(AppLocalizations.of(context)!.cancel)
+                  ),
+                  const SizedBox(width: 20),
+                  TextButton(
+                    onPressed: retentionTime != ''
+                      ? () {
+                        Navigator.pop(context);
+                        onConfirm();
+                      }
+                      : null, 
+                    child: Text(
+                      AppLocalizations.of(context)!.confirm,
+                      style: TextStyle(
+                        color: retentionTime != ''
+                          ? Theme.of(context).colorScheme.primary
+                          : Colors.grey
+                      ),
+                    )
+                  ),
+                ],
+              )
+            ],
+          ),
+        ),
+        if (Platform.isIOS) const SizedBox(height: 16)
+      ],
+    );
+  }
+}
+
+class ConfigLogsLoading extends StatelessWidget {
+  const ConfigLogsLoading({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(24),
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          const CircularProgressIndicator(),
+          const SizedBox(height: 30),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 20),
+            child: Text(
+              AppLocalizations.of(context)!.loadingLogsSettings,
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                fontSize: 22,
+                color: Theme.of(context).colorScheme.onSurfaceVariant
+              ),
+            ),
+          )
+        ],
+      ),
+    );
+  }
+}
+
+class ConfigLogsError extends StatelessWidget {
+  const ConfigLogsError({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        const Icon(
+          Icons.error,
+          color: Colors.red,
+          size: 50,
+        ),
+        const SizedBox(height: 30),
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 20),
+          child: Text(
+            AppLocalizations.of(context)!.logSettingsNotLoaded,
+            textAlign: TextAlign.center,
+            style: TextStyle(
+              fontSize: 22,
+              color: Theme.of(context).colorScheme.onSurfaceVariant
+            ),
+          ),
+        )
+      ],
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/screens/logs/configuration/logs_config_modal.dart b/lib/screens/logs/configuration/logs_config_modal.dart
new file mode 100644
index 0000000..698348c
--- /dev/null
+++ b/lib/screens/logs/configuration/logs_config_modal.dart
@@ -0,0 +1,254 @@
+import 'dart:io';
+
+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/logs/configuration/config_widgets.dart';
+
+import 'package:adguard_home_manager/constants/enums.dart';
+import 'package:adguard_home_manager/functions/compare_versions.dart';
+import 'package:adguard_home_manager/providers/app_config_provider.dart';
+import 'package:adguard_home_manager/providers/servers_provider.dart';
+
+class RetentionItem {
+  final String label;
+  final double value;
+
+  const RetentionItem({
+    required this.label,
+    required this.value,
+  });
+}
+
+class LogsConfigModal extends StatelessWidget {
+  final void Function(Map<String, dynamic>) onConfirm;
+  final void Function() onClear;
+  final bool dialog;
+  final String serverVersion;
+
+  const LogsConfigModal({
+    Key? key,
+    required this.onConfirm,
+    required this.onClear,
+    required this.dialog,
+    required this.serverVersion
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    final serversProvider = Provider.of<ServersProvider>(context);
+    final appConfigProvider = Provider.of<AppConfigProvider>(context);
+
+    return LogsConfigModalWidget(
+      serversProvider: serversProvider,
+      appConfigProvider: appConfigProvider,
+      context: context,
+      onConfirm: onConfirm,
+      onClear: onClear,
+      dialog: dialog,
+      serverVersion: serverVersion,
+    );
+  }
+}
+
+class LogsConfigModalWidget extends StatefulWidget {
+  final ServersProvider serversProvider;
+  final AppConfigProvider appConfigProvider;
+  final BuildContext context;
+  final void Function(Map<String, dynamic>) onConfirm;
+  final void Function() onClear;
+  final bool dialog;
+  final String serverVersion;
+
+  const LogsConfigModalWidget({
+    Key? key,
+    required this.serversProvider,
+    required this.appConfigProvider,
+    required this.context,
+    required this.onConfirm,
+    required this.onClear,
+    required this.dialog,
+    required this.serverVersion
+  }) : super(key: key);
+
+  @override
+  State<LogsConfigModalWidget> createState() => _LogsConfigModalWidgetState();
+}
+
+class _LogsConfigModalWidgetState extends State<LogsConfigModalWidget> {
+  bool generalSwitch = false;
+  bool anonymizeClientIp = false;
+  String? retentionTime = "";
+
+  List<RetentionItem> retentionItems = [];
+
+  LoadStatus loadStatus = LoadStatus.loading;
+
+  void loadData() async {
+    final serversProvider = Provider.of<ServersProvider>(context, listen: false);
+
+    final result = serverVersionIsAhead(
+      currentVersion: widget.serverVersion, 
+      referenceVersion: 'v0.107.28',
+      referenceVersionBeta: 'v0.108.0-b.33'
+    ) == true 
+      ? await serversProvider.apiClient!.getQueryLogInfo()
+      : await serversProvider.apiClient!.getQueryLogInfoLegacy();
+
+    if (mounted) {
+      if (result['result'] == 'success') {
+        setState(() {
+          generalSwitch = result['data']['enabled'];
+          anonymizeClientIp = result['data']['anonymize_client_ip'];
+          retentionTime = result['data']['interval'].toString();
+          loadStatus = LoadStatus.loading;
+        });
+      }
+      else {
+        setState(() => loadStatus = LoadStatus.error);
+      }
+    }
+  }
+
+  @override
+  void initState() {
+    retentionItems = serverVersionIsAhead(
+      currentVersion: widget.serverVersion, 
+      referenceVersion: 'v0.107.28',
+      referenceVersionBeta: 'v0.108.0-b.33'
+    ) == true ? [
+      RetentionItem(
+        label: AppLocalizations.of(widget.context)!.hours6,
+        value: 21600000
+      ),
+      RetentionItem(
+        label: AppLocalizations.of(widget.context)!.hours24,
+        value: 86400000
+      ),
+      RetentionItem(
+        label: AppLocalizations.of(widget.context)!.days7,
+        value: 604800000
+      ),
+      RetentionItem(
+        label: AppLocalizations.of(widget.context)!.days30,
+        value: 2592000000
+      ),
+      RetentionItem(
+        label: AppLocalizations.of(widget.context)!.days90,
+        value: 7776000000
+      ),
+    ] : [
+      RetentionItem(
+        label: AppLocalizations.of(widget.context)!.hours6,
+        value: 0.25
+      ),
+      RetentionItem(
+        label: AppLocalizations.of(widget.context)!.hours24,
+        value: 1
+      ),
+      RetentionItem(
+        label: AppLocalizations.of(widget.context)!.days7,
+        value: 7
+      ),
+      RetentionItem(
+        label: AppLocalizations.of(widget.context)!.days30,
+        value: 30
+      ),
+      RetentionItem(
+        label: AppLocalizations.of(widget.context)!.days90,
+        value: 90
+      ),
+    ];
+
+    loadData();
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (widget.dialog == true) {
+      return Dialog(
+        child: ConstrainedBox(
+          constraints: const BoxConstraints(
+            maxWidth: 500
+          ),
+          child: Builder(
+            builder: (context) {
+              switch (loadStatus) {
+                case LoadStatus.loading:
+                  return const ConfigLogsLoading();
+
+                case LoadStatus.loaded:
+                  return LogsConfigOptions(
+                    generalSwitch: generalSwitch, 
+                    updateGeneralSwitch: (v) => setState(() => generalSwitch = v), 
+                    anonymizeClientIp: anonymizeClientIp, 
+                    updateAnonymizeClientIp: (v) => setState(() => anonymizeClientIp = v), 
+                    retentionItems: retentionItems, 
+                    retentionTime: retentionTime, 
+                    updateRetentionTime: (v) => setState(() => retentionTime = v), 
+                    onClear: () => widget.onClear(), 
+                    onConfirm: () => widget.onConfirm({
+                      "enabled": generalSwitch,
+                      "interval": double.parse(retentionTime!),
+                      "anonymize_client_ip": anonymizeClientIp
+                    })
+                  );
+
+                case LoadStatus.error:
+                  return const ConfigLogsError();
+
+                default:
+                  return const SizedBox();
+              }
+            },
+          )
+        ),
+      );
+    }
+    else {
+      return Container(
+        height: Platform.isIOS ? 436 : 420,
+        decoration: BoxDecoration(
+          borderRadius: const BorderRadius.only(
+            topLeft: Radius.circular(28),
+            topRight: Radius.circular(28)
+          ),
+          color: Theme.of(context).dialogBackgroundColor
+        ),
+        child: Builder(
+          builder: (context) {
+            switch (loadStatus) {
+              case LoadStatus.loading:
+                return const ConfigLogsLoading();
+
+              case LoadStatus.loaded:
+                return LogsConfigOptions(
+                  generalSwitch: generalSwitch, 
+                  updateGeneralSwitch: (v) => setState(() => generalSwitch = v), 
+                  anonymizeClientIp: anonymizeClientIp, 
+                  updateAnonymizeClientIp: (v) => setState(() => anonymizeClientIp = v), 
+                  retentionItems: retentionItems, 
+                  retentionTime: retentionTime, 
+                  updateRetentionTime: (v) => setState(() => retentionTime = v), 
+                  onClear: () => widget.onClear(), 
+                  onConfirm: () => widget.onConfirm({
+                    "enabled": generalSwitch,
+                    "interval": double.parse(retentionTime!),
+                    "anonymize_client_ip": anonymizeClientIp
+                  })
+                );
+
+              case LoadStatus.error:
+                return const ConfigLogsError();
+
+              default:
+                return const SizedBox();
+            }
+          },
+        )
+      );
+    }
+  }
+}
\ No newline at end of file
diff --git a/lib/screens/logs/log_details_screen.dart b/lib/screens/logs/details/log_details_screen.dart
similarity index 99%
rename from lib/screens/logs/log_details_screen.dart
rename to lib/screens/logs/details/log_details_screen.dart
index 161e9fa..510c2e2 100644
--- a/lib/screens/logs/log_details_screen.dart
+++ b/lib/screens/logs/details/log_details_screen.dart
@@ -6,7 +6,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import 'package:adguard_home_manager/widgets/section_label.dart';
 
-import 'package:adguard_home_manager/screens/logs/log_list_tile.dart';
+import 'package:adguard_home_manager/screens/logs/details/log_list_tile.dart';
 
 import 'package:adguard_home_manager/functions/desktop_mode.dart';
 import 'package:adguard_home_manager/functions/open_url.dart';
diff --git a/lib/screens/logs/log_list_tile.dart b/lib/screens/logs/details/log_list_tile.dart
similarity index 100%
rename from lib/screens/logs/log_list_tile.dart
rename to lib/screens/logs/details/log_list_tile.dart
diff --git a/lib/screens/logs/clients_modal.dart b/lib/screens/logs/filters/clients_modal.dart
similarity index 100%
rename from lib/screens/logs/clients_modal.dart
rename to lib/screens/logs/filters/clients_modal.dart
diff --git a/lib/screens/logs/filter_status_modal.dart b/lib/screens/logs/filters/filter_status_modal.dart
similarity index 100%
rename from lib/screens/logs/filter_status_modal.dart
rename to lib/screens/logs/filters/filter_status_modal.dart
diff --git a/lib/screens/logs/logs_filters_modal.dart b/lib/screens/logs/filters/logs_filters_modal.dart
similarity index 98%
rename from lib/screens/logs/logs_filters_modal.dart
rename to lib/screens/logs/filters/logs_filters_modal.dart
index e41efa5..8e1cdbe 100644
--- a/lib/screens/logs/logs_filters_modal.dart
+++ b/lib/screens/logs/filters/logs_filters_modal.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/logs/clients_modal.dart';
-import 'package:adguard_home_manager/screens/logs/filter_status_modal.dart';
+import 'package:adguard_home_manager/screens/logs/filters/clients_modal.dart';
+import 'package:adguard_home_manager/screens/logs/filters/filter_status_modal.dart';
 import 'package:adguard_home_manager/widgets/section_label.dart';
 import 'package:adguard_home_manager/widgets/custom_list_tile.dart';
 
diff --git a/lib/screens/logs/logs.dart b/lib/screens/logs/logs.dart
index 863f93d..c1510c3 100644
--- a/lib/screens/logs/logs.dart
+++ b/lib/screens/logs/logs.dart
@@ -4,7 +4,7 @@ import 'package:adguard_home_manager/models/logs.dart';
 import 'package:flutter/material.dart';
 
 import 'package:adguard_home_manager/screens/logs/logs_list.dart';
-import 'package:adguard_home_manager/screens/logs/log_details_screen.dart';
+import 'package:adguard_home_manager/screens/logs/details/log_details_screen.dart';
 
 class Logs extends StatefulWidget {
   const Logs({Key? key}) : super(key: key);
diff --git a/lib/screens/logs/logs_config_modal.dart b/lib/screens/logs/logs_config_modal.dart
deleted file mode 100644
index 2f16721..0000000
--- a/lib/screens/logs/logs_config_modal.dart
+++ /dev/null
@@ -1,413 +0,0 @@
-import 'dart:io';
-
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-
-import 'package:adguard_home_manager/functions/compare_versions.dart';
-import 'package:adguard_home_manager/providers/app_config_provider.dart';
-import 'package:adguard_home_manager/providers/servers_provider.dart';
-
-class LogsConfigModal extends StatelessWidget {
-  final void Function(Map<String, dynamic>) onConfirm;
-  final void Function() onClear;
-  final bool dialog;
-  final String serverVersion;
-
-  const LogsConfigModal({
-    Key? key,
-    required this.onConfirm,
-    required this.onClear,
-    required this.dialog,
-    required this.serverVersion
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    final serversProvider = Provider.of<ServersProvider>(context);
-    final appConfigProvider = Provider.of<AppConfigProvider>(context);
-
-    return LogsConfigModalWidget(
-      serversProvider: serversProvider,
-      appConfigProvider: appConfigProvider,
-      context: context,
-      onConfirm: onConfirm,
-      onClear: onClear,
-      dialog: dialog,
-      serverVersion: serverVersion,
-    );
-  }
-}
-
-class LogsConfigModalWidget extends StatefulWidget {
-  final ServersProvider serversProvider;
-  final AppConfigProvider appConfigProvider;
-  final BuildContext context;
-  final void Function(Map<String, dynamic>) onConfirm;
-  final void Function() onClear;
-  final bool dialog;
-  final String serverVersion;
-
-  const LogsConfigModalWidget({
-    Key? key,
-    required this.serversProvider,
-    required this.appConfigProvider,
-    required this.context,
-    required this.onConfirm,
-    required this.onClear,
-    required this.dialog,
-    required this.serverVersion
-  }) : super(key: key);
-
-  @override
-  State<LogsConfigModalWidget> createState() => _LogsConfigModalWidgetState();
-}
-
-class _LogsConfigModalWidgetState extends State<LogsConfigModalWidget> {
-  bool generalSwitch = false;
-  bool anonymizeClientIp = false;
-  String? retentionTime = "";
-
-  List<Map<String, dynamic>> retentionItems = [];
-
-  int loadStatus = 0;
-
-  void loadData() async {
-    final serversProvider = Provider.of<ServersProvider>(context, listen: false);
-
-    final result = serverVersionIsAhead(
-      currentVersion: widget.serverVersion, 
-      referenceVersion: 'v0.107.28',
-      referenceVersionBeta: 'v0.108.0-b.33'
-    ) == true 
-      ? await serversProvider.apiClient!.getQueryLogInfo()
-      : await serversProvider.apiClient!.getQueryLogInfoLegacy();
-
-    if (mounted) {
-      if (result['result'] == 'success') {
-        setState(() {
-          generalSwitch = result['data']['enabled'];
-          anonymizeClientIp = result['data']['anonymize_client_ip'];
-          retentionTime = result['data']['interval'].toString();
-          loadStatus = 1;
-        });
-      }
-      else {
-        setState(() => loadStatus = 2);
-      }
-    }
-  }
-
-  @override
-  void initState() {
-    retentionItems = serverVersionIsAhead(
-      currentVersion: widget.serverVersion, 
-      referenceVersion: 'v0.107.28',
-      referenceVersionBeta: 'v0.108.0-b.33'
-    ) == true ? [
-      {
-        'label': AppLocalizations.of(widget.context)!.hours6,
-        'value': 21600000
-      },
-      {
-        'label': AppLocalizations.of(widget.context)!.hours24,
-        'value': 86400000
-      },
-      {
-        'label': AppLocalizations.of(widget.context)!.days7,
-        'value': 604800000
-      },
-      {
-        'label': AppLocalizations.of(widget.context)!.days30,
-        'value': 2592000000
-      },
-      {
-        'label': AppLocalizations.of(widget.context)!.days90,
-        'value': 7776000000
-      },
-    ] : [
-      {
-        'label': AppLocalizations.of(widget.context)!.hours6,
-        'value': 0.25
-      },
-      {
-        'label': AppLocalizations.of(widget.context)!.hours24,
-        'value': 1
-      },
-      {
-        'label': AppLocalizations.of(widget.context)!.days7,
-        'value': 7
-      },
-      {
-        'label': AppLocalizations.of(widget.context)!.days30,
-        'value': 30
-      },
-      {
-        'label': AppLocalizations.of(widget.context)!.days90,
-        'value': 90
-      },
-    ];
-
-    loadData();
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    Widget generateBody() {
-      switch (loadStatus) {
-        case 0:
-          return Padding(
-            padding: const EdgeInsets.all(24),
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              crossAxisAlignment: CrossAxisAlignment.center,
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                const CircularProgressIndicator(),
-                const SizedBox(height: 30),
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 20),
-                  child: Text(
-                    AppLocalizations.of(context)!.loadingLogsSettings,
-                    textAlign: TextAlign.center,
-                    style: TextStyle(
-                      fontSize: 22,
-                      color: Theme.of(context).colorScheme.onSurfaceVariant
-                    ),
-                  ),
-                )
-              ],
-            ),
-          );
-
-        case 1:
-          return Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Flexible(
-                child: SingleChildScrollView(
-                  child: Wrap(
-                    children: [
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          Column(
-                            children: [
-                              Padding(
-                                padding: const EdgeInsets.only(top: 24),
-                                child: Icon(
-                                  Icons.settings,
-                                  size: 24,
-                                  color: Theme.of(context).listTileTheme.iconColor
-                                ),
-                              ),
-                              const SizedBox(height: 16),
-                              Text(
-                                AppLocalizations.of(context)!.logsSettings,
-                                textAlign: TextAlign.center,
-                                style: TextStyle(
-                                  fontSize: 24,
-                                  color: Theme.of(context).colorScheme.onSurface
-                                ), 
-                              ),
-                              const SizedBox(height: 16),
-                            ],
-                          ),
-                        ],
-                      ),
-                      Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 24),
-                        child: Material(
-                          color: Theme.of(context).colorScheme.primary.withOpacity(0.1),
-                          borderRadius: BorderRadius.circular(28),
-                          child: InkWell(
-                            onTap: () => setState(() => generalSwitch = !generalSwitch),
-                            borderRadius: BorderRadius.circular(28),
-                            child: Padding(
-                              padding: const EdgeInsets.symmetric(
-                                horizontal: 20,
-                                vertical: 8
-                              ),
-                              child: Row(
-                                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                children: [
-                                  Text(
-                                    AppLocalizations.of(context)!.enableLog,
-                                    style: const TextStyle(
-                                      fontSize: 18,
-                                    ),
-                                  ),
-                                  Switch(
-                                    value: generalSwitch, 
-                                    onChanged: (value) => setState(() => generalSwitch = value),
-                                  )
-                                ],
-                              ),
-                            ),
-                          ),
-                        ),
-                      ),
-                      Container(height: 16),
-                      Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 14),
-                        child: Column(
-                          children: [
-                            Material(
-                              color: Colors.transparent,
-                              child: InkWell(
-                                onTap: () => setState(() => anonymizeClientIp = !anonymizeClientIp),
-                                child: Padding(
-                                  padding: const EdgeInsets.symmetric(horizontal: 30),
-                                  child: Row(
-                                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                    children: [
-                                      Text(
-                                        AppLocalizations.of(context)!.anonymizeClientIp,
-                                        style: const TextStyle(
-                                          fontSize: 16
-                                        ),
-                                      ),
-                                      Switch(
-                                        value: anonymizeClientIp, 
-                                        onChanged: (value) => setState(() => anonymizeClientIp = value),
-                                      )
-                                    ],
-                                  ),
-                                ),
-                              ),
-                            ),
-                            Container(height: 16),
-                            Padding(
-                              padding: const EdgeInsets.symmetric(horizontal: 24),
-                              child: DropdownButtonFormField(
-                                items: retentionItems.map<DropdownMenuItem<String>>((Map<String, dynamic> item) {
-                                  return DropdownMenuItem<String>(
-                                    value: item['value'].toString(),
-                                    child: Text(item['label']),
-                                  );
-                                }).toList(),
-                                value: retentionTime,
-                                onChanged: (value) => setState(() => retentionTime = value),
-                                decoration: InputDecoration(
-                                  border: const OutlineInputBorder(
-                                    borderRadius: BorderRadius.all(
-                                      Radius.circular(10)
-                                    )
-                                  ),
-                                  label: Text(AppLocalizations.of(context)!.retentionTime)
-                                ),
-                                borderRadius: BorderRadius.circular(20),
-                              ),
-                            ),
-                          ],
-                        ),
-                      )
-                    ],
-                  ),
-                ),
-              ),
-              Padding(
-                padding: const EdgeInsets.all(24),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    TextButton(
-                      onPressed: () {
-                        Navigator.pop(context);
-                        widget.onClear();
-                      }, 
-                      child: Text(AppLocalizations.of(context)!.clearLogs)
-                    ),
-                    Row(
-                      children: [
-                        TextButton(
-                          onPressed: () => Navigator.pop(context), 
-                          child: Text(AppLocalizations.of(context)!.cancel)
-                        ),
-                        const SizedBox(width: 20),
-                        TextButton(
-                          onPressed: retentionTime != ''
-                            ? () {
-                              Navigator.pop(context);
-                              widget.onConfirm({
-                                "enabled": generalSwitch,
-                                "interval": double.parse(retentionTime!),
-                                "anonymize_client_ip": anonymizeClientIp
-                              });
-                            }
-                            : null, 
-                          child: Text(
-                            AppLocalizations.of(context)!.confirm,
-                            style: TextStyle(
-                              color: retentionTime != ''
-                                ? Theme.of(context).colorScheme.primary
-                                : Colors.grey
-                            ),
-                          )
-                        ),
-                      ],
-                    )
-                  ],
-                ),
-              ),
-              if (Platform.isIOS) const SizedBox(height: 16)
-            ],
-          );
-
-        case 2:
-          return Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            crossAxisAlignment: CrossAxisAlignment.center,
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              const Icon(
-                Icons.error,
-                color: Colors.red,
-                size: 50,
-              ),
-              const SizedBox(height: 30),
-              Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 20),
-                child: Text(
-                  AppLocalizations.of(context)!.logSettingsNotLoaded,
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    fontSize: 22,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant
-                  ),
-                ),
-              )
-            ],
-          );
-
-        default:
-          return const SizedBox();
-      }
-    }
-
-    if (widget.dialog == true) {
-      return Dialog(
-        child: ConstrainedBox(
-          constraints: const BoxConstraints(
-            maxWidth: 500
-          ),
-          child: generateBody()
-        ),
-      );
-    }
-    else {
-      return Container(
-        height: Platform.isIOS ? 436 : 420,
-        decoration: BoxDecoration(
-          borderRadius: const BorderRadius.only(
-            topLeft: Radius.circular(28),
-            topRight: Radius.circular(28)
-          ),
-          color: Theme.of(context).dialogBackgroundColor
-        ),
-        child: generateBody()
-      );
-    }
-  }
-}
\ No newline at end of file
diff --git a/lib/screens/logs/logs_list.dart b/lib/screens/logs/logs_list.dart
index 72978ce..ac0596a 100644
--- a/lib/screens/logs/logs_list.dart
+++ b/lib/screens/logs/logs_list.dart
@@ -4,7 +4,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/logs/log_details_screen.dart';
+import 'package:adguard_home_manager/screens/logs/details/log_details_screen.dart';
 import 'package:adguard_home_manager/screens/logs/log_tile.dart';
 import 'package:adguard_home_manager/screens/logs/logs_list_appbar.dart';
 
diff --git a/lib/screens/logs/logs_list_appbar.dart b/lib/screens/logs/logs_list_appbar.dart
index 39b4548..8e02aed 100644
--- a/lib/screens/logs/logs_list_appbar.dart
+++ b/lib/screens/logs/logs_list_appbar.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/logs/logs_config_modal.dart';
-import 'package:adguard_home_manager/screens/logs/logs_filters_modal.dart';
+import 'package:adguard_home_manager/screens/logs/filters/logs_filters_modal.dart';
+import 'package:adguard_home_manager/screens/logs/configuration/logs_config_modal.dart';
 
 import 'package:adguard_home_manager/classes/process_modal.dart';
 import 'package:adguard_home_manager/constants/enums.dart';
diff --git a/lib/screens/settings/dhcp/select_interface_modal.dart b/lib/screens/settings/dhcp/select_interface_modal.dart
index 668548d..0a740fd 100644
--- a/lib/screens/settings/dhcp/select_interface_modal.dart
+++ b/lib/screens/settings/dhcp/select_interface_modal.dart
@@ -90,9 +90,7 @@ class SelectInterfaceModal extends StatelessWidget {
     }
     else {
       return GestureDetector(
-      onTap: () => Navigator.of(context).pop(),
-      child: Container(
-        color: Colors.transparent,
+        onTap: () => Navigator.of(context).pop(),
         child: DraggableScrollableSheet(
           initialChildSize: 0.6,
           minChildSize: 0.3,
@@ -154,8 +152,7 @@ class SelectInterfaceModal extends StatelessWidget {
             );
           },
         ),
-      ),
-    );
+      );
     }
   }
 }
\ No newline at end of file