diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ea151e..e8787eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -249,7 +249,7 @@ add_executable(My3D
         lib/gamacon/src/components/tooltip_component.c
         lib/gamacon/include/components/tooltip_component.h
         lib/gamacon/src/systems/tooltip_system.c
-        lib/gamacon/src/components/isometry/vertex_data_loader.c)
+        lib/gamacon/src/components/isometry/vertex_data_loader.c lib/gamacon/src/components/isometry/map_manager_component.c lib/gamacon/include/components/isometry/map_manager_component.h)
 
 add_compile_options(-W -Wall -Wextra -Wshadow)
 
diff --git a/assets/ui/tile_select.png b/assets/ui/tile_select.png
new file mode 100644
index 0000000..937f6f4
Binary files /dev/null and b/assets/ui/tile_select.png differ
diff --git a/assets/ui/up_down.png b/assets/ui/up_down.png
new file mode 100644
index 0000000..c56e6a2
Binary files /dev/null and b/assets/ui/up_down.png differ
diff --git a/assets/ui/vertex_select.png b/assets/ui/vertex_select.png
new file mode 100644
index 0000000..f15e04b
Binary files /dev/null and b/assets/ui/vertex_select.png differ
diff --git a/lib/gamacon b/lib/gamacon
index dfda973..2cc17be 160000
--- a/lib/gamacon
+++ b/lib/gamacon
@@ -1 +1 @@
-Subproject commit dfda973a2846c4942f68fe4cb246b9fdc4e5d6f6
+Subproject commit 2cc17bef752f94f4fedd6db77e78afa9cce495a4
diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab
index d840a54..9ad30c9 100644
--- a/prefabs/game.gcprefab
+++ b/prefabs/game.gcprefab
@@ -7,6 +7,9 @@
 		<sprite name="button_background" src="assets/ui/button_background.png" />
         <sprite name="happiness" src="assets/ui/happiness.png" />
         <sprite name="clown" src="assets/ui/clown.png" />
+        <sprite name="tile_select" src="assets/ui/tile_select.png" />
+        <sprite name="vertex_select" src="assets/ui/vertex_select.png" />
+        <sprite name="up_down" src="assets/ui/up_down.png" />
         <sprite name="rotate" src="assets/ui/rotate.png" />
         <sprite name="cobblestone" src="assets/sprites/cobblestone.png" />
         <sprite name="comparator_on" src="assets/sprites/comparator_on.png" />
@@ -25,6 +28,7 @@
     <gc_entities>
         <gc_entity>
             <clickable_component click="map_manage_click"/>
+            <map_manager_component />
             <transform_component>
                 <Position x="25" y="320" />
                 <Size x="100000000" y="100000000" />
@@ -38,13 +42,16 @@
 
 		<gc_entity>
 			<game_manager happiness="50%" stupidity="0%" />
-			<teams_component delay="5">
+			<teams_component delay="2">
 				<prefab src="prefabs/teams/forgot_register.gcprefab" height="20%" />
 				<prefab src="prefabs/teams/absent.gcprefab" height="20%" />
 			</teams_component>
 		</gc_entity>
 
 		<panel src="panel" x="7%" y="3%" width="30%" height="6%"/>
+		<button sprite="tile_select" x="3%" y="3%" width="%" height="3%" tooltip="Select a tile." tooltip_x="5" tooltip_y="-5" size="15"/>
+		<button sprite="vertex_select" x="7%" y="3%" width="%" height="3%" tooltip="Select a Vertex." tooltip_y="-5" size="15"/>
+		<button sprite="up_down" x="15%" y="3%" width="%" height="3%" tooltip="Move a tiles.\n - Up with left click.\n - Down with right click" tooltip_y="-15" size="15"/>
 		<button sprite="rotate" x="19%" y="3%" width="%" height="3%" tooltip="Rotate a texture" tooltip_y="-5" size="15"/>
 
 		<panel src="panel" x="100%" y="50%" width="50%" height="120%"/>