diff --git a/Prefabs/Robot/RobotDisplay.tscn b/Prefabs/Robot/RobotDisplay.tscn
index dc6daee..00c9e43 100644
--- a/Prefabs/Robot/RobotDisplay.tscn
+++ b/Prefabs/Robot/RobotDisplay.tscn
@@ -22,6 +22,7 @@ alignment = 1
 [node name="ListItem" type="RichTextLabel" parent="HBoxContainer" unique_id=46246913]
 layout_mode = 2
 size_flags_horizontal = 3
+size_flags_stretch_ratio = 0.5
 text = "Robot #1"
 fit_content = true
 autowrap_mode = 0
@@ -31,11 +32,13 @@ vertical_alignment = 1
 [node name="Jump" type="Button" parent="HBoxContainer" unique_id=391426419]
 layout_mode = 2
 size_flags_horizontal = 3
+size_flags_stretch_ratio = 0.2
 text = "Jump to"
 
 [node name="Follow" type="Button" parent="HBoxContainer" unique_id=101092106]
 layout_mode = 2
 size_flags_horizontal = 3
+size_flags_stretch_ratio = 0.2
 text = "Follow"
 
 [node name="CurrentScript" type="RichTextLabel" parent="HBoxContainer" unique_id=425408407]
diff --git a/Scripts/UI/Robots/RobotList.cs b/Scripts/UI/Robots/RobotList.cs
index be7a9f1..e087110 100644
--- a/Scripts/UI/Robots/RobotList.cs
+++ b/Scripts/UI/Robots/RobotList.cs
@@ -98,10 +98,10 @@ public partial class RobotList : PanelContainer
 
 		GameData.inventory.RemoveItem(spawnId, 1);
 		Robot robot = ResourceLoader.LoadRobotPrefab().Instantiate<Robot>();
-		robot.Name = $"Robot #{GameData.robots.Count}";
 		robot.Position = GameData.map[0].tiles[0, 0].Position;
 		robot.robotType = spawnId;
 		GetNode("/root/Main/World").AddChild(robot);
+		robot.Name = $"Robot #{GameData.robots.Count}";
 		GameData.robots.Add(robot);
 		spawnId = "";