diff --git a/Content/GameData/Items/Potions/DA_Po_HealingTonic.uasset b/Content/GameData/Items/Potions/DA_Po_HealingTonic.uasset
index 4cadfa3f..fc856983 100644
--- a/Content/GameData/Items/Potions/DA_Po_HealingTonic.uasset
+++ b/Content/GameData/Items/Potions/DA_Po_HealingTonic.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68b6be5b2406d01fc8b0cc92b7b76ec35e15ba245801d4efb6538e481f0af47a
-size 7177
+oid sha256:fc47e8e2394ae99eb5e980d34e1e699160ae11212e2afad73906a4b601c89089
+size 7018
diff --git a/Content/GameData/Items/Potions/DA_Po_PotionOfBadLuck.uasset b/Content/GameData/Items/Potions/DA_Po_PotionOfBadLuck.uasset
index 7047eda9..9c516655 100644
--- a/Content/GameData/Items/Potions/DA_Po_PotionOfBadLuck.uasset
+++ b/Content/GameData/Items/Potions/DA_Po_PotionOfBadLuck.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bdb16422c268a1e7f73c2773f64b605bea89c82f3b1e903381d5c82bc961e4fd
-size 6870
+oid sha256:d55ebea43df9379f9e60f45e681a94f0304a7e01f3d641e38861921c8d69566b
+size 6544
diff --git a/Content/GameData/Items/Potions/DA_Po_WidowsKiss.uasset b/Content/GameData/Items/Potions/DA_Po_WidowsKiss.uasset
index b127f961..04d7421d 100644
--- a/Content/GameData/Items/Potions/DA_Po_WidowsKiss.uasset
+++ b/Content/GameData/Items/Potions/DA_Po_WidowsKiss.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad9c2c31069bbb7f08481818cc78ab0fd4dbcfb6a0a08562d66346c142652738
+oid sha256:c1bc1da963894fe26a0d4a61f31a4e6cf869de20d686fc533c025c8c6c44ef8e
 size 6505
