diff --git a/Assets/Editor/Editor.SHConfig b/Assets/Editor/Editor.SHConfig
index 7a7c92f8..37edf50c 100644
--- a/Assets/Editor/Editor.SHConfig
+++ b/Assets/Editor/Editor.SHConfig
@@ -1,4 +1,4 @@
 Start Maximized: true
-Working Scene ID: 97086054
+Working Scene ID: 97158628
 Window Size: {x: 1920, y: 1013}
 Style: 0
\ No newline at end of file
diff --git a/Assets/Editor/Layouts/UserLayout.ini b/Assets/Editor/Layouts/UserLayout.ini
index 9a8687ca..c9b890bd 100644
--- a/Assets/Editor/Layouts/UserLayout.ini
+++ b/Assets/Editor/Layouts/UserLayout.ini
@@ -1,16 +1,16 @@
 [Window][MainStatusBar]
-Pos=0,989
+Pos=0,981
 Size=1920,20
 Collapsed=0
 
 [Window][SHEditorMenuBar]
 Pos=0,48
-Size=1920,941
+Size=1920,933
 Collapsed=0
 
 [Window][Hierarchy Panel]
-Pos=0,187
-Size=300,802
+Pos=0,186
+Size=300,795
 Collapsed=0
 DockId=0x00000004,0
 
@@ -21,13 +21,13 @@ Collapsed=0
 
 [Window][Inspector]
 Pos=1434,48
-Size=486,941
+Size=486,933
 Collapsed=0
 DockId=0x00000006,0
 
 [Window][Profiler]
 Pos=0,48
-Size=300,137
+Size=300,136
 Collapsed=0
 DockId=0x00000003,0
 
@@ -76,7 +76,7 @@ DockId=0x0000000B,0
 
 [Window][ Viewport]
 Pos=302,48
-Size=1130,705
+Size=1130,697
 Collapsed=0
 DockId=0x0000000B,0
 
@@ -93,14 +93,14 @@ Collapsed=0
 DockId=0x0000000A,0
 
 [Window][ Asset Browser]
-Pos=302,755
+Pos=302,747
 Size=1130,234
 Collapsed=0
 DockId=0x0000000C,0
 
 [Window][Material Inspector]
 Pos=1434,48
-Size=486,941
+Size=486,933
 Collapsed=0
 DockId=0x00000006,1
 
@@ -116,13 +116,13 @@ Collapsed=0
 
 [Window][Collider Tag Panel]
 Pos=302,48
-Size=1130,705
+Size=1130,697
 Collapsed=0
 DockId=0x0000000B,1
 
 [Window][Input Bindings Panel]
 Pos=1434,48
-Size=486,941
+Size=486,933
 Collapsed=0
 DockId=0x00000006,2
 
@@ -151,7 +151,7 @@ Column 15 Weight=1.2009
 Column 16 Weight=1.0132
 
 [Docking][Data]
-DockSpace           ID=0xC5C9B8AB Window=0xBE4044E9 Pos=0,71 Size=1920,941 Split=X
+DockSpace           ID=0xC5C9B8AB Window=0xBE4044E9 Pos=0,77 Size=1920,933 Split=X
   DockNode          ID=0x00000005 Parent=0xC5C9B8AB SizeRef=1432,1036 Split=X
     DockNode        ID=0x00000001 Parent=0x00000005 SizeRef=300,1036 Split=Y Selected=0x1E6EB881
       DockNode      ID=0x00000003 Parent=0x00000001 SizeRef=225,147 Selected=0x1E6EB881
diff --git a/Assets/Materials/UIMat.shmat b/Assets/Materials/UIMat.shmat
index 625021b0..36c2f66c 100644
--- a/Assets/Materials/UIMat.shmat
+++ b/Assets/Materials/UIMat.shmat
@@ -1,8 +1,8 @@
 - VertexShader: 46580970
   FragmentShader: 35983630
-  SubPass: G-Buffer Write
+  SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 54429632
+    data.textureIndex: 51995224
     data.alpha: 0
     data.beta: {x: 1, y: 1, z: 1}
