diff --git a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_015.uasset b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_015.uasset
index 84e3784..254279b 100644
--- a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_015.uasset
+++ b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_015.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6510018b1cc44f93707e3e0bab8a2d85de32912e7525c8d91570398a818004ac
-size 79888
+oid sha256:d18516c9eab31e45d1a6c7602c90e969f35774ba82aca4f7ab3eb82025ccd198
+size 79909
diff --git a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_020.uasset b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_020.uasset
index c9270e9..b465ff2 100644
--- a/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_020.uasset
+++ b/Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_020.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9bd4deedc592885ec1cbfbc9575472eb63e18b25ae2ead31aa46f7127fde5ced
-size 83485
+oid sha256:e7da7141bfb557d305cf6535824601131c871cac28aeabef753997c4d71ce12f
+size 83100
diff --git a/Content/BlueprintAI/AI/AIBruh_Boss.uasset b/Content/BlueprintAI/AI/AIBruh_Boss.uasset
index 6d81571..d2d384d 100644
--- a/Content/BlueprintAI/AI/AIBruh_Boss.uasset
+++ b/Content/BlueprintAI/AI/AIBruh_Boss.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b76dd11c5e7de7092a12c9f139ae21b21707645cd198c4bd5343f7d2501439d6
-size 143177
+oid sha256:744ada7cea6b4ddea4f8b3d73c05ff60e3e1f2ede4a84acd9b3665aefda380d0
+size 243507
diff --git a/Content/Blueprints/Combat_UI/BookCombat_UI.uasset b/Content/Blueprints/Combat_UI/BookCombat_UI.uasset
index 23d4be0..1f213c3 100644
--- a/Content/Blueprints/Combat_UI/BookCombat_UI.uasset
+++ b/Content/Blueprints/Combat_UI/BookCombat_UI.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:345fed2f81c369ee2d8d7110421899b9b89e13c3ce19b56c3b9a1fcb2503fb11
-size 164508
+oid sha256:a25b0e54c5b54612d9585c3bbff1dadc0dd6290f1c6e1555774e8ca946089023
+size 164471
diff --git a/Content/Blueprints/Combat_UI/BookWorldWidget.uasset b/Content/Blueprints/Combat_UI/BookWorldWidget.uasset
index 757d9fd..d1a99a2 100644
--- a/Content/Blueprints/Combat_UI/BookWorldWidget.uasset
+++ b/Content/Blueprints/Combat_UI/BookWorldWidget.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38d13fd9a0a0a9c0af31988193b77e896f955dbe157f27653ad3e71b1d0c7307
-size 23737
+oid sha256:18c0ccf2461fc91a8a98bd252f47d9030792b1639f46f765247304f623e285fb
+size 23709
diff --git a/Content/Blueprints/Combat_UI/EndDialogue.uasset b/Content/Blueprints/Combat_UI/EndDialogue.uasset
new file mode 100644
index 0000000..7d02b14
--- /dev/null
+++ b/Content/Blueprints/Combat_UI/EndDialogue.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea690f35f2dd2c6cf001cfb103b739005ba417c2e1abb5224cdfcb1c599451fa
+size 88099
diff --git a/Content/Blueprints/Display_UI/BP_CrossHair.uasset b/Content/Blueprints/Display_UI/BP_CrossHair.uasset
index 7effa0d..b5491ab 100644
--- a/Content/Blueprints/Display_UI/BP_CrossHair.uasset
+++ b/Content/Blueprints/Display_UI/BP_CrossHair.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ebc8b81319654bead68a5f6f0544b6d71b8a58e9bda2f4e4f7c12bf64b2b2f09
-size 24335
+oid sha256:ed30c2313ba163a846fe0055fb38d1d6d0075bff1fa3a10d6be868c18a0d25f2
+size 24454
diff --git a/Content/Blueprints/Items/Icons/UI_buff.uasset b/Content/Blueprints/Items/Icons/UI_buff.uasset
new file mode 100644
index 0000000..41ecdea
--- /dev/null
+++ b/Content/Blueprints/Items/Icons/UI_buff.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:774c1444ba3bc8c01ab5b032b6f7dd3d138d87a51a4d4b71099cdab0c4057a7b
+size 29237
diff --git a/Content/Blueprints/Items/Icons/UI_health.uasset b/Content/Blueprints/Items/Icons/UI_health.uasset
new file mode 100644
index 0000000..85f8429
--- /dev/null
+++ b/Content/Blueprints/Items/Icons/UI_health.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d5ac8c82983655e14dcbeb24e0303b1eba4af664b96ab717d5a0b0e3be1d4b55
+size 31675
diff --git a/Content/Blueprints/Quests/Quest_SistersPendant.uasset b/Content/Blueprints/Quests/Quest_SistersPendant.uasset
index dad18de..6cf762c 100644
--- a/Content/Blueprints/Quests/Quest_SistersPendant.uasset
+++ b/Content/Blueprints/Quests/Quest_SistersPendant.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e44fd991be35e86dc731008c9af1f554897085e62856303ab87488b9b1a45711
-size 7366
+oid sha256:d7348b40785ac617427f3981fa1c01ccac360f53890a957a9a7d69730987d754
+size 238
diff --git a/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset b/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset
index 0e22426..b83ae9c 100644
--- a/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset
+++ b/Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:269dfc79171369a42f5ecb2985027713bf65b305eab11b4024c5eb61105ac9b5
-size 7395
+oid sha256:0ba4197e7ee79190b0398f1479b120a497f28f64ce7b6470901a4c4c13b73591
+size 238
diff --git a/Content/Dialogue/TextPrompt.uasset b/Content/Dialogue/TextPrompt.uasset
index 1f42113..3e68721 100644
--- a/Content/Dialogue/TextPrompt.uasset
+++ b/Content/Dialogue/TextPrompt.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83692ece4e17e312f60d0a66835228abf5be0489fb60c3d2821e6f4c3e1519f1
-size 60587
+oid sha256:034e24a559fc63e29d9c6e717aab12d04a67454171d3a239ceffba50fe683998
+size 60114
diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap
index de47feb..92756cc 100644
--- a/Content/Levels/Build.umap
+++ b/Content/Levels/Build.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b84179d7f020dc0acdce0c01da9a9d0ddc9f7768a9e9a9eb315ea0adfc67e725
-size 3305721
+oid sha256:9c0de2ebacc0f597cae7d977840ab9d6b5205e087031dc4dec1f27deda90b747
+size 5377997
diff --git a/Content/Levels/Enemy_Test.umap b/Content/Levels/Enemy_Test.umap
index cb9bcee..3a5df59 100644
--- a/Content/Levels/Enemy_Test.umap
+++ b/Content/Levels/Enemy_Test.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aede3e25bfdba2a4612c55a6ff0a7fbe65853fa476d74750c3dd3295f7398d78
-size 45107
+oid sha256:a282b6a85c2fab895525bd055b513a454b26fd7aefab7aecda1ab4d12e55b13f
+size 45572
diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp
index 88fcbe3..e3c41eb 100644
--- a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp
+++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp
@@ -70,7 +70,7 @@ void UDialogueNPC::NextDialogue()
 		FOutputDeviceNull AR;
 		const FString Command = BlueprintFunctions[UKismetStringLibrary::Conv_StringToInt(CurrentDialogueStringPath[DialogueIndex].RightChop(3))];;
 		GetOwner()->CallFunctionByNameWithArguments(*Command, AR, nullptr, true);
