diff --git a/build.gradle b/build.gradle
index 90d51c48c7..84ca2a90a8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ allprojects {
         appName = 'Mindustry'
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
-        uCoreVersion = 'abd096135c0c3da6f42b781851118b8725b1c676'
+        uCoreVersion = '88f8200deb8b64fceecfcfd7a90a6daadabf0f1a'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
diff --git a/core/src/io/anuke/mindustry/content/blocks/StorageBlocks.java b/core/src/io/anuke/mindustry/content/blocks/StorageBlocks.java
index c635796aed..0a808e7ecc 100644
--- a/core/src/io/anuke/mindustry/content/blocks/StorageBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/StorageBlocks.java
@@ -17,13 +17,11 @@ public class StorageBlocks extends BlockList implements ContentList{
 
         vault = new Vault("vault"){{
             size = 3;
-            health = 600;
             itemCapacity = 2000;
         }};
 
         container = new Vault("container"){{
             size = 2;
-            health = 600;
             itemCapacity = 500;
         }};
 
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java
index 1ac06c1a9c..dfedb5dc3d 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java
@@ -42,14 +42,20 @@ public class CustomGameDialog extends FloatingDialog{
         Table selmode = new Table();
         ButtonGroup<TextButton> group = new ButtonGroup<>();
         selmode.add("$text.level.mode").padRight(15f);
+        int i = 0;
+
+        Table modes = new Table();
+        modes.marginBottom(5);
 
         for(GameMode mode : GameMode.values()){
             if(mode.hidden) continue;
 
-            selmode.addButton("$mode." + mode.name() + ".name", "toggle", () -> state.mode = mode)
-                .update(b -> b.setChecked(state.mode == mode)).group(group).size(130f, 54f);
+            modes.addButton("$mode." + mode.name() + ".name", "toggle", () -> state.mode = mode)
+                .update(b -> b.setChecked(state.mode == mode)).group(group).size(125f, 54f).padBottom(-5);
+            if(i++ % 2 == 1) modes.row();
         }
-        selmode.addButton("?", this::displayGameModeHelp).size(50f, 54f).padLeft(18f);
+        selmode.add(modes);
+        selmode.addButton("?", this::displayGameModeHelp).width(50f).fillY().padLeft(18f);
 
         content().add(selmode);
         content().row();
@@ -83,7 +89,7 @@ public class CustomGameDialog extends FloatingDialog{
 
         float images = 146f;
 
-        int i = 0;
+        i = 0;
         for(Map map : world.maps.all()){
 
             if(i % maxwidth == 0){