diff --git a/lib/services/notification/firebase_api.dart b/lib/services/notification/firebase_api.dart
index 578caec..dc2448a 100644
--- a/lib/services/notification/firebase_api.dart
+++ b/lib/services/notification/firebase_api.dart
@@ -16,9 +16,9 @@ class FirebaseApi {
   Future<void> initNotification() async {
     try {
       fcmToken = await _firebaseMessaging.getToken();
-      if (kDebugMode) {
-        print("fCMToken: $fcmToken");
-      }
+      // if (kDebugMode) {
+      print("fCMToken: $fcmToken");
+      // }
     } catch (e) {
       e.printError();
     }
diff --git a/lib/views/authentication/screens/username.dart b/lib/views/authentication/screens/username.dart
index 9edecdd..7227e26 100644
--- a/lib/views/authentication/screens/username.dart
+++ b/lib/views/authentication/screens/username.dart
@@ -80,7 +80,7 @@ class _UsernameInputState extends State<UsernameInput> {
                       .copyWith(color: Theme.of(context).colorScheme.primary),
                   recognizer: TapGestureRecognizer()
                     ..onTap = () => launchUrlString(
-                          'https://didvan.app/terms-of-use#conditions',
+                          'https://didvan.com/terms-of-use#conditions',
                         ),
                 ),
                 const TextSpan(text: 'و\n'),
@@ -92,7 +92,7 @@ class _UsernameInputState extends State<UsernameInput> {
                       .copyWith(color: Theme.of(context).colorScheme.primary),
                   recognizer: TapGestureRecognizer()
                     ..onTap = () => launchUrlString(
-                          'https://didvan.app/terms-of-use#privacy',
+                          'https://didvan.com/terms-of-use#privacy',
                         ),
                 ),
                 const TextSpan(text: 'را می‌پذیرم'),
diff --git a/lib/views/customize_category/favorites_step.dart b/lib/views/customize_category/favorites_step.dart
index 027c338..9a4a653 100644
--- a/lib/views/customize_category/favorites_step.dart
+++ b/lib/views/customize_category/favorites_step.dart
@@ -49,10 +49,12 @@ class _FavoritesStepState extends State<FavoritesStep> {
       child: Stack(
         children: [
           DidvanScaffold(
-            appBarData: AppBarData(
-              hasBack: true,
-              title: 'شخصی‌سازی محتوا',
-            ),
+            appBarData: state.toTimer
+                ? null
+                : AppBarData(
+                    hasBack: true,
+                    title: 'شخصی‌سازی محتوا',
+                  ),
             physics: const BouncingScrollPhysics(),
             hidePlayer: true,
             padding: const EdgeInsets.all(16).copyWith(bottom: 92),
diff --git a/lib/views/home/home.dart b/lib/views/home/home.dart
index 0b25bec..1ef4c54 100644
--- a/lib/views/home/home.dart
+++ b/lib/views/home/home.dart
@@ -476,7 +476,6 @@ class _HomeState extends State<Home>
               },
               isBackgroundDropBlur: true,
               confrimTitle: 'بله',
-              onDismissed: Navigator.of(navigatorKey.currentContext!).pop,
               dismissTitle: 'خیر',
             ));
           } else {
diff --git a/lib/views/notification_time/notification_time.dart b/lib/views/notification_time/notification_time.dart
index f31aea7..27311a4 100644
--- a/lib/views/notification_time/notification_time.dart
+++ b/lib/views/notification_time/notification_time.dart
@@ -48,10 +48,12 @@ class _NotificationTimeState extends State<NotificationTime> {
       child: Stack(
         children: [
           DidvanScaffold(
-            appBarData: AppBarData(
-              hasBack: true,
-              title: 'زمان دریافت اعلان',
-            ),
+            appBarData: state.fromFav
+                ? null
+                : AppBarData(
+                    hasBack: true,
+                    title: 'زمان دریافت اعلان',
+                  ),
             physics: const BouncingScrollPhysics(),
             hidePlayer: true,
             padding: const EdgeInsets.all(16),
diff --git a/lib/views/notification_time/notification_time_state.dart b/lib/views/notification_time/notification_time_state.dart
index b90d87d..eec962a 100644
--- a/lib/views/notification_time/notification_time_state.dart
+++ b/lib/views/notification_time/notification_time_state.dart
@@ -1,5 +1,6 @@
 import 'package:didvan/models/enums.dart';
 import 'package:didvan/providers/core.dart';
+import 'package:didvan/routes/routes.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -59,7 +60,6 @@ class NotificationTimeState extends CoreProvier {
           if (fromFav) {
             Navigator.of(context).pop();
             Navigator.of(context).pop();
-            Navigator.of(context).pop();
           } else {
             Navigator.of(context).pop();
           }
diff --git a/lib/views/notification_time/widgets/custom_cupertino_date_picker.dart b/lib/views/notification_time/widgets/custom_cupertino_date_picker.dart
index 2e9524a..be86d1c 100644
--- a/lib/views/notification_time/widgets/custom_cupertino_date_picker.dart
+++ b/lib/views/notification_time/widgets/custom_cupertino_date_picker.dart
@@ -55,11 +55,11 @@ class _CustomCupertinoDatePickerState extends State<CustomCupertinoDatePicker> {
   void initState() {
     super.initState();
 
-    for (int i = 1; i < 12 + 1; i++) {
+    for (int i = 0; i < 12 + 1; i++) {
       String twoDigitNumber = i.toString().padLeft(2, '0');
       _timeH.add(twoDigitNumber);
     }
-    for (int i = 1; i < 12 + 1; i++) {
+    for (int i = 1; i < 11 + 1; i++) {
       String twoDigitNumber = i.toString().padLeft(2, '0');
       _timeH.add(twoDigitNumber);
     }
@@ -189,7 +189,10 @@ class _CustomCupertinoDatePickerState extends State<CustomCupertinoDatePicker> {
               child: Container(
                 height: 64,
                 decoration: BoxDecoration(
-                    color: Theme.of(context).colorScheme.primary.withOpacity(widget.disable? 0.2: 1),
+                    color: Theme.of(context)
+                        .colorScheme
+                        .primary
+                        .withOpacity(widget.disable ? 0.2 : 1),
                     borderRadius: BorderRadius.circular(18)),
                 child: const Padding(
                   padding: EdgeInsets.symmetric(vertical: 12),
diff --git a/lib/views/profile/profile.dart b/lib/views/profile/profile.dart
index 4d3936b..78596a6 100644
--- a/lib/views/profile/profile.dart
+++ b/lib/views/profile/profile.dart
@@ -222,7 +222,7 @@ class _ProfilePageState extends State<ProfilePage> {
                           icon: DidvanIcons.info_circle_regular,
                           title: 'معرفی دیدوان',
                           onTap: () =>
-                              launchUrlString('https://didvan.app/#info'),
+                              launchUrlString('https://didvan.com/#info'),
                         ),
                         const DidvanDivider(),
                         MenuOption(
@@ -339,7 +339,7 @@ class _ProfilePageState extends State<ProfilePage> {
                           icon: DidvanIcons.alert_regular,
                           title: 'حریم خصوصی',
                           onTap: () => launchUrlString(
-                            'https://didvan.app/terms-of-use#privacy',
+                            'https://didvan.com/terms-of-use#privacy',
                           ),
                         ),
                       ],
diff --git a/web/index.html b/web/index.html
index 2ffa504..5761fa8 100644
--- a/web/index.html
+++ b/web/index.html
@@ -28,7 +28,12 @@
 
     <!-- Favicon -->
     <link rel="icon" type="image/png" href="favicon.png" />
-
+    <script>
+      // Import the functions you need from the SDKs you need
+      import { initializeApp } from "https://www.gstatic.com/firebasejs/9.9.1/firebase-app.js";
+      import { getAnalytics } from "https://www.gstatic.com/firebasejs/9.9.1/firebase-analytics.js";
+      import { getMessaging } from "https://www.gstatic.com/firebasejs/9.9.1/firebase-messagin.js";
+    </script>
     <title>Didvan</title>
     <link rel="manifest" href="manifest.json" />
     <style>