diff --git a/common/src/main/java/me/codexadrian/tempad/client/gui/RunProgramScreen.java b/common/src/main/java/me/codexadrian/tempad/client/gui/RunProgramScreen.java
index 5489726..fd5f37a 100644
--- a/common/src/main/java/me/codexadrian/tempad/client/gui/RunProgramScreen.java
+++ b/common/src/main/java/me/codexadrian/tempad/client/gui/RunProgramScreen.java
@@ -58,11 +58,28 @@ public RunProgramScreen(int color, InteractionHand hand) {
     @Override
     public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
         int wiggleRoom = listSize > 12 ? listSize - 12 : 0;
-        mouseMovement = Math.min(wiggleRoom, Math.max(mouseMovement + (int) (delta * 10), 0));
+        mouseMovement = Math.min(wiggleRoom, Math.max(mouseMovement - (int) (delta), 0));
         if(listSize > 12) listNeedsReload = true;
         return super.mouseScrolled(mouseX, mouseY, delta);
     }
 
+    private void addRenderableLocationList(){
+        int x = (width - WIDTH) / 2 + 3 + 16 * 15;
+        int y = (height - HEIGHT) / 2 + 3 + 16 * 2;
+        if(displayedLocations != null)
+            for(TextButton button : displayedLocations)
+                removeWidget(button);
+        displayedLocations = new ArrayList<>();
+        int offset = Math.max(0,Math.min(mouseMovement, listSize - 12));
+        for(int i = offset; i < Math.min(listSize,12 + offset); i++) {
+            LocationData data = allLocations.get(i);
+            displayedLocations.add(new TextButton(x, y, 12, Component.literal(data.getName()), color, (button -> locationButtonOnPress(data))));
+            y+=16;
+        }
+        displayedLocations.forEach(this::addRenderableWidget);
+        this.listNeedsReload = false;
+    }
+
     @Override
     protected void init() {
         super.init();
@@ -71,25 +88,9 @@ protected void init() {
         ItemStack stack = minecraft.player.getItemInHand(this.hand);
         if(stack.hasTag()) {
             allLocations = new ArrayList<>(TempadComponent.fromStack(stack).getLocations());
+            Collections.sort(allLocations);
             listSize = allLocations.size();
-            List<LocationData> shownLocationData = new ArrayList<>();
-            if(listSize > 12) {
-                for(int i = 0; i < 12; i++) {
-                    shownLocationData.add(allLocations.get(i));
-                }
-            } else {
-                shownLocationData = allLocations;
-            }
-
-            int x = (width - WIDTH) / 2 + offset + 16 * 15;
-            int y = (height - HEIGHT) / 2 + offset + 16 * 2;
-            Collections.sort(shownLocationData);
-            for(LocationData data : shownLocationData) {
-                var locationButton = new TextButton(x, y, 12, Component.literal(data.getName()), color, (button) -> locationButtonOnPress(data));
-                this.displayedLocations.add(locationButton);
-                addRenderableWidget(locationButton);
-                y+=16;
-            }
+            addRenderableLocationList();
         }
 
         TextButton addLocation = new TextButton((width - WIDTH) / 2 + offset + 16 * 15, (height - HEIGHT) / 2 + offset + 16 * 14, 12, Component.translatable("gui." + Constants.MODID + ".new_location"), color, (button)->{
@@ -147,23 +148,8 @@ public void tick() {
             addRenderableWidget(timedoorSprite);
             this.interfaceNeedsReload = false;
         }
-        int x = (width - WIDTH) / 2 + 3 + 16 * 15;
-        int y = (height - HEIGHT) / 2 + 3 + 16 * 2;
-        if(this.listNeedsReload) {
-
-            for(TextButton button : displayedLocations) {
-                removeWidget(button);
-            }
-            displayedLocations = new ArrayList<>();
-            int offset = Math.min(mouseMovement, listSize - 12);
-            for(int i = offset; i < 12 + offset; i++) {
-                LocationData data = allLocations.get(i);
-                displayedLocations.add(new TextButton(x, y, 12, Component.literal(data.getName()), color, (button -> locationButtonOnPress(data))));
-                y+=16;
-            }
-            displayedLocations.forEach(this::addRenderableWidget);
-            this.listNeedsReload = false;
-        }
+        if(this.listNeedsReload)
+            addRenderableLocationList();
     }
 
     private void renderOutline(PoseStack poseStack) {