diff --git a/lib/postgresql-42.2.12.jar b/lib/postgresql-42.2.12.jar
new file mode 100644
index 0000000..1f393bb
Binary files /dev/null and b/lib/postgresql-42.2.12.jar differ
diff --git a/src/database/DatabaseTesting.java b/src/database/DatabaseTesting.java
index e0249ca..e5aad7c 100644
--- a/src/database/DatabaseTesting.java
+++ b/src/database/DatabaseTesting.java
@@ -13,9 +13,9 @@ import java.sql.Statement;
 public class DatabaseTesting {
     public static void main(String[] args) {
     	Table a = new Table("a");
-    	a.remplirTableAllFrom("CartesLumiere");
+    	a.remplirTableAllFrom("CartesAll");
     	System.out.println(a.toString());
-    	//BufferedImage jpg = new BufferedImage(467, 652, 1);
+    	BufferedImage jpg = new BufferedImage(467, 652, 1);
     	
     	
     	/*
diff --git a/src/database/QueryGenerator.java b/src/database/QueryGenerator.java
index 24052bf..3ec85ee 100644
--- a/src/database/QueryGenerator.java
+++ b/src/database/QueryGenerator.java
@@ -15,7 +15,7 @@ public class QueryGenerator {
 	}
 	
 	public static String getTable(String s) {
-		return "public.\"" + s + "\"";
+		return "public." + '"' + s + '"';
 	}
 	
 }
diff --git a/src/ihm/Main.java b/src/ihm/Main.java
index fd95c5e..7e33c40 100644
--- a/src/ihm/Main.java
+++ b/src/ihm/Main.java
@@ -15,7 +15,11 @@ public class Main extends Application {
 	public void start(Stage primaryStage) throws Exception {
 			System.out.println("Lancement de l'application");
 		
+<<<<<<< HEAD
 			final URL fxmlURL = getClass().getResource("ressources/parametre.fxml");  // "ressources/Jouer_tour(1)lancer_des.fxml"
+=======
+		 final URL fxmlURL = getClass().getResource("ressources/Menu.fxml");  // "ressources/Jouer_tour(1)lancer_des.fxml"
+>>>>>>> 47a2be32525b7a871993afd9411befb3fd20fac1
 	     final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.ENGLISH);
 	     final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle);
 	     Pane root = fxmlLoader.load();
diff --git a/src/ihm/controller/PlateauController.java b/src/ihm/controller/PlateauController.java
index acc9836..54a100b 100644
--- a/src/ihm/controller/PlateauController.java
+++ b/src/ihm/controller/PlateauController.java
@@ -27,21 +27,25 @@ import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
+<<<<<<< HEAD
+=======
 import javafx.util.Duration;
+>>>>>>> eea99d2341b1df015a2831034aa39534addff16e
 import main.Joueur;
 import main.View;
 
 public class PlateauController implements Initializable {
 	private List<Joueur> listJoueur = new ArrayList<Joueur>();
 	private List<VBox> vboxJoueur = new ArrayList<VBox>();
+	private List<HBox> hboxJoueur = new ArrayList<HBox>();
 	private List<Button> btnRevelation = new ArrayList<Button>();
-	private List<Button> btnCartePerso = new ArrayList<Button>();
+	private List<ImageView> cartePerso = new ArrayList<ImageView>();
 	private List<Label> nomJoueur = new ArrayList<Label>();
 	
-	@FXML private VBox joueur1;
-	@FXML private VBox joueur2;
-	@FXML private VBox joueur3;
-	@FXML private VBox joueur4;
+	@FXML private HBox joueur1;
+	@FXML private HBox joueur2;
+	@FXML private HBox joueur3;
+	@FXML private HBox joueur4;
 	@FXML private VBox joueur5;
 	@FXML private VBox joueur6;
 	@FXML private VBox joueur7;
@@ -52,26 +56,40 @@ public class PlateauController implements Initializable {
 	public static int DICE_BOTH = 0;
 	
 	/**
-	 * initialise les donn�es du plateau
+	 * initialise les données du plateau
 	 */
 	@Override
 	public void initialize(URL arg0, ResourceBundle arg1) {
+		System.out.println("Création du plateau ...");
 		//initialisation des attributs des joueurs
 		
-		this.vboxJoueur.add(joueur1);
-		this.vboxJoueur.add(joueur2);
-		this.vboxJoueur.add(joueur3);
-		this.vboxJoueur.add(joueur4);
+		this.hboxJoueur.add(joueur1);
+		this.hboxJoueur.add(joueur2);
+		this.hboxJoueur.add(joueur3);
+		this.hboxJoueur.add(joueur4);
+		
+		for (HBox hbox : hboxJoueur) {
+			VBox carte = (VBox) hbox.getChildren().get(1);
+			cartePerso.add((ImageView) carte.getChildren().get(0));
+			btnRevelation.add((Button) carte.getChildren().get(1));
+			VBox info = (VBox) hbox.getChildren().get(2);
+			nomJoueur.add((Label) info.getChildren().get(0));
+		}
+		
 		this.vboxJoueur.add(joueur5);
 		this.vboxJoueur.add(joueur6);
 		this.vboxJoueur.add(joueur7);
 		this.vboxJoueur.add(joueur8);
+		
 		for (VBox vbox : vboxJoueur) {
-			nomJoueur.add((Label) vbox.getChildren().get(0));
-			HBox enfant = (HBox) vbox.getChildren().get(1);
-			btnCartePerso.add((Button) enfant.getChildren().get(0));
-			btnRevelation.add((Button) enfant.getChildren().get(1));
+			HBox joueur = (HBox) vbox.getChildren().get(1);
+			VBox carte = (VBox) joueur.getChildren().get(1);
+			cartePerso.add((ImageView) carte.getChildren().get(0));
+			btnRevelation.add((Button) carte.getChildren().get(1));
+			VBox info = (VBox) joueur.getChildren().get(0);
+			nomJoueur.add((Label) info.getChildren().get(0));
 		}
+		
 		//initilaisation des boutons se reveler
 		int i = 0;
 		for (Button b : btnRevelation) {
@@ -81,13 +99,12 @@ public class PlateauController implements Initializable {
 		}
 		//initialisation des bouton carte personnage
 		int j = 0;
-		for (Button b : btnCartePerso) {
+		for (ImageView b : cartePerso) {
 			int compteur = j;
-			b.setOnAction(e -> {try {consulterSaCarte(compteur);} catch (IOException e1) {e1.printStackTrace();}});
+			b.setOnMouseClicked(e -> {try {consulterSaCarte(compteur);} catch (IOException e1) {e1.printStackTrace();}});
 			j++;
 		}
 		
-
 		
 		listJoueur = View.getJoueurs();
 	}
@@ -140,16 +157,22 @@ public class PlateauController implements Initializable {
 		popup.display();
 	}
 	
+	/**
+	 * Place les joueurs au bon endroit sur le plateau
+	 * 
+	 * @param j : map donnant le joueur et son numero
+	 */
 	public void showInformation(Map<Integer, Joueur> j) {
-		System.out.println("\tplacement des joueurs");
+		/*System.out.println("\tplacement des joueurs");
+		int taille = this.vboxJoueur.size() + this.hboxJoueur.size();
 		
-		for (int i=0; i<this.vboxJoueur.size(); i++) {
+		for (int i=0; i<taille; i++) {
 			if (j.get(i) != null)
 				nomJoueur.get(i).setText(j.get(i).getNom());
 			else {
 				vboxJoueur.get(i).setVisible(false);
 			}
-		}
+		}*/
 	}
 
 	public void rollDice(Joueur joueur, int typeDice, int[] rolls) {
diff --git a/src/ihm/ressources/Plateau.fxml b/src/ihm/ressources/Plateau.fxml
index e55f4e2..82aea18 100644
--- a/src/ihm/ressources/Plateau.fxml
+++ b/src/ihm/ressources/Plateau.fxml
@@ -11,293 +11,321 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
 
-<AnchorPane xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.PlateauController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.PlateauController">
    <children>
-      <BorderPane fx:id="root" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1280.0" styleClass="background" stylesheets="@style/plateau.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1280.0" styleClass="background" stylesheets="@style/plateau.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <top>
-            <HBox alignment="CENTER" prefHeight="149.0" prefWidth="1343.0" BorderPane.alignment="CENTER">
+            <HBox alignment="CENTER" prefHeight="180.0" prefWidth="1343.0" BorderPane.alignment="CENTER">
                <children>
-                  <VBox fx:id="joueur1" alignment="CENTER" prefHeight="164.0" prefWidth="212.0" rotate="180.0">
+                  <HBox fx:id="joueur1" prefHeight="180.0" prefWidth="731.0" rotate="180.0">
                      <children>
-                        <Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
-                        <HBox alignment="CENTER" prefHeight="46.0" prefWidth="212.0">
+                        <AnchorPane prefHeight="155.0" prefWidth="255.0" styleClass="tour" />
+                        <VBox alignment="CENTER" prefHeight="155.0" prefWidth="116.0">
                            <children>
-                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%carte.personnage" />
-                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%se.reveler">
-                                 <HBox.margin>
-                                    <Insets left="5.0" />
-                                 </HBox.margin>
-                              </Button>
+                              <ImageView fitHeight="97.8" fitWidth="70.05" pickOnBounds="true" preserveRatio="true" />
+                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%se.reveler" />
                            </children>
-                           <VBox.margin>
-                              <Insets bottom="5.0" />
-                           </VBox.margin>
-                        </HBox>
-                        <HBox prefHeight="70.0" prefWidth="212.0" styleClass="carteEquipement" stylesheets="@style/plateau.css">
+                           <HBox.margin>
+                              <Insets left="5.0" right="5.0" />
+                           </HBox.margin>
+                        </VBox>
+                        <VBox alignment="CENTER" prefHeight="164.0" prefWidth="212.0">
                            <children>
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                              <Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
+                              <HBox prefHeight="72.0" prefWidth="274.0" styleClass="carteEquipement" stylesheets="@style/plateau.css">
+                                 <children>
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                 </children>
+                              </HBox>
                            </children>
-                        </HBox>
+                           <HBox.margin>
+                              <Insets right="5.0" />
+                           </HBox.margin>
+                        </VBox>
                      </children>
-                     <HBox.margin>
-                        <Insets right="5.0" />
-                     </HBox.margin>
-                  </VBox>
-                  <VBox fx:id="joueur2" alignment="CENTER" prefHeight="164.0" prefWidth="212.0" rotate="180.0">
+                     <padding>
+                        <Insets right="10.0" />
+                     </padding>
+                  </HBox>
+                  <HBox fx:id="joueur2" prefHeight="155.0" prefWidth="731.0" rotate="180.0">
                      <children>
-                        <Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
-                        <HBox alignment="CENTER" prefHeight="46.0" prefWidth="212.0">
+                        <AnchorPane prefHeight="155.0" prefWidth="255.0" styleClass="tour" />
+                        <VBox alignment="CENTER" prefHeight="155.0" prefWidth="116.0">
                            <children>
-                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%carte.personnage" />
-                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%se.reveler">
-                                 <HBox.margin>
-                                    <Insets left="5.0" />
-                                 </HBox.margin>
-                              </Button>
+                              <ImageView fitHeight="97.8" fitWidth="70.05" pickOnBounds="true" preserveRatio="true" />
+                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%se.reveler" />
                            </children>
-                           <VBox.margin>
-                              <Insets bottom="5.0" />
-                           </VBox.margin>
-                        </HBox>
-                        <HBox prefHeight="70.0" prefWidth="212.0" styleClass="carteEquipement" stylesheets="@style/plateau.css">
+                           <HBox.margin>
+                              <Insets left="5.0" right="5.0" />
+                           </HBox.margin>
+                        </VBox>
+                        <VBox alignment="CENTER" prefHeight="164.0" prefWidth="212.0">
                            <children>
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                              <Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
+                              <HBox prefHeight="72.0" prefWidth="274.0" styleClass="carteEquipement" stylesheets="@style/plateau.css">
+                                 <children>
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                 </children>
+                              </HBox>
                            </children>
-                        </HBox>
+                           <HBox.margin>
+                              <Insets right="5.0" />
+                           </HBox.margin>
+                        </VBox>
                      </children>
-                     <HBox.margin>
-                        <Insets left="5.0" />
-                     </HBox.margin>
-                  </VBox>
+                     <padding>
+                        <Insets right="10.0" />
+                     </padding>
+                  </HBox>
                </children>
             </HBox>
          </top>
          <bottom>
-            <HBox alignment="CENTER" prefHeight="155.0" prefWidth="1280.0" BorderPane.alignment="CENTER">
+            <HBox alignment="CENTER" prefHeight="180.0" prefWidth="1920.0" BorderPane.alignment="CENTER">
                <children>
-                  <VBox fx:id="joueur3" alignment="CENTER" prefHeight="164.0" prefWidth="212.0">
+                  <HBox fx:id="joueur3" prefHeight="180.0" prefWidth="731.0">
                      <children>
-                        <Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
-                        <HBox alignment="CENTER" prefHeight="44.0" prefWidth="274.0">
+                        <AnchorPane prefHeight="180.0" prefWidth="255.0" styleClass="tour" />
+                        <VBox alignment="CENTER" prefHeight="155.0" prefWidth="116.0">
                            <children>
-                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%carte.personnage" />
-                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%se.reveler">
-                                 <HBox.margin>
-                                    <Insets left="5.0" />
-                                 </HBox.margin>
-                              </Button>
+                              <ImageView fitHeight="97.8" fitWidth="70.05" pickOnBounds="true" preserveRatio="true" />
+                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%se.reveler" />
                            </children>
-                           <VBox.margin>
-                              <Insets bottom="5.0" />
-                           </VBox.margin>
-                        </HBox>
-                        <HBox prefHeight="72.0" prefWidth="274.0" styleClass="carteEquipement" stylesheets="@style/plateau.css">
+                           <HBox.margin>
+                              <Insets left="5.0" right="5.0" />
+                           </HBox.margin>
+                        </VBox>
+                        <VBox alignment="CENTER" prefHeight="164.0" prefWidth="212.0">
                            <children>
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                              <Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
+                              <HBox prefHeight="72.0" prefWidth="274.0" styleClass="carteEquipement" stylesheets="@style/plateau.css">
+                                 <children>
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                 </children>
+                              </HBox>
                            </children>
-                        </HBox>
+                           <HBox.margin>
+                              <Insets right="5.0" />
+                           </HBox.margin>
+                        </VBox>
                      </children>
-                     <HBox.margin>
-                        <Insets right="5.0" />
-                     </HBox.margin>
-                  </VBox>
-                  <VBox fx:id="joueur4" alignment="CENTER" prefHeight="164.0" prefWidth="212.0">
+                     <padding>
+                        <Insets right="10.0" />
+                     </padding>
+                  </HBox>
+                  <HBox fx:id="joueur4" prefHeight="180.0" prefWidth="731.0">
                      <children>
-                        <Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
-                        <HBox alignment="CENTER" prefHeight="44.0" prefWidth="274.0">
+                        <AnchorPane prefHeight="155.0" prefWidth="255.0" styleClass="tour" />
+                        <VBox alignment="CENTER" prefHeight="155.0" prefWidth="116.0">
                            <children>
-                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%carte.personnage" />
-                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%se.reveler">
-                                 <HBox.margin>
-                                    <Insets left="5.0" />
-                                 </HBox.margin>
-                              </Button>
+                              <ImageView fitHeight="97.8" fitWidth="70.05" pickOnBounds="true" preserveRatio="true" />
+                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%se.reveler" />
                            </children>
-                           <VBox.margin>
-                              <Insets bottom="5.0" />
-                           </VBox.margin>
-                        </HBox>
-                        <HBox prefHeight="72.0" prefWidth="274.0" styleClass="carteEquipement" stylesheets="@style/plateau.css">
+                           <HBox.margin>
+                              <Insets left="5.0" right="5.0" />
+                           </HBox.margin>
+                        </VBox>
+                        <VBox alignment="CENTER" prefHeight="164.0" prefWidth="212.0">
                            <children>
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                              <Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
+                              <HBox prefHeight="72.0" prefWidth="274.0" styleClass="carteEquipement" stylesheets="@style/plateau.css">
+                                 <children>
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                    <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                 </children>
+                              </HBox>
                            </children>
-                        </HBox>
+                           <HBox.margin>
+                              <Insets right="5.0" />
+                           </HBox.margin>
+                        </VBox>
                      </children>
-                     <HBox.margin>
-                        <Insets left="5.0" />
-                     </HBox.margin>
-                  </VBox>
+                     <padding>
+                        <Insets left="10.0" />
+                     </padding>
+                  </HBox>
                </children>
             </HBox>
          </bottom>
          <left>
-            <VBox alignment="CENTER_LEFT" prefHeight="496.0" prefWidth="160.0" BorderPane.alignment="CENTER">
+            <VBox alignment="CENTER_LEFT" prefHeight="1004.0" prefWidth="444.0" BorderPane.alignment="CENTER">
                <children>
-                  <VBox fx:id="joueur5" alignment="CENTER" prefHeight="181.0" prefWidth="333.0" rotate="90.0">
+                  <VBox fx:id="joueur5" alignment="CENTER" prefHeight="285.0" prefWidth="445.0" rotate="90.0">
                      <children>
-                        <Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
-                        <HBox alignment="CENTER" prefHeight="53.0" prefWidth="198.0">
+                        <AnchorPane maxHeight="180.0" maxWidth="255.0" minHeight="180.0" minWidth="255.0" prefHeight="180.0" prefWidth="255.0" styleClass="tour" />
+                        <HBox prefHeight="138.0" prefWidth="428.0">
                            <children>
-                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%carte.personnage" />
-                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%se.reveler">
-                                 <HBox.margin>
-                                    <Insets left="5.0" />
-                                 </HBox.margin>
-                              </Button>
-                           </children>
-                           <VBox.margin>
-                              <Insets bottom="5.0" />
-                           </VBox.margin>
-                        </HBox>
-                        <HBox prefHeight="53.0" prefWidth="329.0" styleClass="carteEquipement" stylesheets="@style/plateau.css">
-                           <children>
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                              <VBox alignment="CENTER" prefHeight="179.0" prefWidth="329.0">
+                                 <children>
+                                    <Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
+                                    <HBox prefHeight="24.0" prefWidth="329.0" styleClass="carteEquipement" stylesheets="@style/plateau.css">
+                                       <children>
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                       </children>
+                                    </HBox>
+                                 </children>
+                              </VBox>
+                              <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
+                                 <children>
+                                    <ImageView fitHeight="97.8" fitWidth="70.05" pickOnBounds="true" preserveRatio="true" />
+                                    <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%se.reveler" />
+                                 </children>
+                              </VBox>
                            </children>
                         </HBox>
                      </children>
                      <VBox.margin>
-                        <Insets bottom="100.0" left="-80.0" />
+                        <Insets top="150.0" />
                      </VBox.margin>
+                     <padding>
+                        <Insets top="120.0" />
+                     </padding>
                   </VBox>
-                  <VBox fx:id="joueur7" alignment="CENTER" prefHeight="179.0" prefWidth="329.0" rotate="90.0">
+                  <VBox fx:id="joueur6" alignment="CENTER" prefHeight="285.0" prefWidth="445.0" rotate="90.0">
                      <children>
-                        <Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
-                        <HBox alignment="CENTER" prefHeight="53.0" prefWidth="198.0">
+                        <AnchorPane maxHeight="180.0" maxWidth="255.0" minHeight="180.0" minWidth="255.0" prefHeight="180.0" prefWidth="255.0" styleClass="tour" />
+                        <HBox prefHeight="138.0" prefWidth="428.0">
                            <children>
-                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%carte.personnage" />
-                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%se.reveler">
-                                 <HBox.margin>
-                                    <Insets left="5.0" />
-                                 </HBox.margin>
-                              </Button>
-                           </children>
-                           <VBox.margin>
-                              <Insets bottom="5.0" />
-                           </VBox.margin>
-                        </HBox>
-                        <HBox prefHeight="24.0" prefWidth="329.0" styleClass="carteEquipement" stylesheets="@style/plateau.css">
-                           <children>
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                              <VBox alignment="CENTER" prefHeight="179.0" prefWidth="329.0">
+                                 <children>
+                                    <Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
+                                    <HBox prefHeight="24.0" prefWidth="329.0" styleClass="carteEquipement" stylesheets="@style/plateau.css">
+                                       <children>
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                       </children>
+                                    </HBox>
+                                 </children>
+                              </VBox>
+                              <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
+                                 <children>
+                                    <ImageView fitHeight="97.8" fitWidth="70.05" pickOnBounds="true" preserveRatio="true" />
+                                    <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%se.reveler" />
+                                 </children>
+                              </VBox>
                            </children>
                         </HBox>
                      </children>
-                     <VBox.margin>
-                        <Insets left="-80.0" top="100.0" />
-                     </VBox.margin>
+                     <padding>
+                        <Insets top="120.0" />
+                     </padding>
                   </VBox>
                </children>
+               <BorderPane.margin>
+                  <Insets top="-170.0" />
+               </BorderPane.margin>
             </VBox>
          </left>
          <right>
-            <VBox alignment="CENTER_RIGHT" prefHeight="496.0" prefWidth="214.0" BorderPane.alignment="CENTER">
+            <VBox alignment="CENTER_RIGHT" prefHeight="854.0" prefWidth="436.0" BorderPane.alignment="CENTER">
                <children>
-                  <VBox fx:id="joueur6" alignment="CENTER" prefHeight="163.0" prefWidth="329.0" rotate="270.0">
+                  <VBox fx:id="joueur7" alignment="CENTER" prefHeight="285.0" prefWidth="445.0" rotate="270.0">
                      <children>
-                        <Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
-                        <HBox alignment="CENTER" prefHeight="39.0" prefWidth="214.0">
+                        <AnchorPane maxHeight="180.0" maxWidth="255.0" minHeight="180.0" minWidth="255.0" prefHeight="180.0" prefWidth="255.0" styleClass="tour" />
+                        <HBox prefHeight="138.0" prefWidth="428.0">
                            <children>
-                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%carte.personnage" />
-                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%se.reveler">
-                                 <HBox.margin>
-                                    <Insets left="5.0" />
-                                 </HBox.margin>
-                              </Button>
-                           </children>
-                           <VBox.margin>
-                              <Insets bottom="5.0" />
-                           </VBox.margin>
-                        </HBox>
-                        <HBox prefHeight="52.0" prefWidth="329.0" styleClass="carteEquipement" stylesheets="@style/plateau.css">
-                           <children>
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                              <VBox alignment="CENTER" prefHeight="179.0" prefWidth="329.0">
+                                 <children>
+                                    <Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
+                                    <HBox prefHeight="24.0" prefWidth="329.0" styleClass="carteEquipement" stylesheets="@style/plateau.css">
+                                       <children>
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                       </children>
+                                    </HBox>
+                                 </children>
+                              </VBox>
+                              <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
+                                 <children>
+                                    <ImageView fitHeight="97.8" fitWidth="70.05" pickOnBounds="true" preserveRatio="true" />
+                                    <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%se.reveler" />
+                                 </children>
+                              </VBox>
                            </children>
                         </HBox>
                      </children>
-                     <VBox.margin>
-                        <Insets bottom="100.0" right="-80.0" />
-                     </VBox.margin>
+                     <padding>
+                        <Insets top="120.0" />
+                     </padding>
                   </VBox>
-                  <VBox fx:id="joueur8" alignment="CENTER" prefHeight="163.0" prefWidth="329.0" rotate="270.0">
+                  <VBox fx:id="joueur8" alignment="CENTER" prefHeight="285.0" prefWidth="445.0" rotate="270.0">
                      <children>
-                        <Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
-                        <HBox alignment="CENTER" prefHeight="39.0" prefWidth="214.0">
+                        <AnchorPane maxHeight="180.0" maxWidth="255.0" minHeight="180.0" minWidth="255.0" prefHeight="180.0" prefWidth="255.0" styleClass="tour" />
+                        <HBox prefHeight="138.0" prefWidth="428.0">
                            <children>
-                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%carte.personnage" />
-                              <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%se.reveler">
-                                 <HBox.margin>
-                                    <Insets left="5.0" />
-                                 </HBox.margin>
-                              </Button>
-                           </children>
-                           <VBox.margin>
-                              <Insets bottom="5.0" />
-                           </VBox.margin>
-                        </HBox>
-                        <HBox prefHeight="52.0" prefWidth="329.0" styleClass="carteEquipement" stylesheets="@style/plateau.css">
-                           <children>
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
-                              <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                              <VBox alignment="CENTER" prefHeight="179.0" prefWidth="329.0">
+                                 <children>
+                                    <Label styleClass="text" stylesheets="@style/plateau.css" text="Nom joueur" />
+                                    <HBox prefHeight="24.0" prefWidth="329.0" styleClass="carteEquipement" stylesheets="@style/plateau.css">
+                                       <children>
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                          <ImageView fitHeight="65.2" fitWidth="46.7" pickOnBounds="true" preserveRatio="true" />
+                                       </children>
+                                    </HBox>
+                                 </children>
+                              </VBox>
+                              <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
+                                 <children>
+                                    <ImageView fitHeight="97.8" fitWidth="70.05" pickOnBounds="true" preserveRatio="true" />
+                                    <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/plateau.css" text="%se.reveler" />
+                                 </children>
+                              </VBox>
                            </children>
                         </HBox>
                      </children>
-                     <VBox.margin>
-                        <Insets right="-80.0" top="100.0" />
-                     </VBox.margin>
+                     <padding>
+                        <Insets top="120.0" />
+                     </padding>
                   </VBox>
                </children>
             </VBox>
          </right>
          <center>
-            <HBox alignment="CENTER" prefHeight="496.0" prefWidth="869.0" BorderPane.alignment="CENTER">
+            <HBox alignment="CENTER" prefHeight="720.0" prefWidth="1036.0" BorderPane.alignment="CENTER">
                <children>
                   <VBox alignment="CENTER_LEFT" prefWidth="22.0">
                      <children>
diff --git a/src/ihm/ressources/style/plateau.css b/src/ihm/ressources/style/plateau.css
index 19ea3a5..2ab3e3e 100644
--- a/src/ihm/ressources/style/plateau.css
+++ b/src/ihm/ressources/style/plateau.css
@@ -66,4 +66,10 @@
 	-fx-background-color: #2a2823;
 	-fx-border-color: #5b5648;
 	-fx-border-width: 2;
+}
+
+.tour{
+	-fx-border-color: #e2e2e2;
+	-fx-border-width: 2;
+    -fx-background-radius: 0;
 }
\ No newline at end of file