diff --git a/src/de/anura/core/Setup.java b/src/de/anura/core/Setup.java
index 2ae155f..f0ee66f 100644
--- a/src/de/anura/core/Setup.java
+++ b/src/de/anura/core/Setup.java
@@ -225,27 +225,31 @@ public class Setup {
 
             Inventories.registerInventory("MINIGAMES", "minigames_inv", ChatColor.DARK_BLUE);
             Inventories.putIntoInventory("MINIGAMES", 0, Inventories.buildItems(Material.BOW, "inv_lobby_smash", ChatColor.GREEN, ChatColor.BLUE, "smash_description_1", "smash_description_2", "smash_description_3", "smash_description_4", "smash_description_5", "smash_description_6"));
-            Inventories.putIntoInventory("MINIGAMES", 2, Inventories.buildItems(Material.WHEAT, "inv_lobby_farmfight", ChatColor.YELLOW));
-            Inventories.putIntoInventory("MINIGAMES", 4, Inventories.buildItems(Material.FIREWORK, "inv_lobby_rocketmatch", ChatColor.DARK_AQUA));
+            Inventories.putIntoInventory("MINIGAMES", 1, Inventories.buildItems(Material.WHEAT, "inv_lobby_farmfight", ChatColor.YELLOW));
+            Inventories.putIntoInventory("MINIGAMES", 2, Inventories.buildItems(Material.FIREWORK, "inv_lobby_rocketmatch", ChatColor.DARK_AQUA));
+            Inventories.putIntoInventory("MINIGAMES", 4, Inventories.buildItems(Material.EXP_BOTTLE, "inv_lobby_xpbattle", ChatColor.GREEN));
+            Inventories.putIntoInventory("MINIGAMES", 5, Inventories.buildItems(Material.WATER_BUCKET, "inv_lobby_swim", ChatColor.DARK_AQUA));
             Inventories.putIntoInventory("MINIGAMES", 8, Inventories.buildItems(Material.ENDER_PEARL, "inv_lobby_back", ChatColor.YELLOW));
 
             Inventories.registerAction("MINIGAMES", 0, Inventories.Action.SERVER, "smash");
-            Inventories.registerAction("MINIGAMES", 2, Inventories.Action.SERVER, "farmfight");
-            Inventories.registerAction("MINIGAMES", 4, Inventories.Action.SERVER, "rocketmatch");
+            Inventories.registerAction("MINIGAMES", 1, Inventories.Action.SERVER, "farmfight");
+            Inventories.registerAction("MINIGAMES", 2, Inventories.Action.SERVER, "rocketmatch");
+            Inventories.registerAction("MINIGAMES", 4, Inventories.Action.COMMAND, "toggleminigame xpbattle");
+            Inventories.registerAction("MINIGAMES", 5, Inventories.Action.COMMAND, "aimthewater");
             Inventories.registerAction("MINIGAMES", 8, Inventories.Action.OPEN_INV, "GAMEMODES");
 
             Inventories.registerInventory("LOBBY", "lobby_inv", ChatColor.DARK_BLUE);
             Inventories.putIntoInventory("LOBBY", 0, Inventories.buildItems(Material.SLIME_BALL, "inv_lobby_jump", ChatColor.DARK_GREEN));
             Inventories.putIntoInventory("LOBBY", 1, Inventories.buildItems(Material.WATER_BUCKET, "inv_lobby_swim", ChatColor.DARK_AQUA));
-            Inventories.putIntoInventory("LOBBY", 3, Inventories.buildItems(Material.EXP_BOTTLE, "inv_lobby_xpbattle", ChatColor.GREEN));
-            Inventories.putIntoInventory("LOBBY", 4, Inventories.buildItems(Material.POTION, "inv_lobby_pool", ChatColor.BLUE));
+            Inventories.putIntoInventory("LOBBY", 3, Inventories.buildItems(Material.BOW, "inv_lobby_smash", ChatColor.GREEN));
+            Inventories.putIntoInventory("LOBBY", 4, Inventories.buildItems(Material.WHEAT, "inv_lobby_farmfight", ChatColor.YELLOW));
             Inventories.putIntoInventory("LOBBY", 6, Inventories.buildItems(Material.WOOD_DOOR, "tp_to_spawn", ChatColor.GOLD));
             Inventories.putIntoInventory("LOBBY", 8, Inventories.buildItems(Material.ENDER_PEARL, "inv_lobby_back", ChatColor.YELLOW));
 
             Inventories.registerAction("LOBBY", 0, Inventories.Action.COMMAND, "jumpinv");
             Inventories.registerAction("LOBBY", 1, Inventories.Action.TELEPORT, new Location(Bukkit.getWorld("lobby"), -289, 31, -1715));
-            Inventories.registerAction("LOBBY", 3, Inventories.Action.COMMAND, "toggleminigame xpbattle");
-            Inventories.registerAction("LOBBY", 4, Inventories.Action.COMMAND, "aimthewater");
+            Inventories.registerAction("LOBBY", 3, Inventories.Action.TELEPORT, new Location(Bukkit.getWorld("lobby"), 64, 34, -1490));
+            Inventories.registerAction("LOBBY", 4, Inventories.Action.TELEPORT, new Location(Bukkit.getWorld("lobby"), -106, 22, -1806));
             Inventories.registerAction("LOBBY", 6, Inventories.Action.COMMAND, "spawn");
             Inventories.registerAction("LOBBY", 8, Inventories.Action.OPEN_INV, "GAMEMODES");