diff --git a/lib/screens/mobile/dashboard.dart b/lib/screens/mobile/dashboard.dart
index a74e6094..8da58375 100644
--- a/lib/screens/mobile/dashboard.dart
+++ b/lib/screens/mobile/dashboard.dart
@@ -1,15 +1,15 @@
-import 'package:apidash/screens/history/history_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flex_color_scheme/flex_color_scheme.dart';
 import 'package:apidash/extensions/extensions.dart';
 import 'package:apidash/providers/providers.dart';
-import '../settings_page.dart';
-import 'navbar.dart';
 import 'requests_page/requests_page.dart';
 import '../envvar/environment_page.dart';
+import '../history/history_page.dart';
+import '../settings_page.dart';
 import 'widgets/page_base.dart';
+import 'navbar.dart';
 
 class MobileDashboard extends ConsumerStatefulWidget {
   const MobileDashboard({super.key});
diff --git a/lib/utils/history_utils.dart b/lib/utils/history_utils.dart
index c91a5e68..cce87998 100644
--- a/lib/utils/history_utils.dart
+++ b/lib/utils/history_utils.dart
@@ -1,6 +1,6 @@
-import 'package:apidash/utils/convert_utils.dart';
 import 'package:apidash/models/models.dart';
 import 'package:apidash/consts.dart';
+import 'convert_utils.dart';
 
 DateTime stripTime(DateTime dateTime) {
   return DateTime(dateTime.year, dateTime.month, dateTime.day);
@@ -116,7 +116,7 @@ List<HistoryMetaModel> getRequestGroup(
 
 DateTime? getRetentionDate(HistoryRetentionPeriod retentionPeriod) {
   DateTime now = DateTime.now();
-  DateTime today = DateTime(now.year, now.month, now.day);
+  DateTime today = stripTime(now);
 
   switch (retentionPeriod) {
     case HistoryRetentionPeriod.oneWeek:
diff --git a/lib/widgets/card_history_request.dart b/lib/widgets/card_history_request.dart
index a76e477c..228cbf5b 100644
--- a/lib/widgets/card_history_request.dart
+++ b/lib/widgets/card_history_request.dart
@@ -1,7 +1,7 @@
-import 'package:apidash/models/history_meta_model.dart';
 import 'package:flutter/material.dart';
-import 'package:apidash/consts.dart';
+import 'package:apidash/models/models.dart';
 import 'package:apidash/utils/utils.dart';
+import 'package:apidash/consts.dart';
 import 'texts.dart';
 
 class HistoryRequestCard extends StatelessWidget {
diff --git a/lib/widgets/card_sidebar_history.dart b/lib/widgets/card_sidebar_history.dart
index be6387b3..9b1a9f20 100644
--- a/lib/widgets/card_sidebar_history.dart
+++ b/lib/widgets/card_sidebar_history.dart
@@ -1,7 +1,7 @@
-import 'package:apidash/models/history_meta_model.dart';
 import 'package:flutter/material.dart';
-import 'package:apidash/consts.dart';
+import 'package:apidash/models/models.dart';
 import 'package:apidash/utils/utils.dart';
+import 'package:apidash/consts.dart';
 import 'texts.dart' show MethodBox;
 
 class SidebarHistoryCard extends StatelessWidget {
diff --git a/lib/widgets/table_request.dart b/lib/widgets/table_request.dart
index 010aaa27..8c3d9055 100644
--- a/lib/widgets/table_request.dart
+++ b/lib/widgets/table_request.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:data_table_2/data_table_2.dart';
-import 'package:apidash/widgets/widgets.dart';
 import 'package:apidash/consts.dart';
+import 'field_read_only.dart';
 
 class RequestDataTable extends StatelessWidget {
   const RequestDataTable({
diff --git a/lib/widgets/table_request_form.dart b/lib/widgets/table_request_form.dart
index a61c0cd7..91a1b39d 100644
--- a/lib/widgets/table_request_form.dart
+++ b/lib/widgets/table_request_form.dart
@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:data_table_2/data_table_2.dart';
-import 'package:apidash/widgets/widgets.dart';
 import 'package:apidash/models/models.dart';
 import 'package:apidash/consts.dart';
+import 'button_form_data_file.dart';
+import 'field_read_only.dart';
 
 class RequestFormDataTable extends StatelessWidget {
   const RequestFormDataTable({
diff --git a/test/providers/ui_providers_test.dart b/test/providers/ui_providers_test.dart
index 1bd76c4d..81fb7656 100644
--- a/test/providers/ui_providers_test.dart
+++ b/test/providers/ui_providers_test.dart
@@ -1,5 +1,4 @@
 import 'dart:io';
-
 import 'package:spot/spot.dart';
 import 'package:apidash/consts.dart';
 import 'package:apidash/providers/providers.dart';