diff --git a/Diary/Diary/AppShell.xaml b/Diary/Diary/AppShell.xaml
index d0f7ee4..613d979 100644
--- a/Diary/Diary/AppShell.xaml
+++ b/Diary/Diary/AppShell.xaml
@@ -62,7 +62,7 @@
         </DataTemplate>
     </Shell.ItemTemplate>
 
-    <FlyoutItem Title="Entries">
+    <FlyoutItem Title="{x:Static t:AppShellTexts.Entries_FlyoutItem_Title}">
         <FlyoutItem.Icon>
             <FontImageSource
                 FontFamily="{Static f:Fonts.FontAwesome}"
@@ -70,11 +70,11 @@
                 Color="{StaticResource PrimaryLightText}" />
         </FlyoutItem.Icon>
         <ShellContent
-            Title="Entries"
+            Title="{x:Static t:AppShellTexts.Entries_FlyoutItem_Title}"
             ContentTemplate="{DataTemplate entryviews:EntryListView}"
             Route="entries" />
     </FlyoutItem>
-    <FlyoutItem Title="Time machine">
+    <FlyoutItem Title="{x:Static t:AppShellTexts.TimeMachine_FlyoutItem_Title}">
         <FlyoutItem.Icon>
             <FontImageSource
                 FontFamily="{Static f:Fonts.FontAwesome}"
@@ -82,11 +82,11 @@
                 Color="{StaticResource PrimaryLightText}" />
         </FlyoutItem.Icon>
         <ShellContent
-            Title="Time machine"
+            Title="{x:Static t:AppShellTexts.TimeMachine_FlyoutItem_Title}"
             ContentTemplate="{DataTemplate entryviews:TimeMachineView}"
             Route="TimeMachine" />
     </FlyoutItem>
-    <FlyoutItem Title="Templates">
+    <FlyoutItem Title="{x:Static t:AppShellTexts.Templates_FlyoutItem_Title}">
         <FlyoutItem.Icon>
             <FontImageSource
                 FontFamily="{Static f:Fonts.FontAwesome}"
@@ -94,11 +94,11 @@
                 Color="{StaticResource PrimaryLightText}" />
         </FlyoutItem.Icon>
         <ShellContent
-            Title="Templates"
+            Title="{x:Static t:AppShellTexts.Templates_FlyoutItem_Title}"
             ContentTemplate="{DataTemplate templateviews:TemplateListView}"
             Route="templates" />
     </FlyoutItem>
-    <FlyoutItem Title="Labels">
+    <FlyoutItem Title="{x:Static t:AppShellTexts.Labels_FlyoutItem_Title}">
         <FlyoutItem.Icon>
             <FontImageSource
                 FontFamily="{Static f:Fonts.FontAwesome}"
@@ -106,7 +106,7 @@
                 Color="{StaticResource PrimaryLightText}" />
         </FlyoutItem.Icon>
         <ShellContent
-            Title="Labels"
+            Title="{x:Static t:AppShellTexts.Labels_FlyoutItem_Title}"
             ContentTemplate="{DataTemplate labelviews:LabelListView}"
             Route="labels" />
     </FlyoutItem>
@@ -135,7 +135,7 @@
             Route="mood" />
     </FlyoutItem>
 
-    <FlyoutItem Title="Import &amp; Export">
+    <FlyoutItem Title="{x:Static t:AppShellTexts.ImportExport_FlyoutItem_Title}">
         <FlyoutItem.Icon>
             <FontImageSource
                 FontFamily="{Static f:Fonts.FontAwesome}"
@@ -143,12 +143,12 @@
                 Color="{StaticResource PrimaryLightText}" />
         </FlyoutItem.Icon>
         <ShellContent
-            Title="Import &amp; Export"
+            Title="{x:Static t:AppShellTexts.ImportExport_FlyoutItem_Title}"
             ContentTemplate="{DataTemplate importexportviews:ImportExportView}"
             Route="importexport" />
     </FlyoutItem>
 
-    <FlyoutItem Title="Map">
+    <FlyoutItem Title="{x:Static t:AppShellTexts.Map_FlyoutItem_Title}">
         <FlyoutItem.Icon>
             <FontImageSource
                 FontFamily="{Static f:Fonts.FontAwesome}"
@@ -156,7 +156,7 @@
                 Color="{StaticResource PrimaryLightText}" />
         </FlyoutItem.Icon>
         <ShellContent
-            Title="Map"
+            Title="{x:Static t:AppShellTexts.Map_FlyoutItem_Title}"
             ContentTemplate="{DataTemplate mapviews:MapView}"
             Route="map" />
     </FlyoutItem>
