diff --git a/app/src/main/java/jonathan/balljumper/GameSurfaceView.java b/app/src/main/java/jonathan/balljumper/GameSurfaceView.java
index 98811cc..8576ba2 100644
--- a/app/src/main/java/jonathan/balljumper/GameSurfaceView.java
+++ b/app/src/main/java/jonathan/balljumper/GameSurfaceView.java
@@ -163,21 +163,22 @@
         // Reset background
         canvas.drawColor(Color.GREEN);
 
-        // Render panels and the ball in the background.
-        if (gameState != GameState.Highscore) {
-            // Render panels
-            panelHandler.draw(canvas);
-
-            // Render ball
-            ball.draw(canvas);
-        }
-
         switch (gameState) {
             case Running:
+                // Render panels
+                panelHandler.draw(canvas);
+
+                // Render ball
+                ball.draw(canvas);
+
                 // Render score in-game.
                 highscoreHandler.drawScoreInGame(canvas);
                 break;
             case GameOver:
+                // Render the panels and the ball in the background.
+                panelHandler.draw(canvas);
+                ball.draw(canvas);
+                // Render the final score.
                 highscoreHandler.drawScoreFinal(canvas);
                 break;
             case Highscore:
@@ -280,7 +281,7 @@
                 if (event.getAction() == MotionEvent.ACTION_DOWN) {
                     gameState = GameState.Running;
                     resetGame();
-                    ball.setX(x);
+                    ball.setX(x); // Move ball to where your finger points.
                 }
                 break;
         }
@@ -293,7 +294,7 @@
     }
 
     public void resetGame() {
-        highscoreHandler.resetAndSave();
+        highscoreHandler.saveThenReset();
 
         ball.bounce();
         ball.setX(screenSize.x / 2 - ball.getWidth() / 2);