diff --git a/src/game/SwingGame.java b/src/game/SwingGame.java
index df2704c..14c3dee 100644
--- a/src/game/SwingGame.java
+++ b/src/game/SwingGame.java
@@ -1,8 +1,9 @@
 package game;
 
-import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
 import java.awt.GridLayout;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -35,6 +36,7 @@
 	JLabel[] hintUI;
 	JLabel[] thunderUI;
 	JPanel[] playersUI;
+	GridBagConstraints layoutConstr;
 	
 	Font font;
 	
@@ -49,15 +51,17 @@
 		super.createPlayers();
 		for(int i=0; i<N_PLAYERS; ++i){
 			players[i] = new SwingPlayer(CARDS_PER_PLAYER, this, i);
+			((SwingPlayer) players[i]).getContainer().setBackground(Color.black);
 		}
 	}
 
 	@Override
 	protected void createUI() {
+		layoutConstr = new GridBagConstraints();
 		mainFrame = new JFrame("Hanabi");
 		mainFrame.setSize(1000, 650);
 		mainFrame.setLocation(0, 0);
-		mainFrame.setLayout(new BorderLayout());
+		mainFrame.setLayout(new GridBagLayout());
 		mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		mainFrame.getContentPane().setBackground(Color.black);
 		mainFrame.setVisible(true);
@@ -78,8 +82,11 @@
 			}
 		}
 		hintPanel = new JPanel();
+		hintPanel.setBackground(Color.black);
 		thunderPanel = new JPanel();
+		thunderPanel.setBackground(Color.black);
 		buttonPanel = new JPanel();
+		buttonPanel.setBackground(Color.black);
 		colorButton = new JButton("Color");
 		valueButton = new JButton("Value");
 		nextMove = new JButton("Next");
@@ -95,7 +102,88 @@
 		buttonPanel.add(nextMove);
 		buttonPanel.add(placeCardButton);
 		buttonPanel.add(trashCardButton);
-		mainFrame.add(gamePanel, BorderLayout.CENTER);
+		
+		//first empty cell
+		layoutConstr.gridx = 0;
+		layoutConstr.gridy = 0;
+		layoutConstr.weightx = 0.2;
+		layoutConstr.weighty = 0.1;
+		layoutConstr.gridwidth = 1;
+		mainFrame.add(new JPanel(), layoutConstr);
+		
+		layoutConstr.gridx = 1;
+		layoutConstr.weighty = 0.1;
+		if(N_PLAYERS < 5){
+			layoutConstr.weightx = 0.6;
+			layoutConstr.gridwidth = 2;
+			int index = (N_PLAYERS == 2) ? 1 : 2;
+			mainFrame.add(((SwingPlayer) players[index]).getContainer(), layoutConstr);
+		} else {
+			layoutConstr.weightx = 0.3;
+			layoutConstr.gridwidth = 1;
+			mainFrame.add(((SwingPlayer) players[3]).getContainer(), layoutConstr);
+			layoutConstr.gridx = 2;
+			mainFrame.add(((SwingPlayer) players[2]).getContainer(), layoutConstr);			
+		}
+
+		//second empty cell
+		layoutConstr.gridx = (N_PLAYERS < 5) ? 2 : 3;
+		layoutConstr.weightx = 0.2;
+		layoutConstr.gridwidth = 1;
+		mainFrame.add(new JPanel(), layoutConstr);
+		
+		//4th or 5th player
+		layoutConstr.gridx = 0;
+		layoutConstr.gridy = 1;
+		layoutConstr.weightx = 0.2;
+		layoutConstr.weighty = 0.8;
+		layoutConstr.gridwidth = 1;
+		if(N_PLAYERS == 2 || N_PLAYERS == 3){
+			mainFrame.add(new JPanel(), layoutConstr);
+		} else {
+			int index = (N_PLAYERS == 4) ? 3 : 4;
+			mainFrame.add(((SwingPlayer) players[index]).getContainer(), layoutConstr);
+		}
+		
+		layoutConstr.gridx = 1;
+		layoutConstr.gridy = 1;
+		layoutConstr.weightx = 0.6;
+		layoutConstr.weighty = 0.8;
+		layoutConstr.gridwidth = (N_PLAYERS < 5) ? 1 : 2;
+		mainFrame.add(gamePanel, layoutConstr);
+
+		//2nd player
+		layoutConstr.gridx = (N_PLAYERS < 5) ? 2 : 3;
+		layoutConstr.gridy = 1;
+		layoutConstr.weightx = 0.2;
+		layoutConstr.weighty = 0.8;
+		layoutConstr.gridwidth = 1;
+		if(N_PLAYERS == 2){
+			mainFrame.add(new JPanel(), layoutConstr);
+		} else {
+			mainFrame.add(((SwingPlayer) players[1]).getContainer(), layoutConstr);
+		}
+
+		//third empty cell
+		layoutConstr.gridx = 0;
+		layoutConstr.gridy = 2;
+		layoutConstr.weightx = 0.2;
+		layoutConstr.weighty = 0.1;
+		layoutConstr.gridwidth = 1;
+		mainFrame.add(new JPanel(), layoutConstr);
+		
+		layoutConstr.gridx = 1;
+		layoutConstr.weightx = 0.8;
+		layoutConstr.gridwidth = (N_PLAYERS < 5) ? 1 : 2;
+		mainFrame.add(((SwingPlayer) players[0]).getContainer(), layoutConstr);
+
+		//fourth empty cell
+		layoutConstr.gridx = (N_PLAYERS < 5) ? 2 : 3;
+		layoutConstr.gridy = 2;
+		layoutConstr.weightx = 0.2;
+		layoutConstr.gridwidth = 1;
+		mainFrame.add(new JPanel(), layoutConstr);
+		
 		gamePanel.add(hintPanel);
 		gamePanel.add(thunderPanel);
 		gamePanel.add(buttonPanel);
@@ -104,7 +192,7 @@
 		for(int i=0; i<MAX_HINTS; ++i){
 			JLabel tmp = new JLabel();
 			tmp.setText("1");
-			tmp.setBackground(Color.white);
+			tmp.setForeground(Color.white);
 			tmp.setName("Hint_" + i);
 			tmp.setFont(font);
 			hintPanel.add(tmp);
@@ -114,7 +202,7 @@
 		for(int i=0;i<MAX_THUNDERS; ++i){
 			JLabel tmp = new JLabel();
 			tmp.setText("0");
-			tmp.setBackground(Color.white);
+			tmp.setForeground(Color.white);
 			tmp.setName("Thunder_" + i);
 			tmp.setFont(font);
 			thunderPanel.add(tmp);
@@ -223,7 +311,7 @@
 		 * PLAYER 3: WEST
 		 */
 		for(int i=0; i<N_PLAYERS; ++i){
-			JPanel playerContainer = ((SwingPlayer) players[i]).getContainer();
+			/*JPanel playerContainer = ((SwingPlayer) players[i]).getContainer();
 			BoxLayout containerLayout = null;
 			String playerSide = null;
 			switch(i){
@@ -255,13 +343,13 @@
 				break;
 			}
 			playerContainer.setLayout(containerLayout);
-			playerContainer.setBackground(Color.black);
+			playerContainer.setBackground(Color.black);*/
 			for(int j=0; j<CARDS_PER_PLAYER; ++j){
 				AbstractPlayer curr = players[i];
 				curr.setName(j, i + "_card" + j);
 				curr.setSize(j, 50, 50);
 			}
-			mainFrame.add(playerContainer, playerSide);
+			//mainFrame.add(playerContainer, playerSide);
 		}
 	}