diff --git a/Diary/Diary/Clients/EntryClient.cs b/Diary/Diary/Clients/EntryClient.cs
index a4a74ef..a936de6 100644
--- a/Diary/Diary/Clients/EntryClient.cs
+++ b/Diary/Diary/Clients/EntryClient.cs
@@ -48,12 +48,12 @@ public async Task<ICollection<EntryListModel>> GetAllAsync(EntryFilterModel? ent
 
         if (entryFilter?.DateFrom != null)
         {
-            entities = entities.Where(e => e.CreatedAt >= entryFilter.DateFrom).ToList();
+            entities = entities.Where(e => e.DateTime >= entryFilter.DateFrom).ToList();
         }
 
         if (entryFilter?.DateTo != null)
         {
-            entities = entities.Where(e => e.CreatedAt < entryFilter.DateTo.Value.AddDays(1)).ToList();
+            entities = entities.Where(e => e.DateTime < entryFilter.DateTo.Value.AddDays(1)).ToList();
         }
 
         if (entryFilter?.OrderByProperty != null)
@@ -76,7 +76,7 @@ public async Task<ICollection<EntryListModel>> GetAllAsync(EntryFilterModel? ent
     public async Task<ICollection<EntryListModel>> GetByDayFromPreviousYearsAsync(DateTime date)
     {
         var entities = await _entryRepository.GetByDayFromPreviousYearsAsync(date);
-        entities = entities.OrderByDescending(e => e.CreatedAt).ToList();
+        entities = entities.OrderByDescending(e => e.DateTime).ToList();
 
         return entities.MapToListModels();
     }
@@ -94,13 +94,20 @@ public async Task<ICollection<EntryListModel>> GetByDayFromPreviousYearsAsync(Da
     /// </summary>
     public async Task<EntryDetailModel> SetAsync(EntryDetailModel model)
     {
+        DateTime? oldDateTime = null;
+        if (model.Id != Guid.Empty)
+        {
+            var oldEntity = await _entryRepository.GetByIdAsync(model.Id);
+            oldDateTime = oldEntity?.DateTime;
+        }
+
         var entity = model.MapToEntity();
         var savedEntity = await _entryRepository.SetAsync(entity);
         await _mediaRepository.DeleteIfUnusedAsync(entity.Media);
         await MediaFileService.DeleteUnusedFilesAsync(_mediaRepository);
 
 #if ANDROID
-        await ScheduleTimeMachineNotificationAsync(savedEntity);
+        await ScheduleTimeMachineNotificationAsync(savedEntity, oldDateTime);
 #endif
         return savedEntity.MapToDetailModel();
     }
@@ -144,46 +151,73 @@ public async Task<ICollection<PinModel>> GetAllLocationPinsAsync()
         return entitiesWithLocation.MapToPinModels();
     }
 
-    private async Task ScheduleTimeMachineNotificationAsync(EntryEntity entity)
+    private async Task ScheduleTimeMachineNotificationAsync(EntryEntity entity, DateTime? oldDateTime)
     {
         if (await LocalNotificationCenter.Current.AreNotificationsEnabled() == false)
         {
             await LocalNotificationCenter.Current.RequestNotificationPermission();
         }
 
+        if (oldDateTime != null) // If the entry is being updated, the old notification must be updated or removed
+        {
+            var oldNotificationId = Helpers.NotificationHelper.GetNotificationIdFromCreationDate(oldDateTime.Value);
+            var entriesWithOldNotificationId = await _entryRepository.GetByNotificationIdAsync(oldNotificationId);
+
+            LocalNotificationCenter.Current.Cancel(oldNotificationId);
+
+            if (entriesWithOldNotificationId.Count > 0)
+            {
+                var previousNotification = CreateNotification(oldNotificationId, oldDateTime.Value, entriesWithOldNotificationId.Count);
+                await LocalNotificationCenter.Current.Show(previousNotification);
+            }
+        }
+
         var entriesWithTheSameNotificationId = await _entryRepository.GetByNotificationIdAsync(entity.NotificationId);
 
-        TimeSpan repeatInterval;
-        DateTime notificationDate = entity.CreatedAt.AddYears(1);
+        LocalNotificationCenter.Current.Cancel(entity.NotificationId);
 
-        if (entity.CreatedAt.Month == 2 && entity.CreatedAt.Day == 29)
+        var request = CreateNotification(entity.NotificationId, entity.DateTime, entriesWithTheSameNotificationId.Count);
+
+        await LocalNotificationCenter.Current.Show(request);
+    }
+
+    private NotificationRequest CreateNotification(int notificationId, DateTime date, int numOfEntries)
+    {
+        TimeSpan interval;
+
+        if (date.Month == 2 && date.Day == 29)
         {
-            notificationDate = entity.CreatedAt.AddYears(4);
-            repeatInterval = TimeSpan.FromDays(365 * 3 + 366);
+            while (date < DateTime.Now) // Notification date must be in the future
+            {
+                date = date.AddYears(4);
+            }
+            interval = TimeSpan.FromDays(365 * 3 + 366);
         }
         else
         {
-            repeatInterval = notificationDate - entity.CreatedAt;
+            while (date < DateTime.Now) // Notification date must be in the future
+            {
+                date = date.AddYears(1);
+            }
+            interval = TimeSpan.FromDays(365);
         }
 
-        var request = new NotificationRequest
+
+        var entryText = numOfEntries > 1 ? "entries" : "entry";
+
+        return new NotificationRequest
         {
-            NotificationId = entity.NotificationId,
+            NotificationId = notificationId,
             Title = "Diary Time Machine",
-            Description = $"You have already written {entriesWithTheSameNotificationId.Count} entries on this day in the past.",
+            Description = $"You have already written {numOfEntries} {entryText} on this day in the past.",
 
             Schedule = new NotificationRequestSchedule
             {
-                NotifyTime = notificationDate,
-                NotifyRepeatInterval = repeatInterval,
+                NotifyTime = date,
+                NotifyRepeatInterval = interval,
                 RepeatType = NotificationRepeat.TimeInterval
             },
             Android = { Priority = AndroidPriority.High }
         };
-
-        // Remove scheduled notification with out-of-date number of diary entries written on the same day
-        LocalNotificationCenter.Current.Cancel([entity.NotificationId]);
-
-        await LocalNotificationCenter.Current.Show(request);
     }
 }
diff --git a/Diary/Diary/Converters/IntToMoodEmojiConverter.cs b/Diary/Diary/Converters/IntToMoodEmojiConverter.cs
index 5ade9f0..9988e12 100644
--- a/Diary/Diary/Converters/IntToMoodEmojiConverter.cs
+++ b/Diary/Diary/Converters/IntToMoodEmojiConverter.cs
@@ -5,7 +5,7 @@ namespace Diary.Converters
 {
     public class IntToMoodEmojiConverter : BaseConverterOneWay<int, string>
     {
-        private static readonly string _defaultMoodEmoji = "😢";
+        private static readonly string _defaultMoodEmoji = ":(";
 
         public override string ConvertFrom(int value, CultureInfo? culture = null)
         {
diff --git a/Diary/Diary/Converters/IntToMoodIconConverter.cs b/Diary/Diary/Converters/IntToMoodIconConverter.cs
index 28c75b4..08e3270 100644
--- a/Diary/Diary/Converters/IntToMoodIconConverter.cs
+++ b/Diary/Diary/Converters/IntToMoodIconConverter.cs
@@ -8,7 +8,7 @@ public class IntToMoodIconConverter : BaseConverterOneWay<int, string>
 {
     private static readonly string _defaultMoodIconName = "";
 
-    public override string ConvertFrom(int value, CultureInfo? culture)
+    public override string ConvertFrom(int value, CultureInfo? culture = null)
     {
         return value switch
         {
diff --git a/Diary/Diary/Entities/EntryEntity.cs b/Diary/Diary/Entities/EntryEntity.cs
index 780cec8..206fc51 100644
--- a/Diary/Diary/Entities/EntryEntity.cs
+++ b/Diary/Diary/Entities/EntryEntity.cs
@@ -8,9 +8,7 @@ public class EntryEntity : EntityBase
 
         public string Content { get; set; } = string.Empty;
 
-        public DateTime CreatedAt { get; set; }
-
-        public DateTime EditedAt { get; set; }
+        public DateTime DateTime { get; set; }
 
         public bool IsFavorite { get; set; }
 
diff --git a/Diary/Diary/Enums/EntryFilterEnums.cs b/Diary/Diary/Enums/EntryFilterEnums.cs
index 87642bf..bb2ddf3 100644
--- a/Diary/Diary/Enums/EntryFilterEnums.cs
+++ b/Diary/Diary/Enums/EntryFilterEnums.cs
@@ -10,8 +10,8 @@ public enum OrderByProperty
             [Display(Name = nameof(EntryEntity.Title))]
             Title,
 
-            [Display(Name = nameof(EntryEntity.CreatedAt))]
-            CreatedAt,
+            [Display(Name = nameof(EntryEntity.DateTime))]
+            DateTime,
 
             [Display(Name = nameof(EntryEntity.Mood))]
             Mood,
diff --git a/Diary/Diary/Mappers/EntryMapper.cs b/Diary/Diary/Mappers/EntryMapper.cs
index e4e6fb8..2ba192d 100644
--- a/Diary/Diary/Mappers/EntryMapper.cs
+++ b/Diary/Diary/Mappers/EntryMapper.cs
@@ -20,7 +20,7 @@ public static partial class EntryMapper
 
     public static partial ICollection<EntryListModel> MapToListModels(this ICollection<EntryEntity> entities);
 
-    [MapProperty(nameof(EntryEntity.CreatedAt), nameof(MoodListModel.DateTime))]
+    [MapProperty(nameof(EntryEntity.DateTime), nameof(MoodListModel.DateTime))]
     public static partial MoodListModel MapToMoodListModel(this EntryEntity entities);
 
     public static partial ICollection<MoodListModel> MapToMoodListModels(this ICollection<EntryEntity> entities);
@@ -31,7 +31,7 @@ public static PinModel MapToPinModel(this EntryEntity entity)
         {
             EntryId = entity.Id,
             Title = entity.Title,
-            Description = $"Created: {entity.CreatedAt.ToString(Constants.MapDateTimeFormat)}",
+            Description = $"Created: {entity.DateTime.ToString(Constants.MapDateTimeFormat)}",
             Location = new Location()
             {
                 Latitude = entity.Latitude ?? 0,
diff --git a/Diary/Diary/MauiProgram.cs b/Diary/Diary/MauiProgram.cs
index 6c33ba2..1d0cc40 100644
--- a/Diary/Diary/MauiProgram.cs
+++ b/Diary/Diary/MauiProgram.cs
@@ -149,6 +149,9 @@ private static void RegisterRoutes()
             Routing.RegisterRoute("//templates/create", typeof(TemplateCreateView));
 
             Routing.RegisterRoute("//importexport", typeof(ImportExportView));
+
+            Routing.RegisterRoute("//map/detail", typeof(EntryDetailView));
+            Routing.RegisterRoute("//map/edit", typeof(EntryEditView));
         }
 
         private static void SetupDirectories()
diff --git a/Diary/Diary/Models/Entry/EntryDetailModel.cs b/Diary/Diary/Models/Entry/EntryDetailModel.cs
index f1f649a..c3a7dc6 100644
--- a/Diary/Diary/Models/Entry/EntryDetailModel.cs
+++ b/Diary/Diary/Models/Entry/EntryDetailModel.cs
@@ -9,8 +9,7 @@ public record EntryDetailModel : ModelBase
     public required Guid Id { get; set; }
     public string Title { get; set; } = string.Empty;
     public string Content { get; set; } = string.Empty;
-    public DateTime CreatedAt { get; set; }
-    public DateTime EditedAt { get; set; }
+    public DateTime DateTime { get; set; }
     public bool IsFavorite { get; set; }
 
     [Range(1, 5)]
diff --git a/Diary/Diary/Models/Entry/EntryFilterModel.cs b/Diary/Diary/Models/Entry/EntryFilterModel.cs
index d849ccd..1ad0510 100644
--- a/Diary/Diary/Models/Entry/EntryFilterModel.cs
+++ b/Diary/Diary/Models/Entry/EntryFilterModel.cs
@@ -8,7 +8,7 @@ namespace Diary.Models.Entry
 {
     public record EntryFilterModel : ModelBase
     {
-        public OrderByProperty? OrderByProperty { get; set; } = EntryFilterEnums.OrderByProperty.CreatedAt;
+        public OrderByProperty? OrderByProperty { get; set; } = EntryFilterEnums.OrderByProperty.DateTime;
 
         public OrderByDirection? OrderByDirection { get; set; } = EntryFilterEnums.OrderByDirection.Descending;
 
diff --git a/Diary/Diary/Models/Entry/EntryListModel.cs b/Diary/Diary/Models/Entry/EntryListModel.cs
index 989a7ea..f85c447 100644
--- a/Diary/Diary/Models/Entry/EntryListModel.cs
+++ b/Diary/Diary/Models/Entry/EntryListModel.cs
@@ -4,8 +4,7 @@ public record EntryListModel : ModelBase
     public required Guid Id { get; set; }
     public string Title { get; set; } = string.Empty;
     public string Content { get; set; } = string.Empty;
-    public DateTime CreatedAt { get; set; }
-    public DateTime EditedAt { get; set; }
+    public DateTime DateTime { get; set; }
     public bool IsFavorite { get; set; }
     public int MediaCount { get; init; }
 }
diff --git a/Diary/Diary/Repositories/EntryRepository.cs b/Diary/Diary/Repositories/EntryRepository.cs
index f50d37d..3b6e575 100644
--- a/Diary/Diary/Repositories/EntryRepository.cs
+++ b/Diary/Diary/Repositories/EntryRepository.cs
@@ -25,7 +25,7 @@ public async Task<ICollection<EntryEntity>> GetByDayFromPreviousYearsAsync(DateT
         var entities = await GetAllAsync();
 
         entities = entities
-            .Where(e => e.CreatedAt.Month == date.Month && e.CreatedAt.Day == date.Day && e.CreatedAt.Year < date.Year)
+            .Where(e => e.DateTime.Month == date.Month && e.DateTime.Day == date.Day && e.DateTime.Year < date.Year)
             .ToList();
 
         return entities;
@@ -61,10 +61,9 @@ public override async Task<EntryEntity> SetAsync(EntryEntity entity)
         if (entity.Id == Guid.Empty)
         {
             entity.Id = Guid.NewGuid();
-            entity.CreatedAt = DateTime.Now;
-            entity.NotificationId = NotificationHelper.GetNotificationIdFromCreationDate(entity.CreatedAt);
         }
-        entity.EditedAt = DateTime.Now;
+
+        entity.NotificationId = NotificationHelper.GetNotificationIdFromCreationDate(entity.DateTime);
 
         // Get existing labels and media that are connected to the entry
         var existingLabels = await GetLabelEntriesByEntryIdAsync(entity.Id);
@@ -133,7 +132,7 @@ public async Task<ICollection<EntryEntity>> GetEntriesByDateRangeAsync(DateTime
         dateTo = new DateTime(dateTo.Year, dateTo.Month, dateTo.Day, 23, 59, 59);
 
         return await connection.Table<EntryEntity>()
-            .Where(e => e.CreatedAt >= dateFrom && e.CreatedAt <= dateTo)
+            .Where(e => e.DateTime >= dateFrom && e.DateTime <= dateTo)
             .ToListAsync();
     }
 
diff --git a/Diary/Diary/Resources/Styles/Styles.xaml b/Diary/Diary/Resources/Styles/Styles.xaml
index 277d8d1..407aa25 100644
--- a/Diary/Diary/Resources/Styles/Styles.xaml
+++ b/Diary/Diary/Resources/Styles/Styles.xaml
@@ -219,7 +219,16 @@
         <Setter Property="HorizontalOptions" Value="Center" />
         <Setter Property="FontSize" Value="Medium" />
         <Setter Property="FontAttributes" Value="Bold" />
-        <Setter Property="Margin" Value="0,5,0,15" />
+        <Setter Property="Margin" Value="0,5,0,5" />
+    </Style>
+
+    <Style x:Key="ChartSubHeaderLabel" TargetType="Label">
+        <Setter Property="Padding" Value="5" />
+        <Setter Property="TextColor" Value="{StaticResource PrimaryDarkText}" />
+        <Setter Property="HorizontalOptions" Value="Center" />
+        <Setter Property="FontSize" Value="Small" />
+        <Setter Property="FontAttributes" Value="Bold" />
+        <Setter Property="Margin" Value="0,0,0,15" />
     </Style>
 
     <Style x:Key="ShadowBorder" TargetType="Border">
diff --git a/Diary/Diary/Resources/Texts/AppShellTexts.Designer.cs b/Diary/Diary/Resources/Texts/AppShellTexts.Designer.cs
index 091f377..2be5ff9 100644
--- a/Diary/Diary/Resources/Texts/AppShellTexts.Designer.cs
+++ b/Diary/Diary/Resources/Texts/AppShellTexts.Designer.cs
@@ -78,6 +78,15 @@ internal static string Diary_FlyoutItem_Title {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Entries.
+        /// </summary>
+        internal static string Entries_FlyoutItem_Title {
+            get {
+                return ResourceManager.GetString("Entries_FlyoutItem_Title", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Gallery.
         /// </summary>
@@ -87,6 +96,24 @@ internal static string Gallery_FlyoutItem_Title {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Import &amp; Export.
+        /// </summary>
+        internal static string ImportExport_FlyoutItem_Title {
+            get {
+                return ResourceManager.GetString("ImportExport_FlyoutItem_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Labels.
+        /// </summary>
+        internal static string Labels_FlyoutItem_Title {
+            get {
+                return ResourceManager.GetString("Labels_FlyoutItem_Title", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Map.
         /// </summary>
@@ -104,5 +131,23 @@ internal static string Mood_FlyoutItem_Title {
                 return ResourceManager.GetString("Mood_FlyoutItem_Title", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Templates.
+        /// </summary>
+        internal static string Templates_FlyoutItem_Title {
+            get {
+                return ResourceManager.GetString("Templates_FlyoutItem_Title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Time Machine.
+        /// </summary>
+        internal static string TimeMachine_FlyoutItem_Title {
+            get {
+                return ResourceManager.GetString("TimeMachine_FlyoutItem_Title", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Diary/Diary/Resources/Texts/AppShellTexts.resx b/Diary/Diary/Resources/Texts/AppShellTexts.resx
index 957dfb9..0cc973b 100644
--- a/Diary/Diary/Resources/Texts/AppShellTexts.resx
+++ b/Diary/Diary/Resources/Texts/AppShellTexts.resx
@@ -123,13 +123,28 @@
   <data name="Diary_FlyoutItem_Title" xml:space="preserve">
     <value>Diary</value>
   </data>
+  <data name="Entries_FlyoutItem_Title" xml:space="preserve">
+    <value>Entries</value>
+  </data>
   <data name="Gallery_FlyoutItem_Title" xml:space="preserve">
     <value>Gallery</value>
   </data>
+  <data name="ImportExport_FlyoutItem_Title" xml:space="preserve">
+    <value>Import &amp; Export</value>
+  </data>
+  <data name="Labels_FlyoutItem_Title" xml:space="preserve">
+    <value>Labels</value>
+  </data>
   <data name="Map_FlyoutItem_Title" xml:space="preserve">
     <value>Map</value>
   </data>
   <data name="Mood_FlyoutItem_Title" xml:space="preserve">
     <value>Mood</value>
   </data>
+  <data name="Templates_FlyoutItem_Title" xml:space="preserve">
+    <value>Templates</value>
+  </data>
+  <data name="TimeMachine_FlyoutItem_Title" xml:space="preserve">
+    <value>Time Machine</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Diary/Diary/Services/DataSeedService.cs b/Diary/Diary/Services/DataSeedService.cs
index 27e75e1..da5f2bc 100644
--- a/Diary/Diary/Services/DataSeedService.cs
+++ b/Diary/Diary/Services/DataSeedService.cs
@@ -57,8 +57,7 @@ public static async Task SeedAsync(IEntryRepository entryRepository, ILabelRepos
             Id = Guid.NewGuid(),
             Title = "A Day at the Beach",
             Content = "Today, I spent the day at the beach. The weather was perfect, and the water was warm. I collected seashells and built a sandcastle.",
-            CreatedAt = new DateTime(2024, 6, 1, 19, 21, 28),
-            EditedAt = new DateTime(2024, 6, 1, 19, 21, 28),
+            DateTime = new DateTime(2024, 6, 1, 19, 21, 28),
             IsFavorite = true,
             Mood = 5,
             Latitude = 42.647362,
@@ -70,8 +69,7 @@ public static async Task SeedAsync(IEntryRepository entryRepository, ILabelRepos
             Id = Guid.NewGuid(),
             Title = "First Day at New Job",
             Content = "I started my new job today. It was overwhelming, but my colleagues were very welcoming. I'm excited about this new chapter.",
-            CreatedAt = new DateTime(2024, 5, 3, 17, 38, 10),
-            EditedAt = new DateTime(2024, 5, 3, 18, 05, 41),
+            DateTime = new DateTime(2024, 5, 3, 17, 38, 10),
             IsFavorite = false,
             Mood = 4,
             Latitude = 49.191245,
@@ -83,8 +81,7 @@ public static async Task SeedAsync(IEntryRepository entryRepository, ILabelRepos
             Id = Guid.NewGuid(),
             Title = "Family Dinner",
             Content = "We had a family dinner at Grandma's house. The food was amazing, and it was great to catch up with everyone.",
-            CreatedAt = new DateTime(2024, 5, 14, 21, 57, 43),
-            EditedAt = new DateTime(2024, 5, 14, 21, 57, 43),
+            DateTime = DateTime.Today.AddYears(-1),
             IsFavorite = true,
             Mood = 5,
             NotificationId = NotificationHelper.GetNotificationIdFromCreationDate(new DateTime(2024, 5, 14, 21, 57, 43))
@@ -94,8 +91,7 @@ public static async Task SeedAsync(IEntryRepository entryRepository, ILabelRepos
             Id = Guid.NewGuid(),
             Title = "Morning Run",
             Content = "Went for a run in the park this morning. Felt great to start the day with some exercise and fresh air.",
-            CreatedAt = new DateTime(2024, 5, 31, 12, 48, 39),
-            EditedAt = new DateTime(2024, 5, 31, 12, 48, 39),
+            DateTime = new DateTime(2024, 5, 31, 12, 48, 39),
             IsFavorite = false,
             Mood = 5,
             NotificationId = NotificationHelper.GetNotificationIdFromCreationDate(new DateTime(2024, 5, 31, 12, 48, 39))
@@ -105,8 +101,7 @@ public static async Task SeedAsync(IEntryRepository entryRepository, ILabelRepos
             Id = Guid.NewGuid(),
             Title = "Book Club Meeting",
             Content = "Had a lively discussion at the book club today. We talked about the themes and characters of our latest read.",
-            CreatedAt = new DateTime(2024, 4, 24, 16, 34, 9),
-            EditedAt = new DateTime(2024, 4, 24, 16, 34, 9),
+            DateTime = new DateTime(2024, 4, 24, 16, 34, 9),
             IsFavorite = true,
             Mood = 3,
             Latitude = 49.210064,
@@ -118,8 +113,7 @@ public static async Task SeedAsync(IEntryRepository entryRepository, ILabelRepos
             Id = Guid.NewGuid(),
             Title = "Lost Wallet",
             Content = "Lost my wallet today. Had to cancel all my cards and go through a lot of hassle. Not a great day.",
-            CreatedAt = new DateTime(2024, 4, 23, 18, 57, 12),
-            EditedAt = new DateTime(2024, 4, 23, 18, 57, 12),
+            DateTime = new DateTime(2024, 4, 23, 18, 57, 12),
             IsFavorite = false,
             Mood = 1,
             Latitude = 49.197792,
@@ -131,8 +125,7 @@ public static async Task SeedAsync(IEntryRepository entryRepository, ILabelRepos
             Id = Guid.NewGuid(),
             Title = "Sick Day",
             Content = "Spent the whole day in bed with a terrible cold. Missed work and felt really miserable.",
-            CreatedAt = new DateTime(2024, 4, 26, 22, 42, 34),
-            EditedAt = new DateTime(2024, 4, 26, 22, 42, 34),
+            DateTime = new DateTime(2024, 4, 26, 22, 42, 34),
             IsFavorite = false,
             Mood = 1,
             NotificationId = NotificationHelper.GetNotificationIdFromCreationDate(new DateTime(2024, 4, 26, 22, 42, 34))
@@ -142,8 +135,7 @@ public static async Task SeedAsync(IEntryRepository entryRepository, ILabelRepos
             Id = Guid.NewGuid(),
             Title = "Argument with a Friend",
             Content = "Had a big argument with a close friend. Feel really upset and hope we can resolve it soon.",
-            CreatedAt = new DateTime(2024, 6, 2, 9, 16, 36),
-            EditedAt = new DateTime(2024, 6, 2, 9, 16, 36),
+            DateTime = new DateTime(2024, 6, 2, 9, 16, 36),
             IsFavorite = false,
             Mood = 2,
             NotificationId = NotificationHelper.GetNotificationIdFromCreationDate(new DateTime(2024, 6, 2, 9, 16, 36))
diff --git a/Diary/Diary/ViewModels/Entry/EntryCreateViewModel.cs b/Diary/Diary/ViewModels/Entry/EntryCreateViewModel.cs
index 924f3fd..e7a32f0 100644
--- a/Diary/Diary/ViewModels/Entry/EntryCreateViewModel.cs
+++ b/Diary/Diary/ViewModels/Entry/EntryCreateViewModel.cs
@@ -15,6 +15,7 @@
 
 namespace Diary.ViewModels.Entry;
 
+[QueryProperty(nameof(PredefinedDateTime), "dateTime")]
 public partial class EntryCreateViewModel : ViewModelBase
 {
     private readonly IEntryClient _entryClient;
@@ -29,6 +30,10 @@ public partial class EntryCreateViewModel : ViewModelBase
     public ObservableCollection<LabelListModel> Labels { get; set; }
     public ObservableCollection<object> SelectedLabels { get; set; }
     public ObservableCollection<TemplateDetailModel> Templates { get; set; }
+    public DateTime SelectedDate { get; set; } = DateTime.Now;
+    public TimeSpan SelectedTime { get; set; } = DateTime.Now.TimeOfDay;
+    public bool UseCurrentDateTime { get; set; } = true;
+    public DateTime PredefinedDateTime { get; set; }
 
     public bool IsLocationSet { get; set; } = false;
     public string LocationText { get; set; } = string.Empty;
@@ -64,6 +69,13 @@ public override async Task OnAppearingAsync()
             Id = Guid.Empty
         };
 
+        if (PredefinedDateTime != DateTime.MinValue)
+        {
+            SelectedDate = PredefinedDateTime.Date;
+            SelectedTime = PredefinedDateTime.TimeOfDay;
+            UseCurrentDateTime = false;
+        }
+
         var labels = await _labelClient.GetAllAsync();
         Labels = labels.ToObservableCollection();
 
@@ -79,6 +91,8 @@ private async Task SaveAsync()
         if (Entry != null)
         {
             using var _ = new BusyIndicator(this);
+
+            SaveSelectedDateTime();
             Entry.Labels = new ObservableCollection<LabelListModel>(SelectedLabels.Select(l => (LabelListModel)l));
             await _entryClient.SetAsync(Entry);
         }
@@ -196,6 +210,21 @@ private void ToggleFavorite()
         }
     }
 
+    private void SaveSelectedDateTime()
+    {
+        if (Entry != null)
+        {
+            if (UseCurrentDateTime)
+            {
+                Entry.DateTime = DateTime.Now;
+            }
+            else
+            {
+                Entry.DateTime = new DateTime(SelectedDate.Year, SelectedDate.Month, SelectedDate.Day, SelectedTime.Hours, SelectedTime.Minutes, SelectedTime.Seconds);
+            }
+        }
+    }
+
     private async Task<bool> ConfirmSelectionIfDataLossPossibleAsync()
     {
         bool hasEntryContent = !string.IsNullOrWhiteSpace(Entry?.Content);
diff --git a/Diary/Diary/ViewModels/Entry/EntryEditViewModel.cs b/Diary/Diary/ViewModels/Entry/EntryEditViewModel.cs
index c5ad3da..74710b7 100644
--- a/Diary/Diary/ViewModels/Entry/EntryEditViewModel.cs
+++ b/Diary/Diary/ViewModels/Entry/EntryEditViewModel.cs
@@ -28,6 +28,10 @@ public partial class EntryEditViewModel : ViewModelBase
     public EntryDetailModel Entry { get; set; } = null!;
     public ObservableCollection<LabelListModel> Labels { get; set; }
     public ObservableCollection<object> SelectedLabels { get; set; }
+    public DateTime SelectedDate { get; set; } = DateTime.Now;
+    public TimeSpan SelectedTime { get; set; } = DateTime.Now.TimeOfDay;
+    public bool UseCurrentDateTime { get; set; }
+
     public bool IsLocationSet { get; set; } = false;
     public string LocationText { get; set; } = string.Empty;
     public Color LocationTextColor { get; set; } = Color.FromArgb("#FF000000");
@@ -50,6 +54,9 @@ public override async Task OnAppearingAsync()
     {
         using var _ = new BusyIndicator(this);
 
+        SelectedDate = Entry.DateTime.Date;
+        SelectedTime = Entry.DateTime.TimeOfDay;
+
         var labels = await _labelClient.GetAllAsync();
         SelectedLabels = new ObservableCollection<object>(labels.Where(l => Entry.Labels.Select(el => el.Id).Contains(l.Id)));
         Labels = labels.ToObservableCollection();
@@ -72,6 +79,8 @@ private async Task SaveAsync()
     {
         using (new BusyIndicator(this))
         {
+            SaveSelectedDateTime();
+
             _mediaToDelete = _mediaToDelete.Where(m => Entry.Media.All(em => em.Id != m.Id)).ToList();
             await _mediaClient.DeleteIfUnusedAsync(_mediaToDelete, [Entry.Id]);
             _mediaToDelete.Clear();
@@ -165,6 +174,18 @@ private void ToggleFavorite()
         }
     }
 
+    private void SaveSelectedDateTime()
+    {
+        if (UseCurrentDateTime)
+        {
+            Entry.DateTime = DateTime.Now;
+        }
+        else
+        {
+            Entry.DateTime = new DateTime(SelectedDate.Year, SelectedDate.Month, SelectedDate.Day, SelectedTime.Hours, SelectedTime.Minutes, SelectedTime.Seconds);
+        }
+    }
+
     private void UpdateFormLocationInfo()
     {
         IsLocationSet = Entry != null && (Entry.Latitude != null || Entry.Longitude != null);
diff --git a/Diary/Diary/ViewModels/Entry/EntryListViewModel.cs b/Diary/Diary/ViewModels/Entry/EntryListViewModel.cs
index 296dce1..efd4cfe 100644
--- a/Diary/Diary/ViewModels/Entry/EntryListViewModel.cs
+++ b/Diary/Diary/ViewModels/Entry/EntryListViewModel.cs
@@ -26,6 +26,7 @@ public partial class EntryListViewModel : ViewModelBase
     public ObservableCollection<EntryListModel>? Items { get; set; }
     public ObservableCollection<EntryListModel>? SelectedDayEntries { get; set; } = [];
     public string? SelectedDate { get; set; } = null;
+    public DateTime SelectedDateTime { get; set; } = DateTime.MinValue;
 
     public EntryListViewModel(IEntryClient entryClient, ILabelClient labelClient, IPopupService popupService)
     {
@@ -54,7 +55,7 @@ private EventCollection ConstructEventCollection(ICollection<EntryListModel> ite
     {
         var eventCollection = new EventCollection();
 
-        foreach (var itemsByCreationDate in items.GroupBy(i => i.CreatedAt.Date))
+        foreach (var itemsByCreationDate in items.GroupBy(i => i.DateTime.Date))
         {
             eventCollection[itemsByCreationDate.Key] = itemsByCreationDate.ToList();
         }
@@ -65,14 +66,9 @@ private EventCollection ConstructEventCollection(ICollection<EntryListModel> ite
     [RelayCommand]
     private void DaySelected()
     {
-        // When deselecting the date, show all entries
-        if (SelectedDate == null)
+        if (DateTime.TryParse(SelectedDate, out var dateTime))
         {
-            SelectedDayEntries = Items;
-        }
-        else
-        {
-            var dateTime = DateTime.Parse(SelectedDate);
+            SelectedDateTime = dateTime;
             var dayHasEvents = Events.TryGetValue(dateTime.Date, out var dayEvents);
 
             if (dayHasEvents)
@@ -85,6 +81,12 @@ private void DaySelected()
                 SelectedDayEntries = [];
             }
         }
+        else
+        {
+            // When deselecting the date, show all entries
+            SelectedDayEntries = Items;
+            SelectedDateTime = DateTime.MinValue;
+        }
     }
 
     [RelayCommand]
@@ -94,9 +96,9 @@ private async Task GoToDetailAsync(Guid id)
     }
 
     [RelayCommand]
-    private async Task GoToCreateAsync()
+    private async Task GoToCreateAsync(DateTime dateTime)
     {
-        await Shell.Current.GoToAsync("//entries/create");
+        await Shell.Current.GoToAsync("//entries/create", new Dictionary<string, object> { ["dateTime"] = dateTime });
     }
 
     [RelayCommand]
@@ -120,6 +122,8 @@ private async Task ToggleFavoriteFilter()
 
     private async Task ApplyFilter(EntryFilterModel entryFilter)
     {
+        using var _ = new BusyIndicator(this);
+
         _entryFilter = entryFilter;
         SaveEntryFilter(entryFilter);
         FilterSet = IsFilterSet();
diff --git a/Diary/Diary/ViewModels/Entry/TimeMachineViewModel.cs b/Diary/Diary/ViewModels/Entry/TimeMachineViewModel.cs
index bf49bab..a509bd9 100644
--- a/Diary/Diary/ViewModels/Entry/TimeMachineViewModel.cs
+++ b/Diary/Diary/ViewModels/Entry/TimeMachineViewModel.cs
@@ -8,7 +8,7 @@ namespace Diary.ViewModels.Entry;
 public partial class TimeMachineViewModel : ViewModelBase
 {
     private readonly IEntryClient _entryClient;
-    public string HeadingText { get; set; } = "Time machine is loading...";
+    public string HeadingText { get; set; } = string.Empty;
     public ICollection<EntryListModel>? Entries { get; set; }
 
     public TimeMachineViewModel(IEntryClient entryClient)
@@ -20,7 +20,9 @@ public override async Task OnAppearingAsync()
     {
         var _ = new BusyIndicator(this);
         Entries = await _entryClient.GetByDayFromPreviousYearsAsync(DateTime.Now);
-        HeadingText = Entries.Count > 0 ? "This day in the past..." : "Time machine has nothing to show today...";
+        HeadingText = Entries.Count > 0
+            ? "You created the following entries on this day in previous years:"
+            : "You haven't created any entries on this day in previous years.";
     }
 
     [RelayCommand]
diff --git a/Diary/Diary/ViewModels/Mood/MoodListViewModel.cs b/Diary/Diary/ViewModels/Mood/MoodListViewModel.cs
index c61ac60..570072b 100644
--- a/Diary/Diary/ViewModels/Mood/MoodListViewModel.cs
+++ b/Diary/Diary/ViewModels/Mood/MoodListViewModel.cs
@@ -25,7 +25,8 @@ public partial class MoodListViewModel : ViewModelBase
 
     public DateTime AverageMoodFrom { get; set; }
     public DateTime AverageMoodTo { get; set; }
-    public string MonthRadarChartDayFromText { get; set; }
+    public string MonthRadarChartSubHeaderText { get; set; }
+    public string WeekLineChartSubHeaderText { get; set; }
     public LineChart WeekLineChart { get; set; }
     public RadarChart MonthRadarChart { get; set; }
     public PointChart AverageMoodPointChart { get; set; }
@@ -90,6 +91,8 @@ private async Task MonthRadarChartNextAsync()
     [RelayCommand]
     private async Task ChangeAverageMoodChartRangeAsync()
     {
+        using var _ = new BusyIndicator(this);
+
         var moodEntries = await _entryClient.GetMoodFromEntriesByDateRangeAsync(AverageMoodFrom, AverageMoodTo);
 
         SetAverageMoodPointChart(moodEntries);
@@ -111,6 +114,8 @@ private async Task InitializeChartsAsync()
 
     private void SetWeekLineChart(ICollection<MoodListModel> moodEntries)
     {
+        WeekLineChartSubHeaderText = $"{_weekLineChartDayFrom:M/d/yyyy} - {_weekLineChartDayTo:M/d/yyyy}";
+
         var lineChartEntries = GetEntriesForWeekLineChart(moodEntries);
 
         WeekLineChart = new LineChart
@@ -129,6 +134,8 @@ private void SetWeekLineChart(ICollection<MoodListModel> moodEntries)
 
     private void SetMonthRadarChart(ICollection<MoodListModel> moodEntries)
     {
+        MonthRadarChartSubHeaderText = _monthRadarChartDayFrom.ToString("MMMM yyyy");
+
         var radarChartEntries = GetEntriesForMonthRadarChart(moodEntries);
         var maxValue = radarChartEntries.Any()
                 ? radarChartEntries.Where(e => e.Value != null).Max(e => (float)e.Value!) + 0.35f // Without adding this value, some circles may not be fully visible in charts
@@ -169,14 +176,14 @@ private void SetAverageMoodPointChart(ICollection<MoodListModel> moodEntries)
     private List<ChartEntry> GetEntriesForWeekLineChart(ICollection<MoodListModel> moodEntries)
     {
         var currentWeekDays = Enumerable.Range(0, 7)
-            .Select(i => _weekLineChartDayFrom.AddDays(i).ToString("dd.MM."))
+            .Select(i => _weekLineChartDayFrom.AddDays(i).ToString("M/d"))
             .ToList();
 
         var lineChartEntries = new List<ChartEntry>();
 
         foreach (var day in currentWeekDays)
         {
-            var moods = moodEntries.Where(m => m.DateTime.ToString("dd.MM.") == day);
+            var moods = moodEntries.Where(m => m.DateTime.ToString("M/d") == day);
             var moodColors = moods.Select(m => _intToMoodColorConverter.ConvertFrom(m.Mood)).ToList();
 
             var averageMood = moods.Any()
diff --git a/Diary/Diary/Views/Entry/EntryCreateView.xaml b/Diary/Diary/Views/Entry/EntryCreateView.xaml
index c052d13..090c74f 100644
--- a/Diary/Diary/Views/Entry/EntryCreateView.xaml
+++ b/Diary/Diary/Views/Entry/EntryCreateView.xaml
@@ -114,13 +114,74 @@
                 </StackLayout>
             </Border>
 
+            <Border Margin="0,10,0,0" Style="{StaticResource ShadowBorder}">
+                <Grid
+                    Padding="0"
+                    ColumnDefinitions="Auto, Auto"
+                    ColumnSpacing="10"
+                    RowDefinitions="Auto, Auto, Auto, Auto">
+                    <Label
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        FontAttributes="Bold"
+                        Text="Use current date and time?" />
+                    <Switch
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        IsToggled="{Binding UseCurrentDateTime}"
+                        VerticalOptions="Start" />
+
+                    <Label
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        FontAttributes="Bold"
+                        Text="Date:" />
+                    <Label
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        FontAttributes="Bold"
+                        Text="Time:" />
+                    <DatePicker
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Margin="0,5,0,0"
+                        Date="{Binding SelectedDate}">
+                        <DatePicker.Triggers>
+                            <DataTrigger
+                                Binding="{Binding UseCurrentDateTime}"
+                                TargetType="DatePicker"
+                                Value="True">
+                                <Setter Property="IsEnabled" Value="False" />
+                            </DataTrigger>
+                        </DatePicker.Triggers>
+                    </DatePicker>
+                    <TimePicker
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Margin="0,5,0,0"
+                        TextColor="{StaticResource PrimaryDarkText}"
+                        Time="{Binding SelectedTime}">
+                        <TimePicker.Triggers>
+                            <DataTrigger
+                                Binding="{Binding UseCurrentDateTime}"
+                                TargetType="TimePicker"
+                                Value="True">
+                                <Setter Property="IsEnabled" Value="False" />
+                                <Setter Property="TextColor" Value="{StaticResource Gray400}" />
+                            </DataTrigger>
+                        </TimePicker.Triggers>
+                    </TimePicker>
+                </Grid>
+            </Border>
+
             <Border Margin="0,10,0,0" Style="{StaticResource ShadowBorder}">
                 <VerticalStackLayout>
                     <Label FontAttributes="Bold" Text="Content:" />
                     <Editor
                         AutoSize="TextChanges"
                         MinimumHeightRequest="100"
-                        Text="{Binding Entry.Content}" />
+                        Text="{Binding Entry.Content}"
+                        TextColor="{StaticResource PrimaryDarkText}" />
                 </VerticalStackLayout>
             </Border>
 
@@ -144,6 +205,7 @@
                         <Label FontAttributes="Bold" Text="Mood:" />
                         <Slider
                             Maximum="5"
+                            MaximumTrackColor="{StaticResource PrimaryDarkText}"
                             Minimum="1"
                             WidthRequest="200"
                             Value="{Binding Entry.Mood}" />
@@ -205,6 +267,7 @@
                         Text="Labels:" />
                     <CollectionView
                         ItemsSource="{Binding Labels}"
+                        MaximumHeightRequest="120"
                         SelectedItems="{Binding SelectedLabels, Mode=TwoWay}"
                         SelectionMode="Multiple">
                         <CollectionView.ItemTemplate>
diff --git a/Diary/Diary/Views/Entry/EntryDetailView.xaml b/Diary/Diary/Views/Entry/EntryDetailView.xaml
index 8f5d721..ce68d57 100644
--- a/Diary/Diary/Views/Entry/EntryDetailView.xaml
+++ b/Diary/Diary/Views/Entry/EntryDetailView.xaml
@@ -83,13 +83,8 @@
                             TextColor="{StaticResource Tertiary}" />
                     </Grid>
                     <HorizontalStackLayout Padding="0,5,0,0">
-                        <Label FontAttributes="Bold" Text="Created at: " />
-                        <Label FontAttributes="Italic" Text="{Binding Entry.CreatedAt}" />
-                    </HorizontalStackLayout>
-
-                    <HorizontalStackLayout>
-                        <Label FontAttributes="Bold" Text="Edited at: " />
-                        <Label FontAttributes="Italic" Text="{Binding Entry.EditedAt}" />
+                        <Label FontAttributes="Bold" Text="Date: " />
+                        <Label FontAttributes="Italic" Text="{Binding Entry.DateTime, StringFormat='{0:M/d/yyyy h:mm tt}'}" />
                     </HorizontalStackLayout>
 
                     <Label Margin="0,15,0,0" Text="{Binding Entry.Content}" />
@@ -152,7 +147,7 @@
                         Padding="0,10,0,0"
                         IsVisible="{Binding HasLabels}">
                         <Label FontAttributes="Bold" Text="Labels:" />
-                        <CollectionView ItemsSource="{Binding Entry.Labels}">
+                        <CollectionView ItemsSource="{Binding Entry.Labels}" MaximumHeightRequest="120">
                             <CollectionView.ItemTemplate>
                                 <DataTemplate x:DataType="labelmodels:LabelListModel">
                                     <StackLayout Orientation="Horizontal" Spacing="10">
diff --git a/Diary/Diary/Views/Entry/EntryEditView.xaml b/Diary/Diary/Views/Entry/EntryEditView.xaml
index d10d4cc..8ba60b2 100644
--- a/Diary/Diary/Views/Entry/EntryEditView.xaml
+++ b/Diary/Diary/Views/Entry/EntryEditView.xaml
@@ -101,13 +101,74 @@
                 </StackLayout>
             </Border>
 
+            <Border Margin="0,10,0,0" Style="{StaticResource ShadowBorder}">
+                <Grid
+                    Padding="0"
+                    ColumnDefinitions="Auto, Auto"
+                    ColumnSpacing="10"
+                    RowDefinitions="Auto, Auto, Auto, Auto">
+                    <Label
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        FontAttributes="Bold"
+                        Text="Use current date and time?" />
+                    <Switch
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        IsToggled="{Binding UseCurrentDateTime}"
+                        VerticalOptions="Start" />
+
+                    <Label
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        FontAttributes="Bold"
+                        Text="Date:" />
+                    <Label
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        FontAttributes="Bold"
+                        Text="Time:" />
+                    <DatePicker
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Margin="0,5,0,0"
+                        Date="{Binding SelectedDate}">
+                        <DatePicker.Triggers>
+                            <DataTrigger
+                                Binding="{Binding UseCurrentDateTime}"
+                                TargetType="DatePicker"
+                                Value="True">
+                                <Setter Property="IsEnabled" Value="False" />
+                            </DataTrigger>
+                        </DatePicker.Triggers>
+                    </DatePicker>
+                    <TimePicker
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Margin="0,5,0,0"
+                        TextColor="{StaticResource PrimaryDarkText}"
+                        Time="{Binding SelectedTime}">
+                        <TimePicker.Triggers>
+                            <DataTrigger
+                                Binding="{Binding UseCurrentDateTime}"
+                                TargetType="TimePicker"
+                                Value="True">
+                                <Setter Property="IsEnabled" Value="False" />
+                                <Setter Property="TextColor" Value="{StaticResource Gray400}" />
+                            </DataTrigger>
+                        </TimePicker.Triggers>
+                    </TimePicker>
+                </Grid>
+            </Border>
+
             <Border Margin="0,5,0,5" Style="{StaticResource ShadowBorder}">
                 <VerticalStackLayout>
                     <Label FontAttributes="Bold" Text="Content:" />
                     <Editor
                         AutoSize="TextChanges"
                         MinimumHeightRequest="100"
-                        Text="{Binding Entry.Content}" />
+                        Text="{Binding Entry.Content}"
+                        TextColor="{StaticResource PrimaryDarkText}" />
                 </VerticalStackLayout>
             </Border>
 
@@ -131,6 +192,7 @@
                         <Label FontAttributes="Bold" Text="Mood:" />
                         <Slider
                             Maximum="5"
+                            MaximumTrackColor="{StaticResource PrimaryDarkText}"
                             Minimum="1"
                             WidthRequest="200"
                             Value="{Binding Entry.Mood}" />
@@ -192,6 +254,7 @@
                         Text="Labels:" />
                     <CollectionView
                         ItemsSource="{Binding Labels}"
+                        MaximumHeightRequest="120"
                         SelectedItems="{Binding SelectedLabels, Mode=TwoWay}"
                         SelectionMode="Multiple">
                         <CollectionView.ItemTemplate>
diff --git a/Diary/Diary/Views/Entry/EntryListView.xaml b/Diary/Diary/Views/Entry/EntryListView.xaml
index 67577ff..82bfcd7 100644
--- a/Diary/Diary/Views/Entry/EntryListView.xaml
+++ b/Diary/Diary/Views/Entry/EntryListView.xaml
@@ -41,12 +41,15 @@
                                                      Dark={StaticResource PrimaryLightText}}"
             EventIndicatorColor="{AppThemeBinding Light={StaticResource TertiaryDark},
                                                   Dark={StaticResource Tertiary}}"
+            EventIndicatorSelectedTextColor="{StaticResource PrimaryLightText}"
             EventIndicatorType="BottomDot"
             Events="{Binding Events}"
             HorizontalOptions="Fill"
             MonthLabelColor="{StaticResource PrimaryLight}"
             SelectedDate="{Binding SelectedDate}"
             SelectedDayBackgroundColor="{StaticResource Primary}"
+            SelectedDayTextColor="{StaticResource PrimaryLightText}"
+            SelectedTodayTextColor="{StaticResource PrimaryLightText}"
             ShownDate="{Binding SelectedDate}"
             TodayOutlineColor="{StaticResource Primary}"
             TodayTextColor="{AppThemeBinding Light={StaticResource PrimaryDarkText},
@@ -81,7 +84,7 @@
                                     <Label
                                         Grid.Column="1"
                                         HorizontalOptions="End"
-                                        Text="{Binding CreatedAt, StringFormat='{0:D}'}"
+                                        Text="{Binding DateTime, StringFormat='{0:D}'}"
                                         TextColor="{AppThemeBinding Light={StaticResource PrimaryDarkText},
                                                                     Dark={StaticResource PrimaryLightText}}"
                                         VerticalOptions="Center" />
@@ -94,14 +97,24 @@
                                         Text="{Binding Content}"
                                         TextColor="{AppThemeBinding Light={StaticResource PrimaryDarkText},
                                                                     Dark={StaticResource PrimaryLightText}}"
-                                        VerticalOptions="Center" />
+                                        VerticalOptions="Center">
+                                        <Label.Triggers>
+                                            <DataTrigger
+                                                Binding="{Binding IsFavorite}"
+                                                TargetType="Label"
+                                                Value="False">
+                                                <Setter Property="Grid.ColumnSpan" Value="2" />
+                                            </DataTrigger>
+                                        </Label.Triggers>
+                                    </Label>
                                     <Label
                                         Grid.Column="1"
                                         FontFamily="{x:Static fonts:Fonts.FontAwesome}"
                                         FontSize="Large"
                                         IsVisible="{Binding IsFavorite}"
                                         Text="{Static fonts:FontAwesomeIcons.Star}"
-                                        TextColor="{StaticResource Tertiary}" />
+                                        TextColor="{StaticResource Tertiary}"
+                                        VerticalTextAlignment="End" />
                                 </Grid>
 
                             </StackLayout>
@@ -119,7 +132,8 @@
             <Button
                 Grid.Column="0"
                 BackgroundColor="{StaticResource PrimaryLight}"
-                Command="{Binding GoToCreateCommand}"
+                Command="{Binding BindingContext.GoToCreateCommand, Source={x:Reference Root}}"
+                CommandParameter="{Binding SelectedDateTime}"
                 FontAttributes="Bold"
                 Text="Add new"
                 TextColor="White"
diff --git a/Diary/Diary/Views/Entry/FilterSortPopupView.xaml b/Diary/Diary/Views/Entry/FilterSortPopupView.xaml
index 02b8a35..bbab13f 100644
--- a/Diary/Diary/Views/Entry/FilterSortPopupView.xaml
+++ b/Diary/Diary/Views/Entry/FilterSortPopupView.xaml
@@ -74,12 +74,12 @@
                             Grid.Row="2"
                             Grid.Column="0"
                             FontAttributes="Bold"
-                            Text="Created from:" />
+                            Text="From:" />
                         <Label
                             Grid.Row="2"
                             Grid.Column="1"
                             FontAttributes="Bold"
-                            Text="Created to:" />
+                            Text="To:" />
                         <DatePicker
                             Grid.Row="3"
                             Grid.Column="0"
@@ -131,6 +131,7 @@
                     <CollectionView
                         Margin="0,5,0,0"
                         ItemsSource="{Binding Labels}"
+                        MaximumHeightRequest="120"
                         SelectedItems="{Binding LabelsToShow}"
                         SelectionMode="Multiple">
                         <CollectionView.ItemTemplate>
diff --git a/Diary/Diary/Views/Entry/TimeMachineView.xaml b/Diary/Diary/Views/Entry/TimeMachineView.xaml
index 9e812d7..3382880 100644
--- a/Diary/Diary/Views/Entry/TimeMachineView.xaml
+++ b/Diary/Diary/Views/Entry/TimeMachineView.xaml
@@ -10,7 +10,7 @@
     xmlns:views="clr-namespace:Diary.Views"
     xmlns:vm="clr-namespace:Diary.ViewModels.Entry"
     x:Name="Root"
-    Title="Time machine"
+    Title="Time Machine"
     x:DataType="vm:TimeMachineViewModel">
 
     <Grid Margin="15,0,15,5" RowDefinitions="Auto, *">
@@ -43,7 +43,7 @@
                                         Grid.Row="0"
                                         Grid.Column="1"
                                         HorizontalOptions="End"
-                                        Text="{Binding CreatedAt, StringFormat='{0:D}'}"
+                                        Text="{Binding DateTime, StringFormat='{0:D}'}"
                                         TextColor="{AppThemeBinding Light={StaticResource PrimaryDarkText},
                                                                     Dark={StaticResource PrimaryLightText}}"
                                         VerticalOptions="Center" />
diff --git a/Diary/Diary/Views/ImportExport/ImportExportView.xaml b/Diary/Diary/Views/ImportExport/ImportExportView.xaml
index 82deae4..ae0f853 100644
--- a/Diary/Diary/Views/ImportExport/ImportExportView.xaml
+++ b/Diary/Diary/Views/ImportExport/ImportExportView.xaml
@@ -17,14 +17,22 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <Button
+        <Label
             Grid.Row="0"
+            Margin="0,10,0,15"
+            FontSize="Medium"
+            HorizontalOptions="CenterAndExpand"
+            Text="Here you can export and import all of your data." />
+
+        <Button
+            Grid.Row="1"
             Command="{Binding ExportCommand}"
             Text="Export" />
         <Button
-            Grid.Row="1"
+            Grid.Row="2"
             Command="{Binding ImportCommand}"
             Text="Import" />
     </Grid>
diff --git a/Diary/Diary/Views/Map/MapView.xaml.cs b/Diary/Diary/Views/Map/MapView.xaml.cs
index f84d67f..f6b2697 100644
--- a/Diary/Diary/Views/Map/MapView.xaml.cs
+++ b/Diary/Diary/Views/Map/MapView.xaml.cs
@@ -22,6 +22,6 @@ private async void OnPinClicked(object sender, PinClickedEventArgs e)
     {
         e.HideInfoWindow = true;
         var pinModel = (PinModel)((Pin)sender).BindingContext; // Get original pin model
-        await Shell.Current.GoToAsync("//entries/detail", new Dictionary<string, object> { ["id"] = pinModel.EntryId });
+        await Shell.Current.GoToAsync("//map/detail", new Dictionary<string, object> { ["id"] = pinModel.EntryId });
     }
 }
\ No newline at end of file
diff --git a/Diary/Diary/Views/Mood/MoodListView.xaml b/Diary/Diary/Views/Mood/MoodListView.xaml
index abcc719..53e053c 100644
--- a/Diary/Diary/Views/Mood/MoodListView.xaml
+++ b/Diary/Diary/Views/Mood/MoodListView.xaml
@@ -4,6 +4,7 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:converters="clr-namespace:Diary.Converters"
+    xmlns:fonts="clr-namespace:Diary.Resources.Fonts"
     xmlns:microcharts="clr-namespace:Microcharts.Maui;assembly=Microcharts.Maui"
     xmlns:models="clr-namespace:Diary.Models.Mood"
     xmlns:texts="clr-namespace:Diary.Resources.Texts"
@@ -20,7 +21,7 @@
             <Border Margin="15,5,15,10" Style="{StaticResource ShadowBorder}">
                 <StackLayout>
                     <Label Style="{StaticResource ChartHeaderLabel}" Text="Mood during week" />
-
+                    <Label Style="{StaticResource ChartSubHeaderLabel}" Text="{Binding WeekLineChartSubHeaderText}" />
                     <microcharts:ChartView
                         Chart="{Binding WeekLineChart}"
                         HeightRequest="250"
@@ -31,14 +32,16 @@
                             Grid.Column="0"
                             Margin="10"
                             Command="{Binding WeekLineChartPreviousCommand}"
-                            HorizontalOptions="Start"
-                            Text="Previous week" />
+                            FontFamily="{Static fonts:Fonts.FontAwesome}"
+                            HorizontalOptions="Center"
+                            Text="{Static fonts:FontAwesomeIcons.ChevronLeft}" />
                         <Button
                             Grid.Column="1"
                             Margin="10"
                             Command="{Binding WeekLineChartNextCommand}"
-                            HorizontalOptions="End"
-                            Text="Next week" />
+                            FontFamily="{Static fonts:Fonts.FontAwesome}"
+                            HorizontalOptions="Center"
+                            Text="{Static fonts:FontAwesomeIcons.ChevronRight}" />
                     </Grid>
                 </StackLayout>
             </Border>
@@ -46,7 +49,7 @@
             <Border Margin="15,5,15,10" Style="{StaticResource ShadowBorder}">
                 <StackLayout>
                     <Label Style="{StaticResource ChartHeaderLabel}" Text="Monthly mood counter" />
-                    <Label HorizontalOptions="Center" Text="{Binding MonthRadarChartDayFromText}" />
+                    <Label Style="{StaticResource ChartSubHeaderLabel}" Text="{Binding MonthRadarChartSubHeaderText}" />
                     <microcharts:ChartView
                         Chart="{Binding MonthRadarChart}"
                         HeightRequest="300"
@@ -57,21 +60,26 @@
                             Grid.Column="0"
                             Margin="10"
                             Command="{Binding MonthRadarChartPreviousCommand}"
-                            HorizontalOptions="Start"
-                            Text="Previous week" />
+                            FontFamily="{Static fonts:Fonts.FontAwesome}"
+                            HorizontalOptions="Center"
+                            Text="{Static fonts:FontAwesomeIcons.ChevronLeft}" />
                         <Button
                             Grid.Column="1"
                             Margin="10"
                             Command="{Binding MonthRadarChartNextCommand}"
-                            HorizontalOptions="End"
-                            Text="Next week" />
+                            FontFamily="{Static fonts:Fonts.FontAwesome}"
+                            HorizontalOptions="Center"
+                            Text="{Static fonts:FontAwesomeIcons.ChevronRight}" />
                     </Grid>
                 </StackLayout>
             </Border>
 
             <Border Margin="15,5,15,5" Style="{StaticResource ShadowBorder}">
                 <StackLayout>
-                    <Label Style="{StaticResource ChartHeaderLabel}" Text="Average mood per day" />
+                    <Label
+                        Margin="0,5,0,15"
+                        Style="{StaticResource ChartHeaderLabel}"
+                        Text="Average mood per day" />
                     <microcharts:ChartView
                         Chart="{Binding AverageMoodPointChart}"
                         HeightRequest="250"
diff --git a/Diary/Diary/Views/Template/TemplateCreateView.xaml b/Diary/Diary/Views/Template/TemplateCreateView.xaml
index 14fbae4..fc007ba 100644
--- a/Diary/Diary/Views/Template/TemplateCreateView.xaml
+++ b/Diary/Diary/Views/Template/TemplateCreateView.xaml
@@ -43,7 +43,8 @@
                     <Editor
                         AutoSize="TextChanges"
                         MinimumHeightRequest="100"
-                        Text="{Binding Template.Content}" />
+                        Text="{Binding Template.Content}"
+                        TextColor="{StaticResource PrimaryDarkText}" />
                 </StackLayout>
             </Border>
 
@@ -74,6 +75,7 @@
                             Grid.Column="0"
                             IsEnabled="{Binding PresetMood}"
                             Maximum="5"
+                            MaximumTrackColor="{StaticResource PrimaryDarkText}"
                             Minimum="1"
                             Value="{Binding Template.Mood}" />
                         <Label
@@ -163,6 +165,7 @@
                         Grid.Row="5"
                         Grid.ColumnSpan="2"
                         ItemsSource="{Binding Labels}"
+                        MaximumHeightRequest="120"
                         SelectedItems="{Binding SelectedLabels, Mode=TwoWay}"
                         SelectionMode="Multiple">
                         <CollectionView.ItemTemplate>
diff --git a/Diary/Diary/Views/Template/TemplateDetailView.xaml b/Diary/Diary/Views/Template/TemplateDetailView.xaml
index 8eac66c..888f51e 100644
--- a/Diary/Diary/Views/Template/TemplateDetailView.xaml
+++ b/Diary/Diary/Views/Template/TemplateDetailView.xaml
@@ -89,7 +89,7 @@
                             Margin="0,15,0,0"
                             FontAttributes="Bold"
                             Text="Labels:" />
-                        <CollectionView ItemsSource="{Binding Template.Labels}">
+                        <CollectionView ItemsSource="{Binding Template.Labels}" MaximumHeightRequest="120">
                             <CollectionView.ItemTemplate>
                                 <DataTemplate x:DataType="labelmodels:LabelListModel">
                                     <StackLayout Orientation="Horizontal" Spacing="10">
diff --git a/Diary/Diary/Views/Template/TemplateEditView.xaml b/Diary/Diary/Views/Template/TemplateEditView.xaml
index 4cb57a4..aa3fc2a 100644
--- a/Diary/Diary/Views/Template/TemplateEditView.xaml
+++ b/Diary/Diary/Views/Template/TemplateEditView.xaml
@@ -43,7 +43,8 @@
                     <Editor
                         AutoSize="TextChanges"
                         MinimumHeightRequest="100"
-                        Text="{Binding Template.Content}" />
+                        Text="{Binding Template.Content}"
+                        TextColor="{StaticResource PrimaryDarkText}" />
                 </StackLayout>
             </Border>
 
@@ -74,6 +75,7 @@
                             Grid.Column="0"
                             IsEnabled="{Binding PresetMood}"
                             Maximum="5"
+                            MaximumTrackColor="{StaticResource PrimaryDarkText}"
                             Minimum="1"
                             Value="{Binding Template.Mood}" />
                         <Label
@@ -163,6 +165,7 @@
                         Grid.Row="5"
                         Grid.ColumnSpan="2"
                         ItemsSource="{Binding Labels}"
+                        MaximumHeightRequest="120"
                         SelectedItems="{Binding SelectedLabels, Mode=TwoWay}"
                         SelectionMode="Multiple">
                         <CollectionView.ItemTemplate>