diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java
index edd802ba3..fe2505b61 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java
@@ -204,12 +204,6 @@ public final class FXUtils {
         Lang.invoke((ExceptionalSupplier<Object, IOException>) loader::load);
     }
 
-    public static void resetChildren(JFXMasonryPane pane, List<Node> children) {
-        // Fixes mis-repositioning.
-        ReflectionHelper.setFieldContent(JFXMasonryPane.class, pane, "oldBoxes", null);
-        pane.getChildren().setAll(children);
-    }
-
     public static void installTooltip(Node node, String tooltip) {
         installTooltip(node, 0, 5000, 0, new Tooltip(tooltip));
     }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java
index b5a1ccfd5..58b8c3fe6 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java
@@ -23,6 +23,7 @@ import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.image.Image;
 import javafx.scene.input.MouseButton;
 import javafx.scene.layout.Region;
@@ -75,6 +76,8 @@ public final class MainPage extends StackPane implements DecoratorPage {
     private JFXSpinner spinner;
     @FXML
     private JFXMasonryPane masonryPane;
+    @FXML
+    private ScrollPane scrollPane;
 
     {
         FXUtils.loadFXML(this, "/assets/fxml/main.fxml");
@@ -221,7 +224,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
 
     private void loadingVersions() {
         getChildren().setAll(spinner);
-        FXUtils.resetChildren(masonryPane, Collections.emptyList());
+        masonryPane.getChildren().clear();
     }
 
     private void loadVersions(HMCLGameRepository repository) {
@@ -231,8 +234,8 @@ public final class MainPage extends StackPane implements DecoratorPage {
         }
         JFXUtilities.runInFX(() -> {
             if (profile == repository.getProfile()) {
+                masonryPane.getChildren().setAll(children);
                 getChildren().setAll(contentPane);
-                FXUtils.resetChildren(masonryPane, children);
             }
         });
     }
diff --git a/HMCL/src/main/resources/assets/fxml/main.fxml b/HMCL/src/main/resources/assets/fxml/main.fxml
index 6d1ff1a6b..6eb7f3dfa 100644
--- a/HMCL/src/main/resources/assets/fxml/main.fxml
+++ b/HMCL/src/main/resources/assets/fxml/main.fxml
@@ -12,7 +12,7 @@
         xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
     <JFXSpinner fx:id="spinner" styleClass="first-spinner" />
     <StackPane fx:id="contentPane">
-        <ScrollPane fitToHeight="true" fitToWidth="true" fx:id="scrollPane" hbarPolicy="NEVER">
+        <ScrollPane fitToWidth="true" fx:id="scrollPane" hbarPolicy="NEVER">
             <JFXMasonryPane fx:id="masonryPane" HSpacing="3" VSpacing="3" cellWidth="182" cellHeight="160">
             </JFXMasonryPane>
         </ScrollPane>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 568c50bf3..8c8c62487 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed Jun 06 15:09:11 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
diff --git a/lib/JFoenix.jar b/lib/JFoenix.jar
index 40a6d972e..8abbd3f54 100644
Binary files a/lib/JFoenix.jar and b/lib/JFoenix.jar differ