diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java
index abe3247fe22fd09df817838c79a65d7dc12081ed..ab3288f2475428eebec6701e1c3b5627f8929153 100644
--- a/src/main/java/controller/Controller.java
+++ b/src/main/java/controller/Controller.java
@@ -3,7 +3,6 @@ package controller;
 import javafx.animation.Animation;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
-import javafx.beans.property.StringProperty;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
@@ -12,7 +11,6 @@ import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.scene.control.ToggleButton;
 import javafx.scene.control.ToggleGroup;
-import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.util.Duration;
@@ -50,7 +48,7 @@ public class Controller {
   private Timeline timeline;
   private Board<List<ModelElements>> board;
 
-  public static final HashMap<String, Integer> elementsCountFireFighter = new HashMap<String, Integer>() {
+  public static final HashMap<String, Integer> elementsCountFireFighter = new HashMap<>() {
     {
       put("fire_count", 5);
       put("firefighter_count", 6);
@@ -61,7 +59,7 @@ public class Controller {
       put("rockery_count", 4);
     }
   };
-  public static final HashMap<String, Integer> elementsCountRockScissorPaper = new HashMap<String, Integer>() {
+  public static final HashMap<String, Integer> elementsCountRockScissorPaper = new HashMap<>() {
     {
       put("rock_count", 3);
       put("scissor_count", 3);
@@ -162,7 +160,8 @@ public class Controller {
       elementsCount = elementsCountFireFighter;
       gamemode = 0;
     }
-    repaintGrid();
+    restartButtonAction();
+    pause();
   }
 
   public void play() {
diff --git a/src/main/resources/view/view.fxml b/src/main/resources/view/view.fxml
index 71c99cb8bc181ff954b1c114781fbcbb7943bdb8..1517a0979c733c12650dab8a10ff5061836d32d9 100644
--- a/src/main/resources/view/view.fxml
+++ b/src/main/resources/view/view.fxml
@@ -42,10 +42,12 @@
                                 prefHeight="24.0" prefWidth="200.0" />
                 <VBox fx:id="parameters">
                 </VBox>
+                <Separator maxHeight="-Infinity" maxWidth="-Infinity"
+                        prefHeight="24.0" prefWidth="200.0" />
                 <Button fx:id="changeGamemode" maxHeight="-Infinity" maxWidth="-Infinity"
-                        mnemonicParsing="false" onAction="#changeGamemode" prefHeight="24.0"
+                        mnemonicParsing="false" onAction="#changeGamemode" prefHeight="50.0"
                         prefWidth="200.0"
-                        text="Change Gamemode" />
+                        text="Change Gamemode"  />
                 <Separator maxHeight="-Infinity" maxWidth="-Infinity"
                                 prefHeight="24.0" prefWidth="200.0" />
         </VBox>