-		if (Command == "OpenShop") bInShop = true;
+		if (Command == "OpenShop") bResetUserControls = false;
 		DialogueIndex++;
 	}
 	else if (CurrentDialogueStringPath[FMath::Clamp(DialogueIndex + 1, 0, CurrentDialogueStringPath.Num() - 1)].Mid(0, 2) == "$$")
@@ -139,7 +139,6 @@ void UDialogueNPC::TickComponent(float DeltaTime, ELevelTick TickType, FActorCom
 void UDialogueNPC::StartDialogue()
 {
 	Quests.Empty();
-	bInShop = false;
 	FOutputDeviceNull AR;
 	const FString Command = FString::Printf(TEXT("SetRootDialoguePath"));
 	GetOwner()->CallFunctionByNameWithArguments(*Command, AR, nullptr, true);
@@ -149,14 +148,11 @@ void UDialogueNPC::StartDialogue()
 		UE_LOG(LogTemp, Warning, TEXT("Dialogue Path is Empty"));
 		return;
 	}
-	//Disable Character Movement
-	if (ACharacter* PlayerCharacter = Cast<ACharacter>(GetWorld()->GetFirstPlayerController()->GetPawn()))
-	{
-		PlayerCharacter->DisableInput(GetWorld()->GetFirstPlayerController());
-	}
 	//Set to UI Mode Only
 	APlayerController* PlayerController = GetWorld()->GetFirstPlayerController();
-	PlayerController->SetInputMode(FInputModeUIOnly());
+	PlayerController->SetIgnoreMoveInput(true);
+	PlayerController->SetIgnoreLookInput(true);
+	PlayerController->SetInputMode(FInputModeGameAndUI());
 	PlayerController->bShowMouseCursor = true;
 
 	Choice1Button->SetVisibility(ESlateVisibility::Hidden);
@@ -178,22 +174,20 @@ void UDialogueNPC::EndDialogue()
 	TextAnimationTimerHandle.Invalidate();
 	DialogueWidgetInstance->RemoveFromParent();
 
-	if (!bInShop)
+	if (bResetUserControls)
 	{
-		//Enable Character Movement
-		if (ACharacter* PlayerCharacter = Cast<ACharacter>(GetWorld()->GetFirstPlayerController()->GetPawn()))
-		{
-			PlayerCharacter->EnableInput(GetWorld()->GetFirstPlayerController());
-		}
 		//Reset UI Mode
 		APlayerController* PlayerController = GetWorld()->GetFirstPlayerController();
+		PlayerController->SetIgnoreMoveInput(false);
+		PlayerController->SetIgnoreLookInput(false);
 		PlayerController->SetInputMode(FInputModeGameOnly());
 		PlayerController->bShowMouseCursor = false;
 	}
 }
 
