diff --git a/resources/gui/layouts/game/CharacterWindow.json b/resources/gui/layouts/game/CharacterWindow.json
index 28de0dd..4494766 100644
--- a/resources/gui/layouts/game/CharacterWindow.json
+++ b/resources/gui/layouts/game/CharacterWindow.json
@@ -1,5 +1,5 @@
 {
-  "Bounds": "658,368,360,340",
+  "Bounds": "658,368,220,336",
   "Dock": "None",
   "Padding": "0,0,0,0",
   "AlignmentEdgeDistances": "0,0,6,60",
@@ -20,10 +20,10 @@
   "TooltipTextColor": null,
   "ClampMovement": true,
   "DrawShadow": true,
-  "ActiveImage": "character.png",
+  "ActiveImage": null,
   "InactiveImage": "",
-  "ActiveColor": "255,220,220,220",
-  "InactiveColor": "",
+  "ActiveColor": "255,255,255,255",
+  "InactiveColor": "255,191,191,191",
   "IsClosable": true,
   "InnerPanel": {
     "Bounds": "0,0,10,10",
@@ -78,7 +78,7 @@
         "TextScale": 1.0
       },
       "ChatacterInfoLabel": {
-        "Bounds": "4,116,212,12",
+        "Bounds": "4,116,212,16",
         "Dock": "None",
         "Padding": "0,0,0,0",
         "AlignmentEdgeDistances": "0,0,0,0",
@@ -852,27 +852,26 @@
           }
         }
       },
