diff --git a/Motus/Main.qml b/Motus/Main.qml
index 47b5b22ba6c46fcb6fb7f200ec3c6d677642df45..8e7b8c9e65ab783e76d53df5eea0727bfda3cb9c 100644
--- a/Motus/Main.qml
+++ b/Motus/Main.qml
@@ -1,7 +1,7 @@
 import QtQuick
 
 Window {
-    width: 1920
+    width: Screen.width
     height: 1080
     visible: true
     visibility: Window.Maximized
@@ -11,25 +11,11 @@ Window {
         id: rectangle
         x: 0
         y: 0
-        width: 1920
+        width: Screen.width
         height: 1080
         color: "#323232"
         focus: true
 
-        Case {
-            id: case1
-            x: 99
-            y: 381
-            _textText: "A"
-        }
-
-        Case {
-            id: case2
-            x: 201
-            y: 372
-            _textText: "B"
-        }
-
         Bouton {
             id: bouton
             x: 63
@@ -59,8 +45,8 @@ Window {
 
         Choosebutton {
             id: choosebutton
-            x: 663
-            y: 249
+            x: 751
+            y: 42
             buttonText: "Générer un mot"
 
 
@@ -68,330 +54,6 @@ Window {
 
 
 
-            Rectangle {
-                id: rectangle1
-                y: 465
-                width: 640
-                height: 280
-                color: "#323232"
-                radius: 10
-                border.color: "#ffffff"
-                border.width: 5
-                anchors.horizontalCenterOffset: 38
-                anchors.horizontalCenter: parent.horizontalCenter
-
-                Column {
-                    id: column
-                    width: (10 * 50) + (9 * 5)
-                    spacing: 5
-                    height: 2*spacing + 80*3
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.horizontalCenter: parent.horizontalCenter
-
-                    Row {
-                        id: row1
-                        height: 80
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        spacing: 5
-                        width: (10 * 50) + (9 * spacing)
-
-                        Key {
-                            id: key
-                            x: 0
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key1
-                            x: 70
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "Z"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key2
-                            x: 140
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "E"
-                            antialiasing: true
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key3
-                            x: 210
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "R"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key4
-                            x: 280
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "T"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key5
-                            x: 350
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "Y"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key6
-                            x: 420
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "U"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key7
-                            x: 490
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "I"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key8
-                            x: 560
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "O"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key9
-                            x: 630
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "P"
-                            scale: 0.8
-                        }
-                    }
-
-                    Row {
-                        id: row2
-                        width: (9 * 50) + (8 * spacing)
-                        height: 80
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        spacing: 5
-
-                        Key {
-                            id: key12
-                            x: 140
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "Q"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key13
-                            x: 210
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "S"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key14
-                            x: 280
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "D"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key15
-                            x: 350
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "F"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key16
-                            x: 420
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "G"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key17
-                            x: 490
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "H"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key18
-                            x: 560
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "J"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key19
-                            x: 630
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "K"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key20
-                            x: 630
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "L"
-                            scale: 0.8
-                        }
-                    }
-
-                    Row {
-                        id: row3
-                        width: (7 * 50) + (10 * spacing) + (100 * 2)
-                        height: 80
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        spacing: 5
-
-                        Key {
-                            id: key23
-                            x: 140
-                            width: 100
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelFontstyleName: "Bold"
-                            labelFontpixelSize: 25
-                            labelText: "Entrée"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key24
-                            x: 210
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: 'W'
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key25
-                            x: 280
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "X"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key26
-                            x: 350
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "C"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key27
-                            x: 420
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "V"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key28
-                            x: 490
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            labelText: "B"
-                            scale: 0.8
-                        }
-
-                        Key {
-                            id: key29
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            scale: 0.8
-                            labelText: "N"
-                        }
-
-                        Key {
-                            id: key30
-                            width: 50
-                            height: 70
-                            anchors.verticalCenter: parent.verticalCenter
-                            scale: 0.8
-                            labelText: "M"
-                        }
-
-                        BackKey {
-                            id: backKey
-                            width: 100
-                            height: 60
-                            anchors.verticalCenter: parent.verticalCenter
-
-                        }
-                    }
-                }
-            }
-
 
 
             Keys.onPressed: (event) => {
@@ -417,20 +79,10 @@ Window {
             }
         }
 
-        Image {
-            id: image
-            x: 1074
-            y: 122
-            width: 346
-            height: 327
-            source: "back_key.png"
-            fillMode: Image.PreserveAspectFit
-        }
-
         Rectangle {
             id: rectangle2
-            x: 312
-            y: 296
+            x: 1175
+            y: 241
             width: 265
             height: 286
             color: "#ffffff"
@@ -475,15 +127,340 @@ Window {
 
         MotusTimer {
             id: motusTimer
-            x: 502
-            y: 73
+            x: 498
+            y: 42
         }
 
         NumberLetterButton {
             id: numberLetterButton
-            x: 704
-            y: 122
+            x: 623
+            y: 171
+
+        }
+
+        Rectangle {
+            id: rectangle1
+            x: 342
+            y: 406
+            width: 640
+            height: 280
+            color: "#323232"
+            radius: 10
+            border.color: "#ffffff"
+            border.width: 5
+            anchors.horizontalCenterOffset: -126
+            anchors.horizontalCenter: parent.horizontalCenter
+
+            Column {
+                id: column
+                width: (10 * 50) + (9 * 5)
+                spacing: 5
+                height: 2*spacing + 80*3
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.horizontalCenter: parent.horizontalCenter
+
+                Row {
+                    id: row1
+                    height: 80
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    spacing: 5
+                    width: (10 * 50) + (9 * spacing)
+
+                    Key {
+                        id: key
+                        x: 0
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key1
+                        x: 70
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "Z"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key2
+                        x: 140
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "E"
+                        antialiasing: true
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key3
+                        x: 210
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "R"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key4
+                        x: 280
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "T"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key5
+                        x: 350
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "Y"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key6
+                        x: 420
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "U"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key7
+                        x: 490
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "I"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key8
+                        x: 560
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "O"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key9
+                        x: 630
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "P"
+                        scale: 0.8
+                    }
+                }
+
+                Row {
+                    id: row2
+                    width: (9 * 50) + (8 * spacing)
+                    height: 80
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    spacing: 5
+
+                    Key {
+                        id: key12
+                        x: 140
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "Q"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key13
+                        x: 210
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "S"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key14
+                        x: 280
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "D"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key15
+                        x: 350
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "F"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key16
+                        x: 420
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "G"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key17
+                        x: 490
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "H"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key18
+                        x: 560
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "J"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key19
+                        x: 630
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "K"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key20
+                        x: 630
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "L"
+                        scale: 0.8
+                    }
+                }
 
+                Row {
+                    id: row3
+                    width: (7 * 50) + (10 * spacing) + (100 * 2)
+                    height: 80
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    spacing: 5
+
+                    Key {
+                        id: key23
+                        x: 140
+                        width: 100
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelFontstyleName: "Bold"
+                        labelFontpixelSize: 25
+                        labelText: "Entrée"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key24
+                        x: 210
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: 'W'
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key25
+                        x: 280
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "X"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key26
+                        x: 350
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "C"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key27
+                        x: 420
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "V"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key28
+                        x: 490
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        labelText: "B"
+                        scale: 0.8
+                    }
+
+                    Key {
+                        id: key29
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        scale: 0.8
+                        labelText: "N"
+                    }
+
+                    Key {
+                        id: key30
+                        width: 50
+                        height: 70
+                        anchors.verticalCenter: parent.verticalCenter
+                        scale: 0.8
+                        labelText: "M"
+                    }
+
+                    BackKey {
+                        id: backKey
+                        width: 100
+                        height: 60
+                        anchors.verticalCenter: parent.verticalCenter
+
+                    }
+                }
+            }
         }
     }
 }