diff --git a/src/main/java/TicTacToe/Cell.java b/src/main/java/TicTacToe/Cell.java
index 81b8a0f..b6c4e6b 100644
--- a/src/main/java/TicTacToe/Cell.java
+++ b/src/main/java/TicTacToe/Cell.java
@@ -41,12 +41,12 @@ public class Cell extends JButton {
 		g2.setPaint(Color.white);
 		switch (playerID) {
 		case 1:
-			g2.drawOval(5, 5, 90, 90);
-			break;
-		case 2:
 			g2.drawLine(5, 5, 90, 90);
 			g2.drawLine(90, 5, 5, 90);			
 			break;
+		case 2:
+			g2.drawOval(5, 5, 90, 90);
+			break;
 		}
 	}
 
diff --git a/src/main/java/TicTacToe/TicTacToeGame.java b/src/main/java/TicTacToe/TicTacToeGame.java
index 92338f1..642f6e5 100644
--- a/src/main/java/TicTacToe/TicTacToeGame.java
+++ b/src/main/java/TicTacToe/TicTacToeGame.java
@@ -88,19 +88,21 @@ public class TicTacToeGame extends JPanel {
 			JOptionPane.showMessageDialog(getParent(),"Player: " + playerID + " Wins!");	
 			scoreboard.addPoint(playerID);
 			resetGame();
+		} else {
+			turns++;
+			if(turns >= playFieldSize) {
+				JOptionPane.showMessageDialog(getParent(),"Draw!");	
+				scoreboard.addPoint(0);
+				resetGame();
+			}
+			
+			playerID++;
+			if(playerID >= maxPlayers) {
+				playerID = 1;
+			}
 		}
 		
-		turns++;
-		if(turns > playFieldSize) {
-			JOptionPane.showMessageDialog(getParent(),"Draw!");	
-			scoreboard.addPoint(0);
-			resetGame();
-		}
 		
-		playerID++;
-		if(playerID >= maxPlayers) {
-			playerID = 1;
-		}
 	}
 
 	public int checkPlayfield() {