diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
index 2d499a2..2d4a204 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
@@ -94,14 +94,14 @@ public class Tournament implements Serializable {
     private void calcGameSchedule() {
         Collections.shuffle(participants);
 
-        for (int i = 0; i <= (Math.log(participants.size()) / Math.log(2)); i++) {
+        for (int i = 0; i < (Math.log(participants.size()) / Math.log(2)); i++) {
             List<Game> gameRound = new ArrayList<>();
             if (i == 0) {
                 for (int j = 0; j < participants.size() - 1; j += 2) {
                     gameRound.add(new Game(participants.get(j), participants.get(j+1)));
                 }
             } else {
-                for (int j = 0; j < (participants.size() / Math.pow(2,i)); j++) {
+                for (int j = 0; j < (gameList.get(i-1).size()/2); j++) {
                     gameRound.add(new Game(null,null));
                 }
             }
diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
index 0bb6f35..e050d2f 100644
--- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
+++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
@@ -7,7 +7,7 @@ import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 
-public class GameController {
+public class GameController extends FXController{
 
     private GameDecorator gameDecorator;
 
@@ -36,7 +36,7 @@ public class GameController {
         loadContent();
     }
 
-
+    @Override
     public void loadContent() {
         participantNameOne.setText(gameDecorator.getParticipantOne());
         participantNameTwo.setText(gameDecorator.getParticipantTwo());