diff --git a/src/main/java/eu/crushedpixel/replaymod/api/replay/holders/FileRating.java b/src/main/java/eu/crushedpixel/replaymod/api/replay/holders/FileRating.java
index 76638622..63c48ed4 100644
--- a/src/main/java/eu/crushedpixel/replaymod/api/replay/holders/FileRating.java
+++ b/src/main/java/eu/crushedpixel/replaymod/api/replay/holders/FileRating.java
@@ -3,13 +3,13 @@ package eu.crushedpixel.replaymod.api.replay.holders;
 public class FileRating {
 
     private int file;
-    private boolean rating;
+    private String rating;
 
     public int getFileID() {
         return file;
     }
 
     public boolean getRating() {
-        return rating;
+        return rating.equals("1");
     }
 }
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 9501b4af..458d5d0a 100755
--- a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiReplayCenter.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiReplayCenter.java
@@ -300,6 +300,8 @@ public class GuiReplayCenter extends GuiScreen implements GuiYesNoCallback {
                 });
             } else {
                 mc.displayGuiScreen(this);
+                elementSelected(currentList.selected);
+                initGui();
             }
         }
     }
diff --git a/src/main/java/eu/crushedpixel/replaymod/registry/FavoritedFileHandler.java b/src/main/java/eu/crushedpixel/replaymod/registry/FavoritedFileHandler.java
index 080af052..c066c695 100644
--- a/src/main/java/eu/crushedpixel/replaymod/registry/FavoritedFileHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/registry/FavoritedFileHandler.java
@@ -26,14 +26,14 @@ public class FavoritedFileHandler {
     }
 
     public void addToFavorites(Integer id) throws IOException, ApiException {
+        ReplayMod.apiClient.favFile(AuthenticationHandler.getKey(), id, true);
         favorited.remove(id);
         favorited.add(id);
-        ReplayMod.apiClient.favFile(AuthenticationHandler.getKey(), id, true);
     }
 
     public void removeFromFavorites(Integer id) throws IOException, ApiException {
-        favorited.remove(id);
         ReplayMod.apiClient.favFile(AuthenticationHandler.getKey(), id, false);
+        favorited.remove(id);
     }
 
     public void reloadFavorites() {
diff --git a/src/main/java/eu/crushedpixel/replaymod/registry/RatedFileHandler.java b/src/main/java/eu/crushedpixel/replaymod/registry/RatedFileHandler.java
index 19666ee3..fa00ee05 100644
--- a/src/main/java/eu/crushedpixel/replaymod/registry/RatedFileHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/registry/RatedFileHandler.java
@@ -28,12 +28,12 @@ public class RatedFileHandler {
     }
 
     public void rateFile(int id, Rating.RatingType type) throws IOException, ApiException {
+        ReplayMod.apiClient.rateFile(AuthenticationHandler.getKey(), id, type);
         if(type == Rating.RatingType.LIKE || type == Rating.RatingType.DISLIKE) {
             rated.put(id, type == Rating.RatingType.LIKE);
         } else {
             rated.remove(id);
         }
-        ReplayMod.apiClient.rateFile(AuthenticationHandler.getKey(), id, type);
     }
 
     public void reloadRatings() {
diff --git a/src/main/java/eu/crushedpixel/replaymod/renderer/SafeEntityRenderer.java b/src/main/java/eu/crushedpixel/replaymod/renderer/SafeEntityRenderer.java
index 824b6484..5bc9bf28 100755
--- a/src/main/java/eu/crushedpixel/replaymod/renderer/SafeEntityRenderer.java
+++ b/src/main/java/eu/crushedpixel/replaymod/renderer/SafeEntityRenderer.java
@@ -5,7 +5,7 @@ import net.minecraft.client.renderer.EntityRenderer;
 
 public class SafeEntityRenderer extends EntityRenderer {
 
-    public SafeEntityRenderer(Minecraft mcIn, EntityRenderer renderer) throws IllegalArgumentException, IllegalAccessException {
+    public SafeEntityRenderer(Minecraft mcIn, EntityRenderer renderer) {
         super(mcIn, renderer.resourceManager);
     }
 
diff --git a/src/main/java/eu/crushedpixel/replaymod/renderer/SpectatorRenderer.java b/src/main/java/eu/crushedpixel/replaymod/renderer/SpectatorRenderer.java
new file mode 100644
index 00000000..02f64c58
--- /dev/null
+++ b/src/main/java/eu/crushedpixel/replaymod/renderer/SpectatorRenderer.java
@@ -0,0 +1,72 @@
+package eu.crushedpixel.replaymod.renderer;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.EntityLivingBase;
+import org.lwjgl.util.glu.Project;
+
+/**
+ * Created by mariusmetzger on 24/05/15.
+ */
+public class SpectatorRenderer extends SafeEntityRenderer {
+
+    private final Minecraft mc;
+
+    public SpectatorRenderer(Minecraft mcIn, EntityRenderer renderer) {
+        super(mcIn, renderer);
+        this.mc = mcIn;
+    }
+
+    @Override
+    protected void renderHand(float p_78476_1_, int p_78476_2_) {
+            GlStateManager.matrixMode(5889);
+            GlStateManager.loadIdentity();
+            float f1 = 0.07F;
+
+            if (this.mc.gameSettings.anaglyph)
+            {
+                GlStateManager.translate((float)(-(p_78476_2_ * 2 - 1)) * f1, 0.0F, 0.0F);
+            }
+
+            Project.gluPerspective(this.getFOVModifier(p_78476_1_, false), (float) this.mc.displayWidth / (float) this.mc.displayHeight, 0.05F, this.farPlaneDistance * 2.0F);
+            GlStateManager.matrixMode(5888);
+            GlStateManager.loadIdentity();
+
+            if (this.mc.gameSettings.anaglyph)
+            {
+                GlStateManager.translate((float)(p_78476_2_ * 2 - 1) * 0.1F, 0.0F, 0.0F);
+            }
+
+            GlStateManager.pushMatrix();
+            this.hurtCameraEffect(p_78476_1_);
+
+            if (this.mc.gameSettings.viewBobbing)
+            {
+                this.setupViewBobbing(p_78476_1_);
+            }
+
+            boolean flag = this.mc.getRenderViewEntity() instanceof EntityLivingBase && ((EntityLivingBase)this.mc.getRenderViewEntity()).isPlayerSleeping();
+
+            if (this.mc.gameSettings.thirdPersonView == 0 && !flag && !this.mc.gameSettings.hideGUI && !this.mc.playerController.isSpectator())
+            {
+                this.enableLightmap();
+                this.itemRenderer.renderItemInFirstPerson(p_78476_1_);
+                this.disableLightmap();
+            }
+
+            GlStateManager.popMatrix();
+
+            if (this.mc.gameSettings.thirdPersonView == 0 && !flag)
+            {
+                this.itemRenderer.renderOverlays(p_78476_1_);
+                this.hurtCameraEffect(p_78476_1_);
+            }
+
+            if (this.mc.gameSettings.viewBobbing)
+            {
+                this.setupViewBobbing(p_78476_1_);
+            }
+
+    }
+}
diff --git a/src/main/resources/META-INF/replaymod_at.cfg b/src/main/resources/META-INF/replaymod_at.cfg
index 00d06913..a2b38da6 100644
--- a/src/main/resources/META-INF/replaymod_at.cfg
+++ b/src/main/resources/META-INF/replaymod_at.cfg
@@ -49,6 +49,10 @@ public net.minecraft.client.renderer.EntityRenderer func_78468_a(IF)V # setupFog
 public net.minecraft.client.renderer.EntityRenderer func_78466_h(F)V # updateFogColor
 public net.minecraft.client.renderer.EntityRenderer func_78472_g(F)V # updateLightmap
 
+public net.minecraft.client.renderer.EntityRenderer func_78482_e(F)V # hurtCameraEffect
+public net.minecraft.client.renderer.EntityRenderer func_78475_f(F)V # setupViewBobbing
+public net.minecraft.client.renderer.EntityRenderer func_78476_b(FI)V # renderHand
+
 # RenderGlobal
 public net.minecraft.client.renderer.RenderGlobal field_174995_M # renderDispatcher
 public net.minecraft.client.renderer.RenderGlobal field_147595_R # displayListEntitiesDirty