diff --git a/src/main/java/NTNU/IDATT1002/controllers/Explore.java b/src/main/java/NTNU/IDATT1002/controllers/Explore.java
index 6f0e8987e557aab6abb8b2ea567b44563372f00b..5405b0ccf5ce3232bd898c22bed83d9e7f72757f 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/Explore.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/Explore.java
@@ -57,17 +57,26 @@ public class Explore implements Initializable {
     @Override
     public void initialize(URL url, ResourceBundle resourceBundle) {
         List<NTNU.IDATT1002.models.Image> images = new ImageService(App.ex.getEntityManager()).getAllImages();
-        //Limited elements to 15 since grid pane since is 3x15
+        //Limited elements to 15 since grid pane since is 3x5
         //Can implement automatic row adding when this limit exceeded later
-        for(int i = 0; i < images.size() && i < 15; i++) {
+        for(int i = 0; i < images.size() && i < 100; i++) {
             //Row and column in gripdane
             int column = i%3;
             int row = (i-column)/3;
 
+            //Add rows
+            if(images.size() > 15){
+                gridPane.setMinHeight(1600 + (((i-15)*160)));
+                for (int j = 0; j < ((i-15)/3); j++){
+                    gridPane.addRow(j);
+                }
+            }
+
             //Make vbox container for content
             VBox vBox = new VBox();
             vBox.setPrefHeight(400);
             vBox.setPrefWidth(400);
+            vBox.setMaxHeight(400);
             vBox.setAlignment(Pos.CENTER);
             //vBox.setStyle("-fx-background-color: #999999;");
 
diff --git a/src/main/resources/NTNU/IDATT1002/explore.fxml b/src/main/resources/NTNU/IDATT1002/explore.fxml
index b054cd2010b81bbb3a834ca3aee7fbb177eb28ef..9a32047a5d02b3641a03026136b79eb07c803b18 100644
--- a/src/main/resources/NTNU/IDATT1002/explore.fxml
+++ b/src/main/resources/NTNU/IDATT1002/explore.fxml
@@ -54,7 +54,7 @@
             </HBox>
          </children>
       </HBox>
-      <ScrollPane fx:id="scrollPane" fitToWidth="true" hbarPolicy="NEVER" prefHeight="980.0" prefWidth="1920.0" VBox.vgrow="ALWAYS" styleClass="scroll-pane" stylesheets="@style.css">
+      <ScrollPane fx:id="scrollPane" fitToWidth="true" hbarPolicy="NEVER" prefHeight="980.0" prefWidth="1920.0" styleClass="scroll-pane" stylesheets="@style.css" VBox.vgrow="ALWAYS">
          <content>
             <BorderPane prefHeight="2000.0" prefWidth="1920.0" styleClass="bodybg" stylesheets="@style.css" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                <top>