diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5731572..51886e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -209,6 +209,8 @@ add_executable(My3D
         lib/gamacon/src/systems/clickable_system.c
         lib/gamacon/src/sfml_renderer/sfml_init.c
         lib/gamacon/src/sfml_renderer/sfml_events.c
+        lib/gamacon/src/components/map_managment.c
+        lib/gamacon/include/components/map_managment.h
 )
 
 add_compile_options(-W -Wall -Wextra -Wshadow)
diff --git a/lib/gamacon b/lib/gamacon
index b50724f..db72c2c 160000
--- a/lib/gamacon
+++ b/lib/gamacon
@@ -1 +1 @@
-Subproject commit b50724f975ce1799e32b5cfbef4da06e983cd53b
+Subproject commit db72c2c0f30b8b2bead72c9cc790647a9c5c6b13
diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab
index 5c57517..08a7946 100644
--- a/prefabs/game.gcprefab
+++ b/prefabs/game.gcprefab
@@ -10,10 +10,12 @@
     </data>
     <gc_entities>
         <gc_entity>
+            <clickable_component click="map_manage_click"/>
             <transform_component>
-                <Position x="00" y="320" />
-                <Size x="100" y="100" />
+                <Position x="25" y="320" />
+                <Size x="100000000" y="100000000" />
             </transform_component>
+            <camerafollow_component />
             <vertex_component tilemap="prefabs/tilemap.gcmap" />
             <renderer vertex="tilemap">
                 <Rect height="auto" width="auto" top="0" left="0" />
diff --git a/prefabs/tilemap.gcmap b/prefabs/tilemap.gcmap
index 80c8654..d0e27c0 100644
--- a/prefabs/tilemap.gcmap
+++ b/prefabs/tilemap.gcmap
@@ -2,43 +2,6 @@
     <line>
         <row height="0" />
         <row height="0" />
-        <row height="02" />
-        <row height="03" />
-        <row height="04" />
-        <row height="05" />
-        <row height="06" />
-        <row height="07" />
-        <row height="08" />
-        <row height="09" />
-        <row height="0" />
-    </line>
-    <line>
-        <row height="10" />
-        <row height="11" />
-        <row height="12" />
-        <row height="13" />
-        <row height="14" />
-        <row height="15" />
-        <row height="16" />
-        <row height="17" />
-        <row heig    vert2->position = get_tile_coords(corners[3], corners[4], corners[5]);ht="18" />
-        <row height="19" />
-        <row height="20" />
-    </line>
-    <line>
-        <row height="20" />
-        <row height="21" />
-        <row height="22" />
-        <row height="23" />
-        <row height="24" />
-        <row height="25" />
-        <row height="26" />
-        <row height="27" />
-        <row height="28" />
-        <row height="29" />
-        <row height="30" />
-    </line>
-    <line>
         <row height="0" />
         <row height="0" />
         <row height="0" />
@@ -48,47 +11,6 @@
         <row height="0" />
         <row height="0" />
         <row height="0" />
-        <row height="0" />
-        <row height="0" />
-    </line>
-    <line>
-        <row height="0" />
-        <row height="0" />
-        <row height="0" />
-        <row height="-40" />
-        <row height="-50" />
-        <row height="-40" />
-        <row height="0" />
-        <row height="0" />
-        <row height="0" />
-        <row height="0" />
-        <row height="0" />
-    </line>
-    <line>
-        <row height="0" />
-        <row height="0" />
-        <row height="0" />
-        <row height="0" />
-        <row height="20" />
-        <row height="50" />
-        <row height="20" />
-        <row height="0" />
-        <row height="0" />
-        <row height="0" />
-        <row height="0" />
-    </line>
-    <line>
-        <row height="50" />
-        <row height="100" />
-        <row height="0" />
-        <row height="0" />
-        <row height="0" />
-        <row height="0" />
-        <row height="0" />
-        <row height="0" />
-        <row height="0" />
-        <row height="0" />
-        <row height="100" />
     </line>
     <line>
         <row height="0" />
@@ -139,7 +61,85 @@
         <row height="0" />
         <row height="0" />
         <row height="0" />
-        <row height="40" />
-        <row height="50" />
+        <row height="0" />
+        <row height="0" />
+    </line>
+    <line>
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+    </line>
+    <line>
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+    </line>
+    <line>
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+    </line>
+    <line>
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+    </line>
+    <line>
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+    </line>
+    <line>
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
+        <row height="0" />
     </line>
 </gc_map>
\ No newline at end of file
diff --git a/src/game_loader.c b/src/game_loader.c
index 6451ec5..a49df98 100644
--- a/src/game_loader.c
+++ b/src/game_loader.c
@@ -7,6 +7,7 @@
 
 #include "engine.h"
 #include "setup.h"
+#include "map_managment.h"
 #include <SFML/System.h>
 
 int register_customcmps(gc_engine *engine)
@@ -14,6 +15,7 @@ int register_customcmps(gc_engine *engine)
     engine->finish_physics(engine);
 	engine->add_callback(engine, "start_button", &start_button);
 	engine->add_callback(engine, "quit", &quit);
+	engine->add_callback(engine, "map_manage_click", &map_manage_click);
     return (0);
 }
 
diff --git a/src/main_menu.c b/src/main_menu.c
index 1686918..977feb8 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -12,6 +12,7 @@ bool start_button(gc_engine *engine, int entity_id)
 	if (!scene) {
 		engine->should_close = true;
 		my_printf("The game scene couldn't be found.\n");
+		return (false);
 	}
 	engine->change_scene(engine, scene);
 	return (true);