diff --git a/README.md b/README.md
index 3b6ef64f..cdab4632 100644
--- a/README.md
+++ b/README.md
@@ -7,13 +7,7 @@ This repository contains all client-side data, including locale files, configura
 ## 📋 Changelog
 
 ### 🐛 Bug Fixes
- - **Refining**: The window now sorts empty slots (from broken stones) to the end of the list, displaying an exact preview of how the item will look like after successful attaching.
- - **Affects**: Added affect shower support for Mall Attack Speed.
- - **Dragonsoul Alchemy**:
-   - Fixed the deck affect countdown not auto-updating when time is increased in one of the equipped items.
-   - Fixed the affect countdown requiring a check for remaining time in 500ms-intervals.
-   - The window now opens without the player being qualified (consistency with the official).
- - **Spirit stone attachment**: The window now displays the item's existing attributes. 
+ - **Guild window**: Removed the clickable area for the `BASE` tab and adjusted positions and widths for all other Guild window tabs.
 
 <br>
 <br>
diff --git a/assets/root/interfacemodule.py b/assets/root/interfacemodule.py
index fd678c96..498b6f2d 100644
--- a/assets/root/interfacemodule.py
+++ b/assets/root/interfacemodule.py
@@ -996,21 +996,20 @@ class Interface(object):
 		self.DRAGON_SOUL_IS_QUALIFIED = True
 		self.wndExpandedTaskBar.SetToolTipText(uiTaskBar.ExpandedTaskBar.BUTTON_DRAGON_SOUL, uiScriptLocale.TASKBAR_DRAGON_SOUL)
 
-	# MR-12: Enable Dragon Soul window opening without completing the quest
 	def ToggleDragonSoulWindow(self):
 		if False == player.IsObserverMode():
 			if app.ENABLE_DRAGON_SOUL_SYSTEM:
 				if False == self.wndDragonSoul.IsShow():
-					# if self.DRAGON_SOUL_IS_QUALIFIED:
-					self.wndDragonSoul.Show()
-					# else:
-					# 	try:
-					# 		self.wndPopupDialog.SetText(localeInfo.DRAGON_SOUL_UNQUALIFIED)
-					# 		self.wndPopupDialog.Open()
-					# 	except:
-					# 		self.wndPopupDialog = uiCommon.PopupDialog()
-					# 		self.wndPopupDialog.SetText(localeInfo.DRAGON_SOUL_UNQUALIFIED)
-					# 		self.wndPopupDialog.Open()
+					if self.DRAGON_SOUL_IS_QUALIFIED:
+						self.wndDragonSoul.Show()
+					else:
+						try:
+							self.wndPopupDialog.SetText(localeInfo.DRAGON_SOUL_UNQUALIFIED)
+							self.wndPopupDialog.Open()
+						except:
+							self.wndPopupDialog = uiCommon.PopupDialog()
+							self.wndPopupDialog.SetText(localeInfo.DRAGON_SOUL_UNQUALIFIED)
+							self.wndPopupDialog.Open()
 				else:
 					self.wndDragonSoul.Close()
 		
@@ -1018,11 +1017,10 @@ class Interface(object):
 		if False == player.IsObserverMode():
 			if app.ENABLE_DRAGON_SOUL_SYSTEM:
 				if False == self.wndDragonSoul.IsShow():
-					# if self.DRAGON_SOUL_IS_QUALIFIED:
-					self.wndDragonSoul.Show()
+					if self.DRAGON_SOUL_IS_QUALIFIED:
+						self.wndDragonSoul.Show()
 				else:
 					self.wndDragonSoul.Close()
-	# MR-12: -- END OF -- Enable Dragon Soul window opening without completing the quest
 				
 	def FailDragonSoulRefine(self, reason, inven_type, inven_pos):
 		if False == player.IsObserverMode():
diff --git a/assets/uiscript/uiscript/guildwindow.py b/assets/uiscript/uiscript/guildwindow.py
index 82f0f366..3ab55847 100644
--- a/assets/uiscript/uiscript/guildwindow.py
+++ b/assets/uiscript/uiscript/guildwindow.py
@@ -123,57 +123,57 @@ window = {
 							"x" : 6,
 							"y" : 5,
 
-							"width" : 53,
+							"width" : 70,
 							"height" : 27,
 						},
 						{
 							"name" : "Tab_Button_02",
 							"type" : "radio_button",
 
-							"x" : 61,
+							"x" : 78,
 							"y" : 5,
 
-							"width" : 67,
+							"width" : 72,
 							"height" : 27,
 						},
 						{
 							"name" : "Tab_Button_03",
 							"type" : "radio_button",
 
-							"x" : 130,
+							"x" : 152,
 							"y" : 5,
 
-							"width" : 60,
+							"width" : 72,
 							"height" : 27,
 						},
 						{
 							"name" : "Tab_Button_04",
 							"type" : "radio_button",
 
-							"x" : 192,
+							"x" : 226,
 							"y" : 5,
 
-							"width" : 60,
+							"width" : 0,
 							"height" : 27,
 						},
 						{
 							"name" : "Tab_Button_05",
 							"type" : "radio_button",
 
-							"x" : 254,
+							"x" : 226,
 							"y" : 5,
 
-							"width" : 60,
+							"width" : 72,
 							"height" : 27,
 						},
 						{
 							"name" : "Tab_Button_06",
 							"type" : "radio_button",
 
-							"x" : 316,
+							"x" : 300,
 							"y" : 5,
 
-							"width" : 55,
+							"width" : 70,
 							"height" : 27,
 						},
 					),