diff --git a/Content/Scripts/BP_TimeOfDay.uasset b/Content/Scripts/BP_TimeOfDay.uasset
index d25a8091..395ded3c 100644
--- a/Content/Scripts/BP_TimeOfDay.uasset
+++ b/Content/Scripts/BP_TimeOfDay.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b17ac194a362a1cbe585908645c6fca67de1c3a84a95640e73ed373b68fed2e2
-size 489648
+oid sha256:9da19e6adaaf3e10426ebd292280151b908e7eff58898044b74de6eb7a30ba60
+size 490005
diff --git a/Content/Scripts/Bazar/BP_BazarSellingStand.uasset b/Content/Scripts/Bazar/BP_BazarSellingStand.uasset
index 7fb6da65..38ae8209 100644
--- a/Content/Scripts/Bazar/BP_BazarSellingStand.uasset
+++ b/Content/Scripts/Bazar/BP_BazarSellingStand.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbb172a2b83c9d38d7f356143d52a2ae1e17c788c79609b07a2710d21631bb35
-size 1082899
+oid sha256:65eeb1bc380ddff9e13f49060741cf7df5c976c0cc4d2019f0d77a83f527451b
+size 1086992
diff --git a/Content/Scripts/DialogueSystem/UI/DialogueScreen.uasset b/Content/Scripts/DialogueSystem/UI/DialogueScreen.uasset
index a4f7342c..0a01bae5 100644
--- a/Content/Scripts/DialogueSystem/UI/DialogueScreen.uasset
+++ b/Content/Scripts/DialogueSystem/UI/DialogueScreen.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fabf343e49112f6732dad98eb6bbc06676fc2545879abb037d87fc97a8c67f8e
-size 661143
+oid sha256:6f2fc6f097291b81bd79ec514ae0a01093fb434c1e8dddd8aae87f81a1705396
+size 661524
diff --git a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_BadLuck.uasset b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_BadLuck.uasset
index 88d0314f..74625737 100644
--- a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_BadLuck.uasset
+++ b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_BadLuck.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85bb0bb45afb0cad9087e77a82ec76711e25bc3349b529f58273a493059bf7ee
-size 12303
+oid sha256:8d509b0b185c77961ebf0df34f4938555eea9371501a52a0cc3b9a1addee2e2e
+size 12148
diff --git a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Blue.uasset b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Blue.uasset
index 3ad44235..c100496c 100644
--- a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Blue.uasset
+++ b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Blue.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8954d6cd039ce73c232585f8032d05115b1c6884c9b118287a9bde7f528caca7
-size 5410
+oid sha256:0a0319414d524a0f7c58eab8309f32edd0fa5e2a754931200f7c06983c58ba12
+size 5994
diff --git a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Clear.uasset b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Clear.uasset
index 34e120c5..91f91b8c 100644
--- a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Clear.uasset
+++ b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Clear.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36c14394417d4e1d7caf607a543e166ada9a09474cbb0657ef7759de4e5c8ee2
-size 12032
+oid sha256:118ea4a9c6cbcf9dc7a8bd4c7f277274e94bab7696741e8b88ae113b732f9ec8
+size 11876
diff --git a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Cyan.uasset b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Cyan.uasset
index 374b5ba1..7a77c406 100644
--- a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Cyan.uasset
+++ b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Cyan.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44931328370638be9316aee39681d8370c0ec643de335de9b04d2f8297064b57
-size 5412
+oid sha256:c820331996f6c793046a1b58b11ba68a98c244685c0d5b2bbc1c3d65a84b4bfe
+size 5997
diff --git a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Green.uasset b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Green.uasset
index 1087a39c..13470920 100644
--- a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Green.uasset
+++ b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Green.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dcfe8c2f80c33ffa2318aefa3a0b59e46a54cfa2c07ec30b097290dfa7b19e90
-size 5417
+oid sha256:a3d3776f048e2b897baa399db4a5ce61475903150327a716bbd10793732631ca
+size 6002
diff --git a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_HealingTonic.uasset b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_HealingTonic.uasset
index b6ce4720..bcce88ff 100644
--- a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_HealingTonic.uasset
+++ b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_HealingTonic.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70eb8491258bd936c6312b1bbf7c7d1ad8406008a50c1cc22e2dd452e7068a2f
-size 12312
+oid sha256:3a5501e81476c094c53cb7f44514d2a819d8dd897220d9f0aadb19c8e9fa16dd
+size 12259
diff --git a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Orange.uasset b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Orange.uasset
index d93b3df2..d88334c6 100644
--- a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Orange.uasset
+++ b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Orange.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b8d1549caa5e7a9fb6ef9279a2629934b1105bb628e76661e1b000fe41f2333
-size 5445
+oid sha256:cf8593c21bed270ac06900cb1e8db8c638d376285c24a3bca1f12e1ef6a39436
+size 6030
diff --git a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Pink.uasset b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Pink.uasset
index 63975cfd..1f72e3b4 100644
--- a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Pink.uasset
+++ b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Pink.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93284d70b96d1b0f4c70ff4886bd7b7f057307363a8c09a328599cb0425d762f
-size 5406
+oid sha256:4ee31374bb480484e71f1a21d762937e942b0c5718da33af9105974894f91826
+size 5991
diff --git a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Purple.uasset b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Purple.uasset
index 6ca704c6..fc9b9003 100644
--- a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Purple.uasset
+++ b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Purple.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2c902bce13b4fae78a9740cdb93fab5b356db6fee10f3854954a27d2103ad14
-size 5411
+oid sha256:c3b1f6a419dffc452149ecfbb94e6143e79fb07a6da102ce0ffe7cb0c866163c
+size 5996
diff --git a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Red.uasset b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Red.uasset
index 5d6bb097..ecc759cf 100644
--- a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Red.uasset
+++ b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Red.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9846ec18c6e05982d2c507b3e21e4ad60208a2a3c29dfa1cb6f1d240b1721d0a
-size 5408
+oid sha256:4dd643f8c303e9f72a3cbb82057edff5acb9247f84b89febab5394dea9aa121b
+size 5993
diff --git a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_SerpentsKiss.uasset b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_SerpentsKiss.uasset
index 9bc20081..3846470d 100644
--- a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_SerpentsKiss.uasset
+++ b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_SerpentsKiss.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4974939b64b4b6bd0f0668091cf8952cb1a1d3ac2d6ee6f6b6884437db408a4
-size 12366
+oid sha256:60e0f5dda9a0be5d5a48706ed1d8411803da43a50464d553829c6be37ae0049b
+size 12316
diff --git a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_WidowsKiss.uasset b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_WidowsKiss.uasset
index 8427604a..0fc72671 100644
--- a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_WidowsKiss.uasset
+++ b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_WidowsKiss.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:648916f85820b6c097396c9cce9f52075e0a7c7fe24efefaf49a12f305f82c18
-size 12353
+oid sha256:bfa58eef4530545d1de74225a50c1cd9f3f4866060035544201bef9ec9028f50
+size 12300
diff --git a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Yellow.uasset b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Yellow.uasset
index 30715d03..46408243 100644
--- a/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Yellow.uasset
+++ b/Content/Textures/Items/Potions/SmallBottle/T_Potion_Small_Yellow.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d04f6c48a54cceee1a114e7a09f1312e9f0d54a347a1abab04f00ed64c5d526
-size 5430
+oid sha256:c1cae12fb40c9eb3eea9c16ea9b81e0a27c444997f1c3dd468b195f7292a66f3
+size 6015
diff --git a/Content/UI/MainMenuScreenUI.uasset b/Content/UI/MainMenuScreenUI.uasset
index afc7c2fa..b6674bc7 100644
--- a/Content/UI/MainMenuScreenUI.uasset
+++ b/Content/UI/MainMenuScreenUI.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e7ae1d26420d20a98edb8dab783cce40b15b33f2f2ae684280027c272d8a6cc
-size 481436
+oid sha256:23355707864a84596dd3ed05929a0ae078f5d292805f1eddbb3d75f49b2b9ce2
+size 482820
diff --git a/Source/ProjectEleri/DialogueSystem/DialogueComponent.cpp b/Source/ProjectEleri/DialogueSystem/DialogueComponent.cpp
index 7aec16a9..7059e56a 100644
--- a/Source/ProjectEleri/DialogueSystem/DialogueComponent.cpp
+++ b/Source/ProjectEleri/DialogueSystem/DialogueComponent.cpp
@@ -97,6 +97,10 @@ void UDialogueComponent::TriggerDialogue(USpeechDataAsset* DialogueAssetPath, co
 	{
 		BindToControllerInput();
 		bDialogueSelectOpen = false;
+	}
+	
+	if (!DialogueWidget)
+	{
 		DialogueWidget = Cast<UDialogueWidget>(EleriPlayerController->ToggleDialogueWindow(true));
 		DialogueWidget->AssignDialogueComponent(this);
 	}
diff --git a/Source/ProjectEleri/Private/TimeOfDayManager.cpp b/Source/ProjectEleri/Private/TimeOfDayManager.cpp
index 811cff8f..da853581 100644
--- a/Source/ProjectEleri/Private/TimeOfDayManager.cpp
+++ b/Source/ProjectEleri/Private/TimeOfDayManager.cpp
@@ -33,7 +33,6 @@ ATimeOfDayManager::ATimeOfDayManager()
     currentMonth = 1;
     currentHours = 0;
     currentYear = 100;
-    StartedTicking = false;
     ShouldRain = false;
 
     RootComponent = CreateDefaultSubobject<USceneComponent>(TEXT("Root"));
@@ -478,16 +477,6 @@ void ATimeOfDayManager::SetTimeOfDay(float Minutes)
     OnTimePassed.Broadcast(GetTimeOfDay());
 }
 
