diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/gui/UpdateModScreen.java b/common/src/main/java/com/seibel/lod/common/wrappers/gui/UpdateModScreen.java
index cb8b5c732..a382efea3 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/gui/UpdateModScreen.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/gui/UpdateModScreen.java
@@ -18,7 +18,6 @@ import net.minecraft.network.chat.Component;
 import java.util.*;
 
 public class UpdateModScreen extends Screen {
-    private ConfigListWidget list;
     private Screen parent;
     private String newVersion;
 
@@ -42,31 +41,30 @@ public class UpdateModScreen extends Screen {
     protected void init() {
         super.init();
 
-        this.list = new ConfigListWidget(this.minecraft, this.width, this.height, 0, this.height, 25); // Select the area to tint
-        this.addWidget(this.list); // Add the tint to the things to be rendered
-
 
         this.addBtn(
-                new Button(this.width / 2 - 100, this.height / 2 - 20, 150, 20, translate(ModInfo.ID + ".updater.update"), (btn) -> {
-                    this.onClose();
+                new Button(this.width / 2 - 155, this.height / 2, 150, 20, translate(ModInfo.ID + ".updater.update"), (btn) -> {
                     SelfUpdater.deleteOldOnClose = true;
-                })
-        );
-        this.addBtn(
-                new Button(this.width / 2 - 100, this.height / 2 + 5, 150, 20, translate(ModInfo.ID + ".updater.later"), (btn) -> {
+                    SelfUpdater.updateMod();
                     this.onClose();
                 })
         );
         this.addBtn(
-                new Button(this.width / 2 - 100, this.height / 2 + 30, 150, 20, translate(ModInfo.ID + ".updater.never"), (btn) -> {
+                new Button(this.width / 2 + 5, this.height / 2, 150, 20, translate(ModInfo.ID + ".updater.later"), (btn) -> {
                     this.onClose();
+                })
+        );
+        this.addBtn(
+                new Button(this.width / 2 - 155, this.height / 2 + 25, 150, 20, translate(ModInfo.ID + ".updater.never"), (btn) -> {
                     Config.Client.AutoUpdater.enableAutoUpdater.set(false);
+                    this.onClose();
                 })
         );
         this.addBtn(
-                new Button(this.width / 2 - 100, this.height / 2 + 55, 150, 20, translate(ModInfo.ID + ".updater.silentUpdate"), (btn) -> {
-                    this.onClose();
+                new Button(this.width / 2 + 5, this.height / 2 + 25, 150, 20, translate(ModInfo.ID + ".updater.silentUpdate"), (btn) -> {
                     Config.Client.AutoUpdater.promptForUpdate.set(false);
+                    SelfUpdater.updateMod();
+                    this.onClose();
                 })
         );
 
@@ -75,12 +73,14 @@ public class UpdateModScreen extends Screen {
     @Override
     public void render(PoseStack matrices, int mouseX, int mouseY, float delta) {
         this.renderBackground(matrices); // Render background
-        this.list.render(matrices, mouseX, mouseY, delta); // Renders the items in the render list (currently only used to tint background darker)
 
-        super.render(matrices, mouseX, mouseY, delta); // Render the vanilla stuff (currently only used for the background and tint)
+        // Render the text's
+        drawCenteredString(matrices, this.font, translate(ModInfo.ID + ".updater.text1"), this.width / 2, this.height / 2 - 40, 0xFFFFFF);
+        drawCenteredString(matrices, this.font, translate(ModInfo.ID + ".updater.text2", ModInfo.VERSION, this.newVersion), this.width / 2, this.height / 2 - 25, 0xFFFFFF);
 
-        drawCenteredString(matrices, this.font, translate(ModInfo.ID + ".updater.text1"), this.width / 2, this.height / 2 - 60, 0xFFFFFF);
-        drawCenteredString(matrices, this.font, translate(ModInfo.ID + ".updater.text2", ModInfo.VERSION, this.newVersion), this.width / 2, this.height / 2 - 45, 0xFFFFFF);
+        super.render(matrices, mouseX, mouseY, delta); // Render the buttons
+
+        // TODO: Add tooltips
     }
 
     @Override
@@ -100,94 +100,4 @@ public class UpdateModScreen extends Screen {
         this.addRenderableWidget(button);
 		#endif
     }
-
-
-    public static class ConfigListWidget extends ContainerObjectSelectionList<ButtonEntry> {
-        Font textRenderer;
-
-        public ConfigListWidget(Minecraft minecraftClient, int i, int j, int k, int l, int m) {
-            super(minecraftClient, i, j, k, l, m);
-            this.centerListVertically = false;
-            textRenderer = minecraftClient.font;
-        }
-
-        public void addButton(AbstractWidget button, AbstractWidget resetButton, AbstractWidget indexButton, Component text) {
-            this.addEntry(ButtonEntry.create(button, text, resetButton, indexButton));
-        }
-
-        @Override
-        public int getRowWidth() {
-            return 10000;
-        }
-
-        public Optional<AbstractWidget> getHoveredButton(double mouseX, double mouseY) {
-            for (ButtonEntry buttonEntry : this.children()) {
-                if (buttonEntry.button != null && buttonEntry.button.isMouseOver(mouseX, mouseY)) {
-                    return Optional.of(buttonEntry.button);
-                }
-            }
-            return Optional.empty();
-        }
-    }
-
-
-    public static class ButtonEntry extends ContainerObjectSelectionList.Entry<ButtonEntry> {
-        private static final Font textRenderer = Minecraft.getInstance().font;
-        public final AbstractWidget button;
-        private final AbstractWidget resetButton;
-        private final AbstractWidget indexButton;
-        private final Component text;
-        private final List<AbstractWidget> children = new ArrayList<>();
-        public static final Map<AbstractWidget, Component> buttonsWithText = new HashMap<>();
-
-        private ButtonEntry(AbstractWidget button, Component text, AbstractWidget resetButton, AbstractWidget indexButton) {
-            buttonsWithText.put(button, text);
-            this.button = button;
-            this.resetButton = resetButton;
-            this.text = text;
-            this.indexButton = indexButton;
-            if (button != null)
-                children.add(button);
-            if (resetButton != null)
-                children.add(resetButton);
-            if (indexButton != null)
-                children.add(indexButton);
-        }
-
-        public static ButtonEntry create(AbstractWidget button, Component text, AbstractWidget resetButton, AbstractWidget indexButton) {
-            return new ButtonEntry(button, text, resetButton, indexButton);
-        }
-
-        @Override
-        public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-            if (button != null) {
-                button.y = y;
-                button.render(matrices, mouseX, mouseY, tickDelta);
-            }
-            if (resetButton != null) {
-                resetButton.y = y;
-                resetButton.render(matrices, mouseX, mouseY, tickDelta);
-            }
-            if (indexButton != null) {
-                indexButton.y = y;
-                indexButton.render(matrices, mouseX, mouseY, tickDelta);
-            }
-            if (text != null && (!text.getString().contains("spacer") || button != null))
-                GuiComponent.drawString(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF);
-        }
-
-        @Override
-        public List<? extends GuiEventListener> children() {
-            return children;
-        }
-
-        // Only for 1.17 and over
-        // Remove in 1.16 and below
-		#if POST_MC_1_17_1
-        @Override
-        public List<? extends NarratableEntry> narratables() {
-            return children;
-        }
-		#endif
-    }
-}
+}
\ No newline at end of file