diff --git a/Assets/Scenes/LoseScene.shade b/Assets/Scenes/LoseScene.shade
index ad268932..501c203f 100644
--- a/Assets/Scenes/LoseScene.shade
+++ b/Assets/Scenes/LoseScene.shade
@@ -36,6 +36,9 @@
       Mesh: 141771688
       Material: 123313564
       IsActive: true
+    UI Component:
+      Canvas ID: 1
+      IsActive: true
   Scripts: ~
 - EID: 5
   Name: Main Menu Button
@@ -56,6 +59,9 @@
       Hovered Texture: 55999018
       Clicked Texture: 66382894
       IsActive: true
+    UI Component:
+      Canvas ID: 1
+      IsActive: true
   Scripts:
     - Type: ChangeSceneButton
       Enabled: true
@@ -79,6 +85,9 @@
       Hovered Texture: 65045286
       Clicked Texture: 58607560
       IsActive: true
+    UI Component:
+      Canvas ID: 1
+      IsActive: true
   Scripts:
     - Type: QuitButton
       Enabled: true
diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade
index 25bf6994..54208e8b 100644
--- a/Assets/Scenes/MainMenu.shade
+++ b/Assets/Scenes/MainMenu.shade
@@ -22,6 +22,9 @@
       Mesh: 141771688
       Material: 121834459
       IsActive: true
+    UI Component:
+      Canvas ID: 0
+      IsActive: true
   Scripts: ~
 - EID: 5
   Name: Start Game Button
@@ -42,6 +45,9 @@
       Hovered Texture: 62235279
       Clicked Texture: 64722619
       IsActive: true
+    UI Component:
+      Canvas ID: 0
+      IsActive: true
   Scripts:
     - Type: ChangeSceneButton
       Enabled: true
@@ -65,6 +71,9 @@
       Hovered Texture: 65045286
       Clicked Texture: 58607560
       IsActive: true
+    UI Component:
+      Canvas ID: 0
+      IsActive: true
   Scripts:
     - Type: QuitButton
       Enabled: true
diff --git a/Assets/Scripts/UI/SC_ChangeSceneButton.cs b/Assets/Scripts/UI/SC_ChangeSceneButton.cs
index 80bd1550..6caba2b1 100644
--- a/Assets/Scripts/UI/SC_ChangeSceneButton.cs
+++ b/Assets/Scripts/UI/SC_ChangeSceneButton.cs
@@ -9,17 +9,22 @@ public class ChangeSceneButton : Script
     protected override void start()
     {
         UIElement ui = GetComponent<UIElement>();
-        ui.OnClick.RegisterAction(() =>
+        if (ui != null)
         {
-            if(sceneID != 0)
+            ui.OnClick.RegisterAction(() =>
             {
-                Audio.PlaySFXOnce2D("event:/UI/success");
-                SceneManager.ChangeScene(sceneID);
-                Audio.StopAllSounds();
-            }
-        });
-
-
+                if (sceneID != 0)
+                {
+                    Audio.PlaySFXOnce2D("event:/UI/success");
+                    SceneManager.ChangeScene(sceneID);
+                    Audio.StopAllSounds();
+                }
+            });
+        }
+        else
+        {
+            Debug.LogError("Failed to register button action for ChangeSceneButton.");
+        }
     }
     protected override void update()
     {
diff --git a/Assets/Scripts/UI/SC_QuitButton.cs b/Assets/Scripts/UI/SC_QuitButton.cs
index 17f6190c..48d2780a 100644
--- a/Assets/Scripts/UI/SC_QuitButton.cs
+++ b/Assets/Scripts/UI/SC_QuitButton.cs
@@ -6,12 +6,22 @@ public class QuitButton : Script
     protected override void start()
     {
         UIElement ui = GetComponent<UIElement>();
-        ui.OnClick.RegisterAction(() =>
+        if (ui != null)
         {
-            Audio.StopAllSounds();
-            Application.Quit();
-        });
+            ui.OnClick.RegisterAction(() =>
+            {
+                ui.OnClick.RegisterAction(() =>
+                {
+                    Audio.StopAllSounds();
+                    Application.Quit();
+                });
 
+            });
+        }
+        else
+        {
+            Debug.LogError("Failed to register button action for QuitButton.");
+        }
 
     }
     protected override void update()
diff --git a/SHADE_Engine/src/Serialization/SHSerialization.cpp b/SHADE_Engine/src/Serialization/SHSerialization.cpp
index a5daf644..bb0f4a43 100644
--- a/SHADE_Engine/src/Serialization/SHSerialization.cpp
+++ b/SHADE_Engine/src/Serialization/SHSerialization.cpp
@@ -205,6 +205,7 @@ namespace SHADE
 
     AddComponentToComponentNode<SHTextRenderableComponent>(components, eid);
     AddComponentToComponentNode<SHAnimatorComponent>(components, eid);
+    AddComponentToComponentNode<SHUIComponent>(components, eid);
 
     node[ComponentsNode] = components;
 
@@ -263,6 +264,7 @@ namespace SHADE
     AddComponentID<SHToggleButtonComponent>(componentIDList, componentsNode);
     AddComponentID<SHTextRenderableComponent>(componentIDList, componentsNode);
     AddComponentID<SHAnimatorComponent>(componentIDList, componentsNode);
+    AddComponentID<SHUIComponent>(componentIDList, componentsNode);
 
     return componentIDList;
   }
@@ -347,5 +349,6 @@ namespace SHADE
     SHSerializationHelper::InitializeComponentFromNode<SHTextRenderableComponent>(componentsNode, eid);
     SHSerializationHelper::InitializeComponentFromNode<SHLightComponent>(componentsNode, eid);
     SHSerializationHelper::InitializeComponentFromNode<SHAnimatorComponent>(componentsNode, eid);
+    SHSerializationHelper::InitializeComponentFromNode<SHUIComponent>(componentsNode, eid);
   }
 }