-UDialoguePath* UDialogueNPC::CreateRootDialoguePath()
+UDialoguePath* UDialogueNPC::CreateRootDialoguePath(const bool ResetUserControls)
 {
+	bResetUserControls = ResetUserControls;
 	return NewObject<UDialoguePath>();
 }
 
diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.h b/Source/the_twilight_abyss/Dialogue/DialogueNPC.h
index e213c32..6efcc32 100644
--- a/Source/the_twilight_abyss/Dialogue/DialogueNPC.h
+++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.h
@@ -103,9 +103,9 @@ private:
 	TMap<int, int> ItemIndexes;
 	UPROPERTY()
 	TMap<int, FString> QuestFlags;
-
+	
 	UPROPERTY()
-	bool bInShop = false;
+	bool bResetUserControls = true;
 
 	void ResetDialogueUI();
 
@@ -120,7 +120,7 @@ public:
 	void EndDialogue();
 
 	UFUNCTION(BlueprintCallable)
-	UDialoguePath* CreateRootDialoguePath();
+	UDialoguePath* CreateRootDialoguePath(bool ResetUserControls = true);
 
 	UFUNCTION(BlueprintCallable)
 	UDialoguePath* AddDialogue(UDialoguePath* DialoguePath, FText TextInput);
diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
index fbe47dc..0bdb479 100644
--- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
+++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
@@ -103,7 +103,7 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy, const bool bWasShot)
 void ATurnBaseCombatV2::CombatCheck(const bool bWasShot)
 {
 	const UBlackboardComponent* EnemyBlackboard = Cast<AAIController>(EnemyActor->GetInstigatorController())->GetBlackboardComponent();
-
+	
 	ChainDamageMultiplier = 0;
 	BaseDamageMultiplier = DefaultBaseDamageMultiplier;
 	EnemyBaseDamageMultiplier = DefaultEnemyBaseDamageMultiplier;