-void ATimeOfDayManager::StartTimeOfDay()
-{
-    StartedTicking = true;
-}
-
-void ATimeOfDayManager::StopTimeOfDay()
-{
-    StartedTicking = false;
-}
-
 void ATimeOfDayManager::ToggleTimeActive(bool bNewActive)
 {
     TimeTicking = bNewActive;
diff --git a/Source/ProjectEleri/Public/TimeOfDayManager.h b/Source/ProjectEleri/Public/TimeOfDayManager.h
index cd32893e..c043c500 100644
--- a/Source/ProjectEleri/Public/TimeOfDayManager.h
+++ b/Source/ProjectEleri/Public/TimeOfDayManager.h
@@ -299,12 +299,6 @@ public:
     UFUNCTION(BlueprintCallable, Category = "Time of day")
     void SetTimeOfDay(float Minutes);
 
-    UFUNCTION(BlueprintCallable, Category = "Time of day")
-    void StartTimeOfDay();
-
-    UFUNCTION(BlueprintCallable, Category = "Time of day")
-    void StopTimeOfDay();
-
     UFUNCTION(BlueprintCallable, Category = "Time of day")
     void AddMinutes(float minutes);
 
@@ -373,7 +367,7 @@ protected:
     int32 GetWeatherDistributionMaxValue() const;
     UWeatherPresetDataAsset *GetWeatherDistributionValue() const;
 
-    bool StartedTicking;
+    UPROPERTY()
     bool TimeTicking;
 
     //True intensity evaluated from curve