-      "ExtraBuffsLabel": {
-        "Bounds": "221,0,138,31",
+      "_detailsButton": {
+        "Bounds": "132,188,80,16",
         "Dock": "None",
         "Padding": "0,0,0,0",
-        "AlignmentEdgeDistances": "0,0,0,0",
+        "AlignmentEdgeDistances": "0,0,8,0",
         "AlignmentTransform": "0,0",
         "Margin": "0,0,0,0",
         "RenderColor": "255,255,255,255",
-        "Alignments": "",
+        "Alignments": "Right",
         "DrawBackground": true,
         "MinimumSize": "1,1",
         "MaximumSize": "4096,4096",
         "Disabled": false,
         "Hidden": false,
         "RestrictToParent": false,
-        "MouseInputEnabled": false,
+        "MouseInputEnabled": true,
         "HideToolTip": false,
         "ToolTipBackground": null,
         "ToolTipFont": null,
-        "TooltipTextColor": null,
-        "BackgroundTemplate": null,
+        "TooltipTextColor": "255,255,255,255",
         "TextColor": "255,255,255,255",
         "HoveredTextColor": null,
         "ClickedTextColor": null,
@@ -881,302 +880,33 @@
         "AutoSizeToContents": false,
         "FontName": "sourcesansproblack",
         "FontSize": 10,
-        "TextScale": 1.0
-      },
-      "HpRegen": {
-        "Bounds": "225,36,1,14",
-        "Dock": "None",
-        "Padding": "0,0,0,0",
-        "AlignmentEdgeDistances": "0,0,0,0",
-        "AlignmentTransform": "0,0",
-        "Margin": "0,0,0,0",
-        "RenderColor": "255,255,255,255",
-        "Alignments": "",
-        "DrawBackground": true,
-        "MinimumSize": "1,1",
-        "MaximumSize": "4096,4096",
-        "Disabled": false,
-        "Hidden": false,
-        "RestrictToParent": false,
-        "MouseInputEnabled": false,
-        "HideToolTip": false,
-        "ToolTipBackground": null,
-        "ToolTipFont": null,
-        "TooltipTextColor": null,
-        "BackgroundTemplate": null,
-        "TextColor": "255,255,255,255",
-        "HoveredTextColor": null,
-        "ClickedTextColor": null,
-        "DisabledTextColor": "255,90,90,90",
-        "TextAlign": "Left, Top",
-        "AutoSizeToContents": true,
-        "FontName": "sourcesansproblack",
-        "FontSize": 8,
-        "TextScale": 1.0
-      },
-      "ManaRegen": {
-        "Bounds": "225,52,1,14",
-        "Dock": "None",
-        "Padding": "0,0,0,0",
-        "AlignmentEdgeDistances": "0,0,0,0",
-        "AlignmentTransform": "0,0",
-        "Margin": "0,0,0,0",
-        "RenderColor": "255,255,255,255",
-        "Alignments": "",
-        "DrawBackground": true,
-        "MinimumSize": "1,1",
-        "MaximumSize": "4096,4096",
-        "Disabled": false,
-        "Hidden": false,
-        "RestrictToParent": false,
-        "MouseInputEnabled": false,
-        "HideToolTip": false,
-        "ToolTipBackground": null,
-        "ToolTipFont": null,
-        "TooltipTextColor": null,
-        "BackgroundTemplate": null,
-        "TextColor": "255,255,255,255",
-        "HoveredTextColor": null,
-        "ClickedTextColor": null,
-        "DisabledTextColor": "255,90,90,90",
-        "TextAlign": "Left, Top",
-        "AutoSizeToContents": true,
-        "FontName": "sourcesansproblack",
-        "FontSize": 8,
-        "TextScale": 1.0
-      },
-      "Lifesteal": {
-        "Bounds": "225,68,1,14",
-        "Dock": "None",
-        "Padding": "0,0,0,0",
-        "AlignmentEdgeDistances": "0,0,0,0",
-        "AlignmentTransform": "0,0",
-        "Margin": "0,0,0,0",
-        "RenderColor": "255,255,255,255",
-        "Alignments": "",
-        "DrawBackground": true,
-        "MinimumSize": "1,1",
-        "MaximumSize": "4096,4096",
-        "Disabled": false,
-        "Hidden": false,
-        "RestrictToParent": false,
-        "MouseInputEnabled": false,
-        "HideToolTip": false,
-        "ToolTipBackground": null,
-        "ToolTipFont": null,
-        "TooltipTextColor": null,
-        "BackgroundTemplate": null,
-        "TextColor": "255,255,255,255",
-        "HoveredTextColor": null,
-        "ClickedTextColor": null,
-        "DisabledTextColor": "255,90,90,90",
-        "TextAlign": "Left, Top",
-        "AutoSizeToContents": true,
-        "FontName": "sourcesansproblack",
-        "FontSize": 8,
-        "TextScale": 1.0
-      },
-      "AttackSpeed": {
-        "Bounds": "225,84,1,14",
-        "Dock": "None",
-        "Padding": "0,0,0,0",
-        "AlignmentEdgeDistances": "0,0,0,0",
-        "AlignmentTransform": "0,0",
-        "Margin": "0,0,0,0",
-        "RenderColor": "255,255,255,255",
-        "Alignments": "",
-        "DrawBackground": true,
-        "MinimumSize": "1,1",
-        "MaximumSize": "4096,4096",
-        "Disabled": false,
-        "Hidden": false,
-        "RestrictToParent": false,
-        "MouseInputEnabled": false,
-        "HideToolTip": false,
-        "ToolTipBackground": null,
-        "ToolTipFont": null,
-        "TooltipTextColor": null,
-        "BackgroundTemplate": null,
-        "TextColor": "255,255,255,255",
-        "HoveredTextColor": null,
-        "ClickedTextColor": null,
-        "DisabledTextColor": "255,90,90,90",
-        "TextAlign": "Left, Top",
-        "AutoSizeToContents": true,
-        "FontName": "sourcesansproblack",
-        "FontSize": 8,
-        "TextScale": 1.0
-      },
-      "ExtraExp": {
-        "Bounds": "225,100,1,14",
-        "Dock": "None",
-        "Padding": "0,0,0,0",
-        "AlignmentEdgeDistances": "0,0,0,0",
-        "AlignmentTransform": "0,0",
-        "Margin": "0,0,0,0",
-        "RenderColor": "255,255,255,255",
-        "Alignments": "",
-        "DrawBackground": true,
-        "MinimumSize": "1,1",
-        "MaximumSize": "4096,4096",
-        "Disabled": false,
-        "Hidden": false,
-        "RestrictToParent": false,
-        "MouseInputEnabled": false,
-        "HideToolTip": false,
-        "ToolTipBackground": null,
-        "ToolTipFont": null,
-        "TooltipTextColor": null,
-        "BackgroundTemplate": null,
-        "TextColor": "255,255,255,255",
-        "HoveredTextColor": null,
-        "ClickedTextColor": null,
-        "DisabledTextColor": "255,90,90,90",
-        "TextAlign": "Left, Top",
-        "AutoSizeToContents": true,
-        "FontName": "sourcesansproblack",
-        "FontSize": 8,
-        "TextScale": 1.0
-      },
-      "Luck": {
-        "Bounds": "225,116,1,14",
-        "Dock": "None",
-        "Padding": "0,0,0,0",
-        "AlignmentEdgeDistances": "0,0,0,0",
-        "AlignmentTransform": "0,0",
-        "Margin": "0,0,0,0",
-        "RenderColor": "255,255,255,255",
-        "Alignments": "",
-        "DrawBackground": true,
-        "MinimumSize": "1,1",
-        "MaximumSize": "4096,4096",
-        "Disabled": false,
-        "Hidden": false,
-        "RestrictToParent": false,
-        "MouseInputEnabled": false,
-        "HideToolTip": false,
-        "ToolTipBackground": null,
-        "ToolTipFont": null,
-        "TooltipTextColor": null,
-        "BackgroundTemplate": null,
-        "TextColor": "255,255,255,255",
-        "HoveredTextColor": null,
-        "ClickedTextColor": null,
-        "DisabledTextColor": "255,90,90,90",
-        "TextAlign": "Left, Top",
-        "AutoSizeToContents": true,
-        "FontName": "sourcesansproblack",
-        "FontSize": 8,
-        "TextScale": 1.0
-      },
-      "Tenacity": {
-        "Bounds": "225,132,1,14",
-        "Dock": "None",
-        "Padding": "0,0,0,0",
-        "AlignmentEdgeDistances": "0,0,0,0",
-        "AlignmentTransform": "0,0",
-        "Margin": "0,0,0,0",
-        "RenderColor": "255,255,255,255",
-        "Alignments": "",
-        "DrawBackground": true,
-        "MinimumSize": "1,1",
-        "MaximumSize": "4096,4096",
-        "Disabled": false,
-        "Hidden": false,
-        "RestrictToParent": false,
-        "MouseInputEnabled": false,
-        "HideToolTip": false,
-        "ToolTipBackground": null,
-        "ToolTipFont": null,
-        "TooltipTextColor": null,
-        "BackgroundTemplate": null,
-        "TextColor": "255,255,255,255",
-        "HoveredTextColor": null,
-        "ClickedTextColor": null,
-        "DisabledTextColor": "255,90,90,90",
-        "TextAlign": "Left, Top",
-        "AutoSizeToContents": true,
-        "FontName": "sourcesansproblack",
-        "FontSize": 8,
-        "TextScale": 1.0
-      },
-      "CooldownReduction": {
-        "Bounds": "225,148,1,14",
-        "Dock": "None",
-        "Padding": "0,0,0,0",
-        "AlignmentEdgeDistances": "0,0,0,0",
-        "AlignmentTransform": "0,0",
-        "Margin": "0,0,0,0",
-        "RenderColor": "255,255,255,255",
-        "Alignments": "",
-        "DrawBackground": true,
-        "MinimumSize": "1,1",
-        "MaximumSize": "4096,4096",
-        "Disabled": false,
-        "Hidden": false,
-        "RestrictToParent": false,
-        "MouseInputEnabled": false,
-        "HideToolTip": false,
-        "ToolTipBackground": null,
-        "ToolTipFont": null,
-        "TooltipTextColor": null,
-        "BackgroundTemplate": null,
-        "TextColor": "255,255,255,255",
-        "HoveredTextColor": null,
-        "ClickedTextColor": null,
-        "DisabledTextColor": "255,90,90,90",
-        "TextAlign": "Left, Top",
-        "AutoSizeToContents": true,
-        "FontName": "sourcesansproblack",
-        "FontSize": 8,
-        "TextScale": 1.0
-      },
-      "Manasteal": {
-        "Bounds": "225,164,1,14",
-        "Dock": "None",
-        "Padding": "0,0,0,0",
-        "AlignmentEdgeDistances": "0,0,0,0",
-        "AlignmentTransform": "0,0",
-        "Margin": "0,0,0,0",
-        "RenderColor": "255,255,255,255",
-        "Alignments": "",
-        "DrawBackground": true,
-        "MinimumSize": "1,1",
-        "MaximumSize": "4096,4096",
-        "Disabled": false,
-        "Hidden": false,
-        "RestrictToParent": false,
-        "MouseInputEnabled": false,
-        "HideToolTip": false,
-        "ToolTipBackground": null,
-        "ToolTipFont": null,
-        "TooltipTextColor": null,
-        "BackgroundTemplate": null,
-        "TextColor": "255,255,255,255",
-        "HoveredTextColor": null,
-        "ClickedTextColor": null,
-        "DisabledTextColor": "255,90,90,90",
-        "TextAlign": "Left, Top",
-        "AutoSizeToContents": true,
-        "FontName": "sourcesansproblack",
-        "FontSize": 8,
-        "TextScale": 1.0
+        "TextScale": 1.0,
+        "NormalImage": null,
+        "HoveredImage": null,
+        "ClickedImage": null,
+        "DisabledImage": null,
+        "_stateSoundNames": {
+          "Hover": "octave-tap-resonant.wav",
+          "MouseDown": "octave-tap-warm.wav",
+          "MouseUp": "octave-tap-warm.wav"
+        },
+        "CenterImage": false
       }
     }
   },
   "Children": {
     "Titlebar": {
-      "Bounds": "0,0,360,31",
+      "Bounds": "0,0,225,28",
       "Dock": "Top",
-      "Padding": "0,0,0,0",
+      "Padding": "4,0,0,0",
       "AlignmentEdgeDistances": "0,0,0,0",
       "AlignmentTransform": "0,0",
       "Margin": "0,0,0,0",
       "RenderColor": "255,255,255,255",
       "Alignments": "",
       "DrawBackground": true,
-      "MinimumSize": "1,1",
-      "MaximumSize": "4096,4096",
+      "MinimumSize": "0,0",
+      "MaximumSize": "0,0",
       "Disabled": false,
       "Hidden": false,
       "RestrictToParent": false,
@@ -1185,10 +915,10 @@
       "ToolTipBackground": null,
       "ToolTipFont": null,
       "TooltipTextColor": null,
-      "NormalImage": "",
-      "HoveredImage": "",
-      "ClickedImage": "",
-      "DisabledImage": "",
+      "NormalImage": null,
+      "HoveredImage": null,
+      "ClickedImage": null,
+      "DisabledImage": null,
       "_stateSoundNames": {},
       "Children": {
         "_icon": {
@@ -1218,7 +948,7 @@
           "RightMouseClickSound": null
         },
         "_label": {
-          "Bounds": "0,0,100,10",
+          "Bounds": "4,0,193,28",
           "Dock": "CenterV, Fill",
           "Padding": "4,4,4,4",
           "AlignmentEdgeDistances": "0,0,0,0",
@@ -1238,7 +968,7 @@
           "ToolTipFont": null,
           "TooltipTextColor": null,
           "BackgroundTemplate": null,
-          "TextColor": "255,255,255,255",
+          "TextColor": null,
           "HoveredTextColor": null,
           "ClickedTextColor": null,
           "DisabledTextColor": null,
@@ -1249,16 +979,16 @@
           "TextScale": 1.0
         },
         "CloseButton": {
-          "Bounds": "336,0,24,24",
-          "Dock": "None",
-          "Padding": "0,0,0,0",
+          "Bounds": "197,0,28,28",
+          "Dock": "Right",
+          "Padding": "3,3,3,3",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
           "Margin": "0,0,0,0",
           "RenderColor": "255,255,255,255",
-          "Alignments": "Bottom,Right",
+          "Alignments": "",
           "DrawBackground": true,
-          "MinimumSize": "1,1",
+          "MinimumSize": "0,0",
           "MaximumSize": "0,0",
           "Disabled": false,
           "Hidden": false,
@@ -1268,10 +998,10 @@
           "ToolTipBackground": null,
           "ToolTipFont": null,
           "TooltipTextColor": null,
-          "TextColor": "255,82,82,82",
+          "TextColor": null,
           "HoveredTextColor": null,
           "ClickedTextColor": null,
-          "DisabledTextColor": "255,90,90,90",
+          "DisabledTextColor": null,
           "TextAlign": "Center",
           "AutoSizeToContents": false,
           "FontName": null,
@@ -1291,4 +1021,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/resources/gui/layouts/game/QuestsWindow.json b/resources/gui/layouts/game/QuestsWindow.json
index e226490..fb0ad90 100644
--- a/resources/gui/layouts/game/QuestsWindow.json
+++ b/resources/gui/layouts/game/QuestsWindow.json
@@ -1,18 +1,18 @@
 {
-  "Bounds": "1140,366,220,342",
+  "Bounds": "0,0,225,327",
   "Dock": "None",
   "Padding": "0,0,0,0",
-  "AlignmentEdgeDistances": "0,0,6,60",
+  "AlignmentEdgeDistances": "0,0,0,0",
   "AlignmentTransform": "0,0",
-  "Margin": "0,0,0,0",
+  "Margin": "0,0,15,60",
   "RenderColor": "255,255,255,255",
   "Alignments": "Bottom,Right",
   "DrawBackground": true,
-  "MinimumSize": "100,40",
-  "MaximumSize": "4096,4096",
+  "MinimumSize": "225,327",
+  "MaximumSize": "0,0",
   "Disabled": false,
   "Hidden": true,
-  "RestrictToParent": true,
+  "RestrictToParent": false,
   "MouseInputEnabled": true,
   "HideToolTip": false,
   "ToolTipBackground": null,
@@ -20,13 +20,13 @@
   "TooltipTextColor": null,
   "ClampMovement": true,
   "DrawShadow": true,
-  "ActiveImage": "quests.png",
-  "InactiveImage": "",
-  "ActiveColor": "255,220,220,220",
-  "InactiveColor": "",
+  "ActiveImage": null,
+  "InactiveImage": null,
+  "ActiveColor": "255,255,255,255",
+  "InactiveColor": "255,191,191,191",
   "IsClosable": true,
   "InnerPanel": {
-    "Bounds": "0,0,10,10",
+    "Bounds": "0,28,225,299",
     "Dock": "Fill",
     "Padding": "0,0,0,0",
     "AlignmentEdgeDistances": "0,0,0,0",
@@ -35,8 +35,8 @@
     "RenderColor": "255,255,255,255",
     "Alignments": "",
     "DrawBackground": true,
-    "MinimumSize": "1,1",
-    "MaximumSize": "4096,4096",
+    "MinimumSize": "225,299",
+    "MaximumSize": "0,0",
     "Disabled": false,
     "Hidden": false,
     "RestrictToParent": false,
@@ -47,7 +47,7 @@
     "TooltipTextColor": null,
     "Children": {
       "QuestList": {
-        "Bounds": "1,1,218,310",
+        "Bounds": "1,1,225,299",
         "Dock": "None",
         "Padding": "0,0,0,0",
         "AlignmentEdgeDistances": "0,0,0,0",
@@ -344,21 +344,21 @@
         "TextColorOverride": "0,0,0,0"
       },
       "QuestTitle": {
-        "Bounds": "0,6,228,32",
-        "Dock": "None",
-        "Padding": "0,0,0,0",
+        "Bounds": "0,0,225,28",
+        "Dock": "Top",
+        "Padding": "4,0,0,0",
         "AlignmentEdgeDistances": "0,0,0,0",
         "AlignmentTransform": "0,0",
         "Margin": "0,0,0,0",
         "RenderColor": "255,255,255,255",
-        "Alignments": "CenterH",
+        "Alignments": "",
         "DrawBackground": true,
-        "MinimumSize": "1,1",
-        "MaximumSize": "4096,4096",
+        "MinimumSize": "0,0",
+        "MaximumSize": "0,0",
         "Disabled": false,
-        "Hidden": true,
+        "Hidden": false,
         "RestrictToParent": false,
-        "MouseInputEnabled": false,
+        "MouseInputEnabled": true,
         "HideToolTip": false,
         "ToolTipBackground": null,
         "ToolTipFont": null,
@@ -859,7 +859,7 @@
           "RightMouseClickSound": null
         },
         "_label": {
-          "Bounds": "0,0,100,10",
+          "Bounds": "4,0,193,28",
           "Dock": "CenterV, Fill",
           "Padding": "4,4,4,4",
           "AlignmentEdgeDistances": "0,0,0,0",
@@ -879,7 +879,7 @@
           "ToolTipFont": null,
           "TooltipTextColor": null,
           "BackgroundTemplate": null,
-          "TextColor": "255,255,255,255",
+          "TextColor": null,
           "HoveredTextColor": null,
           "ClickedTextColor": null,
           "DisabledTextColor": null,
@@ -890,16 +890,16 @@
           "TextScale": 1.0
         },
         "CloseButton": {
-          "Bounds": "196,0,24,24",
-          "Dock": "None",
-          "Padding": "0,0,0,0",
+          "Bounds": "197,0,28,28",
+          "Dock": "Right",
+          "Padding": "3,3,3,3",
           "AlignmentEdgeDistances": "0,0,0,0",
           "AlignmentTransform": "0,0",
           "Margin": "0,0,0,0",
           "RenderColor": "255,255,255,255",
-          "Alignments": "Bottom,Right",
+          "Alignments": "",
           "DrawBackground": true,
-          "MinimumSize": "1,1",
+          "MinimumSize": "0,0",
           "MaximumSize": "0,0",
           "Disabled": false,
           "Hidden": false,
@@ -909,10 +909,10 @@
           "ToolTipBackground": null,
           "ToolTipFont": null,
           "TooltipTextColor": null,
-          "TextColor": "255,82,82,82",
+          "TextColor": null,
           "HoveredTextColor": null,
           "ClickedTextColor": null,
-          "DisabledTextColor": "255,90,90,90",
+          "DisabledTextColor": null,
           "TextAlign": "Center",
           "AutoSizeToContents": false,
           "FontName": null,
@@ -932,4 +932,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}