diff --git a/src/server/SwingClientGame.java b/src/server/SwingClientGame.java
index a4e3f9e..788e8ad 100644
--- a/src/server/SwingClientGame.java
+++ b/src/server/SwingClientGame.java
@@ -146,8 +146,6 @@
 		layoutConstr.gridwidth = 1;
 		mainFrame.add(new JPanel(), layoutConstr);
 
-		Log("Number of Players: " + nrOfPlayers);
-
 		layoutConstr.gridx = 1;
 		if(nrOfPlayers < 5){
 			layoutConstr.weightx = 0.6;
@@ -155,20 +153,20 @@
 			int index = (nrOfPlayers == 2) ? 1 : 2;
 			//mainFrame.add(((SwingPlayer) players[index]).getContainer(), layoutConstr);
 			JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(index)]).getPlayerUi();
-			mainFrame.add(playerPanel);
 			playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.X_AXIS));
+			mainFrame.add(playerPanel, layoutConstr);
 		} else {
 			layoutConstr.weightx = 0.3;
 			layoutConstr.gridwidth = 1;
 			//mainFrame.add(((SwingPlayer) players[3]).getContainer(), layoutConstr);
 			JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(3)]).getPlayerUi();
-			mainFrame.add(playerPanel);
 			playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.X_AXIS));
+			mainFrame.add(playerPanel, layoutConstr);
 			layoutConstr.gridx = 2;
 			//mainFrame.add(((SwingPlayer) players[2]).getContainer(), layoutConstr);
 			playerPanel = ((SwingPlayer) players[getPlayersSightId(2)]).getPlayerUi();
-			mainFrame.add(playerPanel);
 			playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.X_AXIS));
+			mainFrame.add(playerPanel, layoutConstr);
 		}
 
 		//second empty cell
@@ -189,8 +187,8 @@
 			int index = (nrOfPlayers == 4) ? 3 : 4;
 			//mainFrame.add(((SwingPlayer) players[index]).getContainer(), layoutConstr);
 			JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(index)]).getPlayerUi();
-			mainFrame.add(playerPanel);
 			playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.Y_AXIS));
+			mainFrame.add(playerPanel, layoutConstr);
 		}
 
 		layoutConstr.gridx = 1;
@@ -207,8 +205,8 @@
 		} else {
 			//mainFrame.add(((SwingPlayer) players[1]).getContainer(), layoutConstr);
 			JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(1)]).getPlayerUi();
-			mainFrame.add(playerPanel);
 			playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.Y_AXIS));
+			mainFrame.add(playerPanel, layoutConstr);
 		}
 
 		//third empty cell
@@ -220,16 +218,15 @@
 		mainFrame.add(new JPanel(), layoutConstr);
 
 		layoutConstr.gridx = 1;
-		layoutConstr.weightx = 0.8;
+		layoutConstr.weightx = 0.6;
 		layoutConstr.gridwidth = (nrOfPlayers < 5) ? 1 : 2;
 		//mainFrame.add(((SwingPlayer) players[0]).getContainer(), layoutConstr);
 		JPanel playerPanel = ((SwingPlayer) players[getPlayersSightId(0)]).getPlayerUi();
-		mainFrame.add(playerPanel);
 		playerPanel.setLayout(new BoxLayout(playerPanel, BoxLayout.X_AXIS));
+		mainFrame.add(playerPanel, layoutConstr);
 
 		//fourth empty cell
 		layoutConstr.gridx = (nrOfPlayers < 5) ? 2 : 3;
-		layoutConstr.gridy = 2;
 		layoutConstr.weightx = 0.2;
 		layoutConstr.gridwidth = 1;
 		mainFrame.add(new JPanel(), layoutConstr);
@@ -278,7 +275,6 @@
 
 	@Override
 	protected void updateUI() {
-		Log("hints: " + hints);
 		for(int i=0; i<hints; ++i){
 			hintUI[i].setIcon(HINT_1);
 		}
@@ -326,15 +322,23 @@
 		JPanel playerUi;
 		JButton playerName;
 		JLabel[] cardUi;
+		PlaceListener placeListener;
 
 		public SwingPlayer(int id, int nrOfCards, String name){
 			super(id, nrOfCards, name);
 			playerUi = new JPanel();
 			playerUi.setBackground(BACKGROUND);
-			playerName = new JButton(name);
-			playerName.addMouseListener(new HintListener(id));
-			cardUi = new JLabel[nrOfCards];
+			playerName = new JButton();
+			String text = name;
+			if(ownId == id){
+				playerName.setEnabled(false);
+				text += " (You)";
+			} else {
+				playerName.addMouseListener(new HintListener(id));
+			}
+			playerName.setText(text);
 			playerUi.add(playerName);
+			cardUi = new JLabel[nrOfCards];
 			for(int i=0; i<cardUi.length; ++i){
 				cardUi[i] = new JLabel();
 				cardUi[i].setFont(font);
@@ -374,17 +378,15 @@
 				if(ownId == id){
 					text = "?";
 					color = Color.gray;
+					tmp.removeMouseListener(placeListener);
+					placeListener = new PlaceListener(cards[i]);
+					tmp.addMouseListener(placeListener);
 				} else {
 					text = String.valueOf(cards[i].getValue()+1);
 					color = getColor(cards[i].getColorInt());
 				}
 				tmp.setText(text);
 				tmp.setForeground(color);
-				MouseListener[] oldListeners = tmp.getMouseListeners();
-				for(int l=0; l<oldListeners.length; ++l){
-					tmp.removeMouseListener(oldListeners[l]);
-				}
-				tmp.addMouseListener(new PlaceListener(cards[i]));
 				List<CardInfo> infos = cards[i].getCardInfos();
 				String toolTipText = "";
 				for(CardInfo info : infos){