diff --git a/demo/data/save.ser b/demo/data/save.ser
index feb8a62f8a4e7142e1a80870a2ff8a2dae116e6b..3acb81e34f5db441616aa26237397fdf6c243e11 100644
Binary files a/demo/data/save.ser and b/demo/data/save.ser differ
diff --git a/demo/src/main/resources/ch/hepia/main.fxml b/demo/src/main/resources/ch/hepia/main.fxml
index 387ccfe0172e517b4af08810d20ee118c24fa817..11206e7de3bd0ce8c88b2635d2e9fb1b2991b576 100644
--- a/demo/src/main/resources/ch/hepia/main.fxml
+++ b/demo/src/main/resources/ch/hepia/main.fxml
@@ -52,12 +52,17 @@
             <TextField fx:id="phoneBox" layoutX="527.0" layoutY="463.0" />
             <TextField fx:id="mailBox" layoutX="14.0" layoutY="521.0" />
             <TextField fx:id="socialBox" layoutX="185.0" layoutY="521.0" />
+            <ComboBox fx:id="cBoxType" layoutX="698.0" layoutY="463.0" onAction="#selectType" prefWidth="150.0" promptText="Type" />
+            <TextField fx:id="jobBox" disable="true" layoutX="356.0" layoutY="521.0" />
+            <TextField fx:id="relationBox" disable="true" layoutX="527.0" layoutY="521.0" />
             <Button layoutX="698.0" layoutY="521.0" mnemonicParsing="false" onAction="#doneEditing" text="Add" />
-            <Button fx:id="btnSave" layoutX="1086.0" layoutY="2.0" mnemonicParsing="false" onAction="#saveLocally" text="Save" />
+            <Button fx:id="btnUpdate" layoutX="782.0" layoutY="521.0" mnemonicParsing="false" onAction="#updateEntry" text="Update" />
             <TextField fx:id="searchBox" layoutX="11.0" layoutY="2.0" promptText="Type here to search" />
             <Button layoutX="191.0" layoutY="2.0" mnemonicParsing="false" onAction="#searchAction" text="Search" />
+            <Button fx:id="btnHome" disable="true" layoutX="271.0" layoutY="2.0" mnemonicParsing="false" onAction="#homeAction" text="Home" />
+            <Button fx:id="btnDelete" layoutX="347.0" layoutY="2.0" mnemonicParsing="false" onAction="#deleteEntry" text="Delete" />
             <Button fx:id="btnLoad" layoutX="1021.0" layoutY="2.0" mnemonicParsing="false" onAction="#loadLocalSave" text="Load" />
-            <ComboBox fx:id="cBoxType" layoutX="698.0" layoutY="463.0" onAction="#selectType" prefWidth="150.0" />
+            <Button fx:id="btnSave" layoutX="1086.0" layoutY="2.0" mnemonicParsing="false" onAction="#saveLocally" text="Save" />
             <TableView fx:id="tView" layoutY="36.0" onMouseClicked="#showEntryData" prefHeight="402.0" prefWidth="1150.0">
               <columns>
                 <TableColumn prefWidth="75.0" text="C1" />
@@ -70,13 +75,8 @@
             <Label layoutX="527.0" layoutY="447.0" text="Téléphone(s)" />
             <Label layoutX="18.0" layoutY="505.0" text="Mail(s)" />
             <Label layoutX="185.0" layoutY="505.0" text="Socials" />
-            <TextField fx:id="jobBox" disable="true" layoutX="356.0" layoutY="521.0" />
             <Label layoutX="356.0" layoutY="505.0" text="Job" />
-            <Button fx:id="btnDelete" layoutX="347.0" layoutY="2.0" mnemonicParsing="false" onAction="#deleteEntry" text="Delete" />
-            <TextField fx:id="relationBox" disable="true" layoutX="527.0" layoutY="521.0" />
             <Label layoutX="527.0" layoutY="505.0" text="Relation" />
-            <Button fx:id="btnHome" disable="true" layoutX="271.0" layoutY="2.0" mnemonicParsing="false" onAction="#homeAction" text="Home" />
-            <Button fx:id="btnUpdate" layoutX="782.0" layoutY="521.0" mnemonicParsing="false" onAction="#updateEntry" text="Update" />
             <Label layoutX="915.0" layoutY="-9.0" prefHeight="47.0" prefWidth="171.0" text="No save" textFill="RED" visible="false">
                <font>
                   <Font name="DejaVu Sans Bold" size="22.0" />