\ No newline at end of file
diff --git a/Assets/Texture/Buttons/howToPlay_default.dds b/Assets/Texture/Buttons/howToPlay_default.dds
new file mode 100644
index 00000000..b29bb336
Binary files /dev/null and b/Assets/Texture/Buttons/howToPlay_default.dds differ
diff --git a/Assets/Texture/Buttons/howToPlay_default.shtex b/Assets/Texture/Buttons/howToPlay_default.shtex
new file mode 100644
index 00000000..44fd4ab9
Binary files /dev/null and b/Assets/Texture/Buttons/howToPlay_default.shtex differ
diff --git a/Assets/Texture/Buttons/howToPlay_default.shtex.shmeta b/Assets/Texture/Buttons/howToPlay_default.shtex.shmeta
new file mode 100644
index 00000000..da1023a1
--- /dev/null
+++ b/Assets/Texture/Buttons/howToPlay_default.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: howToPlay_default
+ID: 65084899
+Type: 3
diff --git a/Assets/Texture/Buttons/howToPlay_hover.dds b/Assets/Texture/Buttons/howToPlay_hover.dds
new file mode 100644
index 00000000..1d59d29b
Binary files /dev/null and b/Assets/Texture/Buttons/howToPlay_hover.dds differ
diff --git a/Assets/Texture/Buttons/howToPlay_hover.shtex b/Assets/Texture/Buttons/howToPlay_hover.shtex
new file mode 100644
index 00000000..daafd0ac
Binary files /dev/null and b/Assets/Texture/Buttons/howToPlay_hover.shtex differ
diff --git a/Assets/Texture/Buttons/howToPlay_hover.shtex.shmeta b/Assets/Texture/Buttons/howToPlay_hover.shtex.shmeta
new file mode 100644
index 00000000..044046c3
--- /dev/null
+++ b/Assets/Texture/Buttons/howToPlay_hover.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: howToPlay_hover
+ID: 58647112
+Type: 3
diff --git a/Assets/Texture/Buttons/howToPlay_pressed.dds b/Assets/Texture/Buttons/howToPlay_pressed.dds
new file mode 100644
index 00000000..08f50be5
Binary files /dev/null and b/Assets/Texture/Buttons/howToPlay_pressed.dds differ
diff --git a/Assets/Texture/Buttons/howToPlay_pressed.shtex b/Assets/Texture/Buttons/howToPlay_pressed.shtex
new file mode 100644
index 00000000..15396e92
Binary files /dev/null and b/Assets/Texture/Buttons/howToPlay_pressed.shtex differ
diff --git a/Assets/Texture/Buttons/howToPlay_pressed.shtex.shmeta b/Assets/Texture/Buttons/howToPlay_pressed.shtex.shmeta
new file mode 100644
index 00000000..96ea8621
--- /dev/null
+++ b/Assets/Texture/Buttons/howToPlay_pressed.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: howToPlay_pressed
+ID: 55758383
+Type: 3
diff --git a/Assets/Texture/Buttons/mainMenu_default.dds b/Assets/Texture/Buttons/mainMenu_default.dds
new file mode 100644
index 00000000..d06e997a
Binary files /dev/null and b/Assets/Texture/Buttons/mainMenu_default.dds differ
diff --git a/Assets/Texture/Buttons/mainMenu_default.shtex b/Assets/Texture/Buttons/mainMenu_default.shtex
new file mode 100644
index 00000000..552473a2
Binary files /dev/null and b/Assets/Texture/Buttons/mainMenu_default.shtex differ
diff --git a/Assets/Texture/Buttons/mainMenu_default.shtex.shmeta b/Assets/Texture/Buttons/mainMenu_default.shtex.shmeta
new file mode 100644
index 00000000..04b06d0d
--- /dev/null
+++ b/Assets/Texture/Buttons/mainMenu_default.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: mainMenu_default
+ID: 65788519
+Type: 3
diff --git a/Assets/Texture/Buttons/mainMenu_hover.dds b/Assets/Texture/Buttons/mainMenu_hover.dds
new file mode 100644
index 00000000..3c30985a
Binary files /dev/null and b/Assets/Texture/Buttons/mainMenu_hover.dds differ
diff --git a/Assets/Texture/Buttons/mainMenu_hover.shtex b/Assets/Texture/Buttons/mainMenu_hover.shtex
new file mode 100644
index 00000000..1b54850b
Binary files /dev/null and b/Assets/Texture/Buttons/mainMenu_hover.shtex differ
diff --git a/Assets/Texture/Buttons/mainMenu_hover.shtex.shmeta b/Assets/Texture/Buttons/mainMenu_hover.shtex.shmeta
new file mode 100644
index 00000000..f0a7cc7f
--- /dev/null
+++ b/Assets/Texture/Buttons/mainMenu_hover.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: mainMenu_hover
+ID: 55999018
+Type: 3
diff --git a/Assets/Texture/Buttons/mainMenu_pressed.dds b/Assets/Texture/Buttons/mainMenu_pressed.dds
new file mode 100644
index 00000000..b384e5c2
Binary files /dev/null and b/Assets/Texture/Buttons/mainMenu_pressed.dds differ
diff --git a/Assets/Texture/Buttons/mainMenu_pressed.shtex b/Assets/Texture/Buttons/mainMenu_pressed.shtex
new file mode 100644
index 00000000..1f39d443
Binary files /dev/null and b/Assets/Texture/Buttons/mainMenu_pressed.shtex differ
diff --git a/Assets/Texture/Buttons/mainMenu_pressed.shtex.shmeta b/Assets/Texture/Buttons/mainMenu_pressed.shtex.shmeta
new file mode 100644
index 00000000..75dd4050
--- /dev/null
+++ b/Assets/Texture/Buttons/mainMenu_pressed.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: mainMenu_pressed
+ID: 66382894
+Type: 3
diff --git a/Assets/Texture/Buttons/quit_default.dds b/Assets/Texture/Buttons/quit_default.dds
new file mode 100644
index 00000000..52b3e518
Binary files /dev/null and b/Assets/Texture/Buttons/quit_default.dds differ
diff --git a/Assets/Texture/Buttons/quit_default.shtex b/Assets/Texture/Buttons/quit_default.shtex
new file mode 100644
index 00000000..96bbc662
Binary files /dev/null and b/Assets/Texture/Buttons/quit_default.shtex differ
diff --git a/Assets/Texture/Buttons/quit_default.shtex.shmeta b/Assets/Texture/Buttons/quit_default.shtex.shmeta
new file mode 100644
index 00000000..38aab052
--- /dev/null
+++ b/Assets/Texture/Buttons/quit_default.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: quit_default
+ID: 66477839
+Type: 3
diff --git a/Assets/Texture/Buttons/quit_hover.dds b/Assets/Texture/Buttons/quit_hover.dds
new file mode 100644
index 00000000..fb2c84c8
Binary files /dev/null and b/Assets/Texture/Buttons/quit_hover.dds differ
diff --git a/Assets/Texture/Buttons/quit_hover.shtex b/Assets/Texture/Buttons/quit_hover.shtex
new file mode 100644
index 00000000..766a41bd
Binary files /dev/null and b/Assets/Texture/Buttons/quit_hover.shtex differ
diff --git a/Assets/Texture/Buttons/quit_hover.shtex.shmeta b/Assets/Texture/Buttons/quit_hover.shtex.shmeta
new file mode 100644
index 00000000..1023cd6d
--- /dev/null
+++ b/Assets/Texture/Buttons/quit_hover.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: quit_hover
+ID: 65045286
+Type: 3
diff --git a/Assets/Texture/Buttons/quit_pressed.dds b/Assets/Texture/Buttons/quit_pressed.dds
new file mode 100644
index 00000000..ab9754d2
Binary files /dev/null and b/Assets/Texture/Buttons/quit_pressed.dds differ
diff --git a/Assets/Texture/Buttons/quit_pressed.shtex b/Assets/Texture/Buttons/quit_pressed.shtex
new file mode 100644
index 00000000..afc2662f
Binary files /dev/null and b/Assets/Texture/Buttons/quit_pressed.shtex differ
diff --git a/Assets/Texture/Buttons/quit_pressed.shtex.shmeta b/Assets/Texture/Buttons/quit_pressed.shtex.shmeta
new file mode 100644
index 00000000..75d38cdc
--- /dev/null
+++ b/Assets/Texture/Buttons/quit_pressed.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: quit_pressed
+ID: 58607560
+Type: 3
diff --git a/Assets/Texture/Buttons/retry_default.dds b/Assets/Texture/Buttons/retry_default.dds
new file mode 100644
index 00000000..373d9792
Binary files /dev/null and b/Assets/Texture/Buttons/retry_default.dds differ
diff --git a/Assets/Texture/Buttons/retry_default.shtex b/Assets/Texture/Buttons/retry_default.shtex
new file mode 100644
index 00000000..f64dcbd3
Binary files /dev/null and b/Assets/Texture/Buttons/retry_default.shtex differ
diff --git a/Assets/Texture/Buttons/retry_default.shtex.shmeta b/Assets/Texture/Buttons/retry_default.shtex.shmeta
new file mode 100644
index 00000000..e8e00bea
--- /dev/null
+++ b/Assets/Texture/Buttons/retry_default.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: retry_default
+ID: 55782622
+Type: 3
diff --git a/Assets/Texture/Buttons/retry_hover.dds b/Assets/Texture/Buttons/retry_hover.dds
new file mode 100644
index 00000000..e8d25717
Binary files /dev/null and b/Assets/Texture/Buttons/retry_hover.dds differ
diff --git a/Assets/Texture/Buttons/retry_hover.shtex b/Assets/Texture/Buttons/retry_hover.shtex
new file mode 100644
index 00000000..f5e30205
Binary files /dev/null and b/Assets/Texture/Buttons/retry_hover.shtex differ
diff --git a/Assets/Texture/Buttons/retry_hover.shtex.shmeta b/Assets/Texture/Buttons/retry_hover.shtex.shmeta
new file mode 100644
index 00000000..8c26fe21
--- /dev/null
+++ b/Assets/Texture/Buttons/retry_hover.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: retry_hover
+ID: 58972174
+Type: 3
diff --git a/Assets/Texture/Buttons/retry_pressed.dds b/Assets/Texture/Buttons/retry_pressed.dds
new file mode 100644
index 00000000..d0f90c99
Binary files /dev/null and b/Assets/Texture/Buttons/retry_pressed.dds differ
diff --git a/Assets/Texture/Buttons/retry_pressed.shtex b/Assets/Texture/Buttons/retry_pressed.shtex
new file mode 100644
index 00000000..fb134ec9
Binary files /dev/null and b/Assets/Texture/Buttons/retry_pressed.shtex differ
diff --git a/Assets/Texture/Buttons/retry_pressed.shtex.shmeta b/Assets/Texture/Buttons/retry_pressed.shtex.shmeta
new file mode 100644
index 00000000..2f9fd295
--- /dev/null
+++ b/Assets/Texture/Buttons/retry_pressed.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: retry_pressed
+ID: 55224464
+Type: 3
diff --git a/Assets/Texture/Buttons/settings_default.dds b/Assets/Texture/Buttons/settings_default.dds
new file mode 100644
index 00000000..7c37be34
Binary files /dev/null and b/Assets/Texture/Buttons/settings_default.dds differ
diff --git a/Assets/Texture/Buttons/settings_default.shtex b/Assets/Texture/Buttons/settings_default.shtex
new file mode 100644
index 00000000..126499fd
Binary files /dev/null and b/Assets/Texture/Buttons/settings_default.shtex differ
diff --git a/Assets/Texture/Buttons/settings_default.shtex.shmeta b/Assets/Texture/Buttons/settings_default.shtex.shmeta
new file mode 100644
index 00000000..2c3121ce
--- /dev/null
+++ b/Assets/Texture/Buttons/settings_default.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: settings_default
+ID: 58593104
+Type: 3
diff --git a/Assets/Texture/Buttons/settings_hover.dds b/Assets/Texture/Buttons/settings_hover.dds
new file mode 100644
index 00000000..88269cac
Binary files /dev/null and b/Assets/Texture/Buttons/settings_hover.dds differ
diff --git a/Assets/Texture/Buttons/settings_hover.shtex b/Assets/Texture/Buttons/settings_hover.shtex
new file mode 100644
index 00000000..32955a83
Binary files /dev/null and b/Assets/Texture/Buttons/settings_hover.shtex differ
diff --git a/Assets/Texture/Buttons/settings_hover.shtex.shmeta b/Assets/Texture/Buttons/settings_hover.shtex.shmeta
new file mode 100644
index 00000000..061eb51d
--- /dev/null
+++ b/Assets/Texture/Buttons/settings_hover.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: settings_hover
+ID: 64495732
+Type: 3
diff --git a/Assets/Texture/Buttons/settings_pressed.dds b/Assets/Texture/Buttons/settings_pressed.dds
new file mode 100644
index 00000000..c038bcdc
Binary files /dev/null and b/Assets/Texture/Buttons/settings_pressed.dds differ
diff --git a/Assets/Texture/Buttons/settings_pressed.shtex b/Assets/Texture/Buttons/settings_pressed.shtex
new file mode 100644
index 00000000..0342170a
Binary files /dev/null and b/Assets/Texture/Buttons/settings_pressed.shtex differ
diff --git a/Assets/Texture/Buttons/settings_pressed.shtex.shmeta b/Assets/Texture/Buttons/settings_pressed.shtex.shmeta
new file mode 100644
index 00000000..e2007e10
--- /dev/null
+++ b/Assets/Texture/Buttons/settings_pressed.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: settings_pressed
+ID: 63138015
+Type: 3
diff --git a/Assets/Texture/Buttons/startGame_default.dds b/Assets/Texture/Buttons/startGame_default.dds
new file mode 100644
index 00000000..f8ece9bb
Binary files /dev/null and b/Assets/Texture/Buttons/startGame_default.dds differ
diff --git a/Assets/Texture/Buttons/startGame_default.shtex b/Assets/Texture/Buttons/startGame_default.shtex
new file mode 100644
index 00000000..174eca7d
Binary files /dev/null and b/Assets/Texture/Buttons/startGame_default.shtex differ
diff --git a/Assets/Texture/Buttons/startGame_default.shtex.shmeta b/Assets/Texture/Buttons/startGame_default.shtex.shmeta
new file mode 100644
index 00000000..6dd0376f
--- /dev/null
+++ b/Assets/Texture/Buttons/startGame_default.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: startGame_default
+ID: 52901020
+Type: 3
diff --git a/Assets/Texture/Buttons/startGame_hover.dds b/Assets/Texture/Buttons/startGame_hover.dds
new file mode 100644
index 00000000..aedcab05
Binary files /dev/null and b/Assets/Texture/Buttons/startGame_hover.dds differ
diff --git a/Assets/Texture/Buttons/startGame_hover.shtex b/Assets/Texture/Buttons/startGame_hover.shtex
new file mode 100644
index 00000000..61abe918
Binary files /dev/null and b/Assets/Texture/Buttons/startGame_hover.shtex differ
diff --git a/Assets/Texture/Buttons/startGame_hover.shtex.shmeta b/Assets/Texture/Buttons/startGame_hover.shtex.shmeta
new file mode 100644
index 00000000..881b34f9
--- /dev/null
+++ b/Assets/Texture/Buttons/startGame_hover.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: startGame_hover
+ID: 62235279
+Type: 3
diff --git a/Assets/Texture/Buttons/startGame_pressed.dds b/Assets/Texture/Buttons/startGame_pressed.dds
new file mode 100644
index 00000000..a915be85
Binary files /dev/null and b/Assets/Texture/Buttons/startGame_pressed.dds differ
diff --git a/Assets/Texture/Buttons/startGame_pressed.shtex b/Assets/Texture/Buttons/startGame_pressed.shtex
new file mode 100644
index 00000000..1dcc8ba3
Binary files /dev/null and b/Assets/Texture/Buttons/startGame_pressed.shtex differ
diff --git a/Assets/Texture/Buttons/startGame_pressed.shtex.shmeta b/Assets/Texture/Buttons/startGame_pressed.shtex.shmeta
new file mode 100644
index 00000000..05314b21
--- /dev/null
+++ b/Assets/Texture/Buttons/startGame_pressed.shtex.shmeta
@@ -0,0 +1,3 @@
+Name: startGame_pressed
+ID: 64722619
+Type: 3
diff --git a/Assets/Texture/TX_LoseScene.dds b/Assets/Texture/TX_LoseScene.dds
index e6430c46..796b460d 100644
Binary files a/Assets/Texture/TX_LoseScene.dds and b/Assets/Texture/TX_LoseScene.dds differ
diff --git a/Assets/Texture/TX_LoseScene.shtex b/Assets/Texture/TX_LoseScene.shtex
index e4b9ea83..a7759954 100644
Binary files a/Assets/Texture/TX_LoseScene.shtex and b/Assets/Texture/TX_LoseScene.shtex differ
diff --git a/Assets/Texture/TX_MainMenu.dds b/Assets/Texture/TX_MainMenu.dds
index 250b431d..93b5112d 100644
Binary files a/Assets/Texture/TX_MainMenu.dds and b/Assets/Texture/TX_MainMenu.dds differ
diff --git a/Assets/Texture/TX_MainMenu.shtex b/Assets/Texture/TX_MainMenu.shtex
index 2370006f..f7c19f5a 100644
Binary files a/Assets/Texture/TX_MainMenu.shtex and b/Assets/Texture/TX_MainMenu.shtex differ
diff --git a/Assets/Texture/TX_WinScene.dds b/Assets/Texture/TX_WinScene.dds
index 64f7e679..f37da6bb 100644
Binary files a/Assets/Texture/TX_WinScene.dds and b/Assets/Texture/TX_WinScene.dds differ
diff --git a/Assets/Texture/TX_WinScene.shtex b/Assets/Texture/TX_WinScene.shtex
index 45967704..a8354a42 100644
Binary files a/Assets/Texture/TX_WinScene.shtex and b/Assets/Texture/TX_WinScene.shtex differ
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
index a050894c..1ac6e2d8 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
@@ -199,7 +199,7 @@ namespace SHADE
       // Check material usage
       for (const auto& rendId : sb.Renderables)
       {
-        auto rend = SHComponentManager::GetComponent<SHRenderable>(rendId);
+        auto rend = SHComponentManager::GetComponent_s<SHRenderable>(rendId);
         if (rend)
         {
           if (rend->GetMaterial() == matToCheck)
@@ -328,7 +328,7 @@ namespace SHADE
       for (auto rendId : subBatch.Renderables)
       {
         // Transform
-        auto transform = SHComponentManager::GetComponent<SHTransformComponent>(rendId);
+        auto transform = SHComponentManager::GetComponent_s<SHTransformComponent>(rendId);
         if (transform)
         {
           if (SHSceneManager::CheckNodeAndComponentsActive<SHRenderable>(rendId))
@@ -382,12 +382,15 @@ namespace SHADE
     for (auto& subBatch : subBatches)
     for (auto rendId : subBatch.Renderables)
     {
-      auto* renderable = SHComponentManager::GetComponent<SHRenderable>(rendId);
-      instancedIntegerData.emplace_back(SHInstancedIntegerData
+      auto* renderable = SHComponentManager::GetComponent_s<SHRenderable>(rendId);
+      if (renderable)
       {
-        rendId,
-        renderable->GetLightLayer()
-      });
+        instancedIntegerData.emplace_back(SHInstancedIntegerData
+          {
+            rendId,
+            renderable->GetLightLayer()
+          });
+      }
     }
 
     // Transfer to GPU
@@ -579,13 +582,17 @@ namespace SHADE
             transformData.emplace_back();
           }
 
-          const SHRenderable* renderable = SHComponentManager::GetComponent<SHRenderable>(rendId);
-          instancedIntegerData.emplace_back(SHInstancedIntegerData
-            {
-              rendId,
-              renderable->GetLightLayer()
-            }
-          );
+          const SHRenderable* renderable = SHComponentManager::GetComponent_s<SHRenderable>(rendId);
+          if (renderable)
+          {
+            instancedIntegerData.emplace_back(SHInstancedIntegerData
+              {
+                rendId,
+                renderable->GetLightLayer()
+              }
+            );
+          }
+
 
           // Material Properties
           if (!EMPTY_MAT_PROPS)
diff --git a/SHADE_Engine/src/UI/SHButtonComponent.cpp b/SHADE_Engine/src/UI/SHButtonComponent.cpp
index 8e87b10e..b6c71136 100644
--- a/SHADE_Engine/src/UI/SHButtonComponent.cpp
+++ b/SHADE_Engine/src/UI/SHButtonComponent.cpp
@@ -1,6 +1,7 @@
 #include "SHpch.h"
 #include "SHButtonComponent.h"
-
+#include "Resource/SHResourceManager.h"
+#include "Graphics/MiddleEnd/Textures/SHTextureLibrary.h"
 
 namespace SHADE
 {
diff --git a/SHADE_Engine/src/UI/SHUISystem.cpp b/SHADE_Engine/src/UI/SHUISystem.cpp
index 3c8be293..d18566cf 100644
--- a/SHADE_Engine/src/UI/SHUISystem.cpp
+++ b/SHADE_Engine/src/UI/SHUISystem.cpp
@@ -237,17 +237,19 @@ namespace SHADE
       //auto texture = SHResourceManager::Get<SHTexture>(comp.GetDefaultTexture());
 
       auto material = renderable->GetModifiableMaterial();
-      if(!comp.isHovered && !comp.isClicked)
-      if (comp.GetDefaultTexture() != 0 && SHAssetManager::GetType(comp.GetDefaultTexture()) == AssetType::TEXTURE)
+      if (!comp.isHovered && !comp.isClicked)
       {
-        material->SetProperty("data.textureIndex", comp.GetDefaultTexture());
-        //SHLOG_INFO("SETTING DEFAULT TEXTURE")
-      }      
+        if (comp.GetDefaultTexture() != 0 && SHAssetManager::GetType(comp.GetDefaultTexture()) == AssetType::TEXTURE)
+        {
+          material->SetProperty("data.textureIndex", SHResourceManager::LoadOrGet<SHTexture>(comp.GetDefaultTexture()));
+          //SHLOG_INFO("SETTING DEFAULT TEXTURE")
+        }
+      }
       else if (comp.isClicked)
       {
         if (comp.GetClickedTexture() != 0 && SHAssetManager::GetType(comp.GetClickedTexture()) == AssetType::TEXTURE)
         {
-          material->SetProperty("data.textureIndex", comp.GetClickedTexture());
+          material->SetProperty("data.textureIndex", SHResourceManager::LoadOrGet<SHTexture>(comp.GetClickedTexture()));
           //SHLOG_INFO("SETTING CLICKED TEXTURE")
         }
       }
@@ -255,7 +257,7 @@ namespace SHADE
       {
         if (comp.GetHoveredTexture() != 0 && SHAssetManager::GetType(comp.GetHoveredTexture()) == AssetType::TEXTURE)
         {
-          material->SetProperty("data.textureIndex", comp.GetHoveredTexture());
+          material->SetProperty("data.textureIndex", SHResourceManager::LoadOrGet<SHTexture>( comp.GetHoveredTexture()));
           //SHLOG_INFO("SETTING HOVERED TEXTURE")
         }
       }
@@ -361,7 +363,7 @@ namespace SHADE
       {
         if (comp.GetDefaultTexture()!= 0 &&  SHAssetManager::GetType(comp.GetDefaultTexture()) == AssetType::TEXTURE)
         {
-          material->SetProperty("data.textureIndex", comp.GetDefaultTexture());
+          material->SetProperty("data.textureIndex", SHResourceManager::LoadOrGet<SHTexture>(comp.GetDefaultTexture()));
           //SHLOG_INFO("SETTING DEFAULT TEXTURE")
         }
       }
@@ -369,7 +371,7 @@ namespace SHADE
       {
         if (comp.GetToggledTexture() != 0 && SHAssetManager::GetType(comp.GetToggledTexture()) == AssetType::TEXTURE)
         {
-          material->SetProperty("data.textureIndex", comp.GetToggledTexture());
+          material->SetProperty("data.textureIndex", SHResourceManager::LoadOrGet<SHTexture>(comp.GetToggledTexture()));
           //SHLOG_INFO("SETTING DEFAULT TEXTURE")
         }
       }