diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java
index 5158e09a..52dd8873 100644
--- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java
@@ -243,8 +243,6 @@ public class GuiRenderSettings extends GuiScreen {
         initialized = true;
     }
 
-
-
     @Override
     public void drawScreen(int mouseX, int mouseY, float partialTicks) {
         drawGradientRect(LEFT_BORDER, virtualY, width - LEFT_BORDER, virtualY + virtualHeight, -1072689136, -804253680);
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiReplayCenter.java b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiReplayCenter.java
index 9b718463..60115565 100755
--- a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiReplayCenter.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiReplayCenter.java
@@ -90,14 +90,14 @@ public class GuiReplayCenter extends GuiScreen implements GuiYesNoCallback {
             //Bottom Button Bar (dat alliteration)
             bottomBar = new ArrayList<GuiButton>();
 
-            GuiButton exitButton = new GuiButton(GuiConstants.CENTER_BACK_BUTTON, 20, 20, I18n.format("replaymod.gui.mainmenu"));
-            bottomBar.add(exitButton);
+            GuiButton logoutButton = new GuiButton(GuiConstants.CENTER_LOGOUT_BUTTON, 20, 20, I18n.format("replaymod.gui.logout"));
+            bottomBar.add(logoutButton);
 
             GuiButton managerButton = new GuiButton(GuiConstants.CENTER_MANAGER_BUTTON, 20, 20, I18n.format("replaymod.gui.replayviewer"));
             bottomBar.add(managerButton);
-
-            GuiButton logoutButton = new GuiButton(GuiConstants.CENTER_LOGOUT_BUTTON, 20, 20, I18n.format("replaymod.gui.logout"));
-            bottomBar.add(logoutButton);
+            
+            GuiButton exitButton = new GuiButton(GuiConstants.CENTER_BACK_BUTTON, 20, 20, I18n.format("replaymod.gui.mainmenu"));
+            bottomBar.add(exitButton);
 
             showOnlineRecent();
             disableTopBarButton(GuiConstants.CENTER_RECENT_BUTTON);
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/replayviewer/GuiReplayViewer.java b/src/main/java/eu/crushedpixel/replaymod/gui/replayviewer/GuiReplayViewer.java
index 66afe8af..33fa1109 100755
--- a/src/main/java/eu/crushedpixel/replaymod/gui/replayviewer/GuiReplayViewer.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/replayviewer/GuiReplayViewer.java
@@ -119,11 +119,10 @@ public class GuiReplayViewer extends GuiScreen implements GuiYesNoCallback {
 
     @Override
     public void initGui() {
-        replayGuiList = new ReplayList(this, this.mc, this.width, this.height, 32, this.height - 64, 36);
         Keyboard.enableRepeatEvents(true);
-        this.buttonList.clear();
 
         if(!this.initialized) {
+            replayGuiList = new ReplayList(this, this.mc, this.width, this.height, 32, this.height - 64, 36);
             this.initialized = true;
         } else {
             this.replayGuiList.setDimensions(this.width, this.height, 32, this.height - 64);