diff --git a/src/main/resources/es/kauron/jstudy/view/edit.fxml b/src/main/resources/es/kauron/jstudy/view/edit.fxml
index 80f7efa..d5919f4 100644
--- a/src/main/resources/es/kauron/jstudy/view/edit.fxml
+++ b/src/main/resources/es/kauron/jstudy/view/edit.fxml
@@ -1,37 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
 <VBox spacing="5.0" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="es.kauron.jstudy.controller.EditController">
-   <children>
-      <HBox alignment="CENTER_LEFT" spacing="5.0">
-         <children>
-            <Label prefWidth="60.0" text="Question" />
-            <TextField fx:id="questionText" />
-         </children>
-      </HBox>
-      <HBox alignment="CENTER_LEFT" layoutX="10.0" layoutY="10.0" spacing="5.0">
-         <children>
-            <Label prefWidth="60.0" text="Answer" />
-            <TextField fx:id="answerText" />
-         </children>
-      </HBox>
-      <HBox alignment="CENTER_RIGHT" spacing="5.0">
-         <children>
-            <Button cancelButton="true" mnemonicParsing="false" onAction="#onCancelAction" text="Cancel" />
-            <Button defaultButton="true" mnemonicParsing="false" onAction="#onSaveAction" text="Save" />
-         </children>
-         <VBox.margin>
-            <Insets top="5.0" />
-         </VBox.margin>
-      </HBox>
-   </children>
-   <padding>
-      <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-   </padding>
+  <children>
+    <HBox alignment="CENTER_LEFT" spacing="5.0">
+      <children>
+        <Label prefWidth="60.0" text="Question" />
+        <TextField fx:id="questionText" />
+      </children>
+    </HBox>
+    <HBox alignment="CENTER_LEFT" layoutX="10.0" layoutY="10.0" spacing="5.0">
+      <children>
+        <Label prefWidth="60.0" text="Answer" />
+        <TextField fx:id="answerText" />
+      </children>
+    </HBox>
+    <HBox alignment="CENTER_RIGHT" spacing="5.0">
+      <children>
+        <Button cancelButton="true" mnemonicParsing="false" onAction="#onCancelAction" text="Cancel" />
+        <Button defaultButton="true" mnemonicParsing="false" onAction="#onSaveAction" text="Save" />
+      </children>
+      <VBox.margin>
+        <Insets top="5.0" />
+      </VBox.margin>
+    </HBox>
+  </children>
+  <padding>
+    <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+  </padding>
 </VBox>
diff --git a/src/main/resources/es/kauron/jstudy/view/main.fxml b/src/main/resources/es/kauron/jstudy/view/main.fxml
index 60b4eaa..5129bcd 100644
--- a/src/main/resources/es/kauron/jstudy/view/main.fxml
+++ b/src/main/resources/es/kauron/jstudy/view/main.fxml
@@ -6,137 +6,137 @@
 <?import javafx.scene.input.KeyCodeCombination?>
 <?import javafx.scene.layout.*?>
 <BorderPane fx:id="root" prefHeight="450.0" prefWidth="750.0" xmlns="http://javafx.com/javafx/8.0.162-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="es.kauron.jstudy.controller.Controller">
-   <center>
-      <TabPane fx:id="tabPane" focusTraversable="false" minHeight="400.0" minWidth="600.0" tabMinWidth="100.0" BorderPane.alignment="CENTER">
-         <tabs>
-            <Tab closable="false" text="Welcome">
-              <content>
-                  <HBox alignment="CENTER" onDragDropped="#onDragDropped" onDragOver="#onDragOver" spacing="25.0">
-                     <children>
-                        <VBox alignment="CENTER" spacing="15.0">
-                           <children>
-                              <Button alignment="TOP_LEFT" onAction="#onNewAction" prefHeight="40.0" prefWidth="150.0" text="_New table">
-                                 <graphic>
-                                    <ImageView fitHeight="30.0" fitWidth="30.0" pickOnBounds="true" preserveRatio="true">
-                                       <image>
-                                          <Image url="@../img/File.png" />
-                                       </image>
-                                    </ImageView>
-                                 </graphic>
-                                 <tooltip>
-                                    <Tooltip text="Create new empty table" />
-                                 </tooltip>
-                              </Button>
-                              <Button alignment="TOP_LEFT" onAction="#onLoadAction" prefHeight="40.0" prefWidth="150.0" text="_Load file">
-                                 <graphic>
-                                    <ImageView fitHeight="30.0" fitWidth="30.0" pickOnBounds="true" preserveRatio="true">
-                                       <image>
-                                          <Image url="@../img/Open Folder.png" />
-                                       </image>
-                                    </ImageView>
-                                 </graphic>
-                                 <tooltip>
-                                    <Tooltip text="Open an existing table from a file" />
-                                 </tooltip>
-                              </Button>
-                              <Button alignment="TOP_LEFT" layoutX="260.0" layoutY="187.0" onAction="#onImportAction" prefHeight="40.0" prefWidth="150.0" text="_Import data">
-                                 <graphic>
-                                    <ImageView fitHeight="30.0" fitWidth="30.0" pickOnBounds="true" preserveRatio="true">
-                                       <image>
-                                          <Image url="@../img/Download.png" />
-                                       </image>
-                                    </ImageView>
-                                 </graphic>
-                                 <tooltip>
-                                    <Tooltip text="Import data from other table-based software" />
-                                 </tooltip>
-                              </Button>
-                              <Button alignment="TOP_LEFT" layoutX="260.0" layoutY="208.0" onAction="#onSettingsAction" prefHeight="40.0" prefWidth="150.0" text="_Settings">
-                                 <graphic>
-                                    <ImageView fitHeight="30.0" fitWidth="30.0" pickOnBounds="true" preserveRatio="true">
-                                       <image>
-                                          <Image url="@../img/Settings.png" />
-                                       </image>
-                                    </ImageView>
-                                 </graphic>
-                                 <tooltip>
-                                    <Tooltip text="Change the settings" />
-                                 </tooltip>
-                              </Button>
-                           </children>
-                           <padding>
-                              <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                           </padding>
-                        </VBox>
-                        <VBox alignment="CENTER" spacing="15.0">
-                           <children>
-                              <ImageView fitHeight="150.0" fitWidth="150.0" pickOnBounds="true" preserveRatio="true">
-                                 <image>
-                                    <Image url="@../img/icon2.png" />
-                                 </image>
-                              </ImageView>
-                              <Button mnemonicParsing="false" onAction="#onAboutAction" prefHeight="40.0" prefWidth="150.0" text="About" />
-                           </children>
-                        </VBox>
-                     </children>
-                  </HBox>
-              </content>
-            </Tab>
-         </tabs>
-      </TabPane>
-   </center>
-   <top>
-      <MenuBar>
-        <menus>
-          <Menu text="_File">
-            <items>
-                  <MenuItem onAction="#onNewAction" text="_New">
-                     <accelerator>
-                        <KeyCodeCombination alt="UP" code="N" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
-                     </accelerator>
-                     <graphic>
-                        <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
-                           <image>
-                              <Image url="@../img/File.png" />
-                           </image>
+  <center>
+    <TabPane fx:id="tabPane" focusTraversable="false" minHeight="400.0" minWidth="600.0" tabMinWidth="100.0" BorderPane.alignment="CENTER">
+      <tabs>
+        <Tab closable="false" text="Welcome">
+          <content>
+            <HBox alignment="CENTER" onDragDropped="#onDragDropped" onDragOver="#onDragOver" spacing="25.0">
+              <children>
+                <VBox alignment="CENTER" spacing="15.0">
+                  <children>
+                    <Button alignment="TOP_LEFT" onAction="#onNewAction" prefHeight="40.0" prefWidth="150.0" text="_New table">
+                      <graphic>
+                        <ImageView fitHeight="30.0" fitWidth="30.0" pickOnBounds="true" preserveRatio="true">
+                          <image>
+                            <Image url="@../img/File.png" />
+                          </image>
                         </ImageView>
-                     </graphic>
-                  </MenuItem>
-                  <SeparatorMenuItem mnemonicParsing="false" />
-              <MenuItem onAction="#onLoadAction" text="_Open">
-                     <accelerator>
-                        <KeyCodeCombination alt="UP" code="O" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
-                     </accelerator>
-                     <graphic>
-                        <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
-                           <image>
-                              <Image url="@../img/Open Folder.png" />
-                           </image>
+                      </graphic>
+                      <tooltip>
+                        <Tooltip text="Create new empty table" />
+                      </tooltip>
+                    </Button>
+                    <Button alignment="TOP_LEFT" onAction="#onLoadAction" prefHeight="40.0" prefWidth="150.0" text="_Load file">
+                      <graphic>
+                        <ImageView fitHeight="30.0" fitWidth="30.0" pickOnBounds="true" preserveRatio="true">
+                          <image>
+                            <Image url="@../img/Open Folder.png" />
+                          </image>
                         </ImageView>
-                     </graphic>
-                  </MenuItem>
-                  <MenuItem onAction="#onImportAction" text="_Import">
-                     <graphic>
-                        <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
-                           <image>
-                              <Image url="@../img/Download.png" />
-                           </image>
+                      </graphic>
+                      <tooltip>
+                        <Tooltip text="Open an existing table from a file" />
+                      </tooltip>
+                    </Button>
+                    <Button alignment="TOP_LEFT" layoutX="260.0" layoutY="187.0" onAction="#onImportAction" prefHeight="40.0" prefWidth="150.0" text="_Import data">
+                      <graphic>
+                        <ImageView fitHeight="30.0" fitWidth="30.0" pickOnBounds="true" preserveRatio="true">
+                          <image>
+                            <Image url="@../img/Download.png" />
+                          </image>
                         </ImageView>
-                     </graphic></MenuItem>
-               <SeparatorMenuItem mnemonicParsing="false" />
-               <MenuItem fx:id="menuCloseTab" onAction="#onCloseTab" text="_Close tab" disable="true">
-                  <accelerator>
-                     <KeyCodeCombination alt="UP" code="W" control="DOWN" meta="UP" shift="UP" shortcut="UP"/>
-                  </accelerator>
-               </MenuItem>
-               <MenuItem onAction="#onQuit" text="_Quit">
-                  <accelerator>
-                     <KeyCodeCombination alt="UP" code="Q" control="DOWN" meta="UP" shift="UP" shortcut="UP"/>
-                  </accelerator>
-               </MenuItem>
-            </items>
-          </Menu>
-        </menus>
-      </MenuBar>
-   </top>
+                      </graphic>
+                      <tooltip>
+                        <Tooltip text="Import data from other table-based software" />
+                      </tooltip>
+                    </Button>
+                    <Button alignment="TOP_LEFT" layoutX="260.0" layoutY="208.0" onAction="#onSettingsAction" prefHeight="40.0" prefWidth="150.0" text="_Settings">
+                      <graphic>
+                        <ImageView fitHeight="30.0" fitWidth="30.0" pickOnBounds="true" preserveRatio="true">
+                          <image>
+                            <Image url="@../img/Settings.png" />
+                          </image>
+                        </ImageView>
+                      </graphic>
+                      <tooltip>
+                        <Tooltip text="Change the settings" />
+                      </tooltip>
+                    </Button>
+                  </children>
+                  <padding>
+                    <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+                  </padding>
+                </VBox>
+                <VBox alignment="CENTER" spacing="15.0">
+                  <children>
+                    <ImageView fitHeight="150.0" fitWidth="150.0" pickOnBounds="true" preserveRatio="true">
+                      <image>
+                        <Image url="@../img/icon2.png" />
+                      </image>
+                    </ImageView>
+                    <Button mnemonicParsing="false" onAction="#onAboutAction" prefHeight="40.0" prefWidth="150.0" text="About" />
+                  </children>
+                </VBox>
+              </children>
+            </HBox>
+          </content>
+        </Tab>
+      </tabs>
+    </TabPane>
+  </center>
+  <top>
+    <MenuBar>
+      <menus>
+        <Menu text="_File">
+          <items>
+            <MenuItem onAction="#onNewAction" text="_New">
+              <accelerator>
+                <KeyCodeCombination alt="UP" code="N" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
+              </accelerator>
+              <graphic>
+                <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+                  <image>
+                    <Image url="@../img/File.png" />
+                  </image>
+                </ImageView>
+              </graphic>
+            </MenuItem>
+            <SeparatorMenuItem mnemonicParsing="false" />
+            <MenuItem onAction="#onLoadAction" text="_Open">
+              <accelerator>
+                <KeyCodeCombination alt="UP" code="O" control="DOWN" meta="UP" shift="UP" shortcut="UP" />
+              </accelerator>
+              <graphic>
+                <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+                  <image>
+                    <Image url="@../img/Open Folder.png" />
+                  </image>
+                </ImageView>
+              </graphic>
+            </MenuItem>
+            <MenuItem onAction="#onImportAction" text="_Import">
+              <graphic>
+                <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+                  <image>
+                    <Image url="@../img/Download.png" />
+                  </image>
+                </ImageView>
+              </graphic></MenuItem>
+            <SeparatorMenuItem mnemonicParsing="false" />
+            <MenuItem fx:id="menuCloseTab" onAction="#onCloseTab" text="_Close tab" disable="true">
+              <accelerator>
+                <KeyCodeCombination alt="UP" code="W" control="DOWN" meta="UP" shift="UP" shortcut="UP"/>
+              </accelerator>
+            </MenuItem>
+            <MenuItem onAction="#onQuit" text="_Quit">
+              <accelerator>
+                <KeyCodeCombination alt="UP" code="Q" control="DOWN" meta="UP" shift="UP" shortcut="UP"/>
+              </accelerator>
+            </MenuItem>
+          </items>
+        </Menu>
+      </menus>
+    </MenuBar>
+  </top>
 </BorderPane>
diff --git a/src/main/resources/es/kauron/jstudy/view/settings.fxml b/src/main/resources/es/kauron/jstudy/view/settings.fxml
index 65d17ac..0bcfb45 100644
--- a/src/main/resources/es/kauron/jstudy/view/settings.fxml
+++ b/src/main/resources/es/kauron/jstudy/view/settings.fxml
@@ -3,13 +3,14 @@
 <?import com.jfoenix.controls.JFXCheckBox?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.layout.VBox?>
-<VBox alignment="CENTER_LEFT" spacing="15.0" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="es.kauron.jstudy.controller.SettingsController">
-   <children>
-      <JFXCheckBox fx:id="repeatMistakes" text="_Repeat mistakes" />
-      <JFXCheckBox fx:id="repeatImmediately" text="_Always repeat immediatly"/>
-      <JFXCheckBox fx:id="showFeedback" text="Show _feedback while testing" />
-   </children>
-   <padding>
-      <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-   </padding>
+<VBox alignment="CENTER_LEFT" spacing="15.0" xmlns="http://javafx.com/javafx/8.0.76-ea"
+      xmlns:fx="http://javafx.com/fxml/1" fx:controller="es.kauron.jstudy.controller.SettingsController">
+  <children>
+    <JFXCheckBox fx:id="repeatMistakes" text="_Repeat mistakes"/>
+    <JFXCheckBox fx:id="repeatImmediately" text="_Always repeat immediatly"/>
+    <JFXCheckBox fx:id="showFeedback" text="Show _feedback while testing"/>
+  </children>
+  <padding>
+    <Insets bottom="15.0" left="15.0" right="15.0" top="15.0"/>
+  </padding>
 </VBox>
diff --git a/src/main/resources/es/kauron/jstudy/view/table.fxml b/src/main/resources/es/kauron/jstudy/view/table.fxml
index ef9ccd7..892c3a8 100644
--- a/src/main/resources/es/kauron/jstudy/view/table.fxml
+++ b/src/main/resources/es/kauron/jstudy/view/table.fxml
@@ -4,105 +4,114 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
-<HBox xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="es.kauron.jstudy.controller.TableController">
-   <children>
-      <TableView fx:id="table" minHeight="-Infinity" minWidth="-Infinity" prefHeight="380.0" prefWidth="400.0" HBox.hgrow="ALWAYS">
-        <columns>
-          <TableColumn fx:id="questionCol" prefWidth="75.0" text="Question" />
-          <TableColumn fx:id="answerCol" prefWidth="75.0" text="Answer" />
-        </columns>
-         <columnResizePolicy>
-            <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-         </columnResizePolicy>
-      </TableView>
-      <VBox spacing="5.0">
-         <children>
-            <Button fx:id="saveButton" alignment="CENTER" contentDisplay="CENTER" layoutX="10.0" layoutY="163.0" onAction="#onSaveAction" prefWidth="105.0">
-               <graphic>
-                  <ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../img/Save.png" />
-                     </image>
-                  </ImageView>
-               </graphic>
-               <VBox.margin>
-                  <Insets />
-               </VBox.margin>
-               <tooltip>
-                  <Tooltip text="Save table to a file for future use" />
-               </tooltip>
+<HBox xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1"
+      fx:controller="es.kauron.jstudy.controller.TableController">
+  <children>
+    <TableView fx:id="table" minHeight="-Infinity" minWidth="-Infinity" prefHeight="380.0" prefWidth="400.0"
+               HBox.hgrow="ALWAYS">
+      <columns>
+        <TableColumn fx:id="questionCol" prefWidth="75.0" text="Question"/>
+        <TableColumn fx:id="answerCol" prefWidth="75.0" text="Answer"/>
+      </columns>
+      <columnResizePolicy>
+        <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+      </columnResizePolicy>
+    </TableView>
+    <VBox spacing="5.0">
+      <children>
+        <Button fx:id="saveButton" alignment="CENTER" contentDisplay="CENTER" layoutX="10.0" layoutY="163.0"
+                onAction="#onSaveAction" prefWidth="105.0">
+          <graphic>
+            <ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
+              <image>
+                <Image url="@../img/Save.png"/>
+              </image>
+            </ImageView>
+          </graphic>
+          <VBox.margin>
+            <Insets/>
+          </VBox.margin>
+          <tooltip>
+            <Tooltip text="Save table to a file for future use"/>
+          </tooltip>
+        </Button>
+        <Button defaultButton="true" onAction="#onAddAction" prefWidth="105.0" text="_Add">
+          <tooltip>
+            <Tooltip text="Add a new entry to the table"/>
+          </tooltip>
+        </Button>
+        <Button fx:id="editButton" alignment="TOP_LEFT" onAction="#onEditAction" prefWidth="105.0" text="_Edit">
+          <graphic>
+            <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+              <image>
+                <Image url="@../img/Edit.png"/>
+              </image>
+            </ImageView>
+          </graphic>
+          <tooltip>
+            <Tooltip text="Edit the selected entry"/>
+          </tooltip>
+        </Button>
+        <Button fx:id="swapButton" alignment="TOP_LEFT" layoutX="10.0" layoutY="76.0" onAction="#onSwapAction"
+                prefWidth="105.0" text="S_wap">
+          <graphic>
+            <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+              <image>
+                <Image url="@../img/Replace.png"/>
+              </image>
+            </ImageView>
+          </graphic>
+          <tooltip>
+            <Tooltip text="Make the answer the question and viceversa"/>
+          </tooltip>
+        </Button>
+        <Button fx:id="duplicateButton" alignment="TOP_LEFT" layoutX="10.0" layoutY="76.0" onAction="#onDuplicateAction"
+                prefWidth="105.0" text="D_uplicate">
+          <graphic>
+            <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+              <image>
+                <Image url="@../img/Copy.png"/>
+              </image>
+            </ImageView>
+          </graphic>
+          <tooltip>
+            <Tooltip text="Make a copy (may appear at the end)"/>
+          </tooltip>
+        </Button>
+        <Button fx:id="deleteButton" alignment="TOP_LEFT" onAction="#onDeleteAction" prefWidth="105.0" text="_Delete">
+          <graphic>
+            <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+              <image>
+                <Image url="@../img/Delete.png"/>
+              </image>
+            </ImageView>
+          </graphic>
+          <tooltip>
+            <Tooltip text="Delete all selected entries FOREVER"/>
+          </tooltip>
+        </Button>
+        <VBox alignment="BOTTOM_CENTER" spacing="5.0" VBox.vgrow="ALWAYS">
+          <children>
+            <Button fx:id="testSelectionButton" onAction="#onTestSelectionAction" prefWidth="105.0"
+                    text="Test _selected">
+              <tooltip>
+                <Tooltip text="Begin a test with the selected rows"/>
+              </tooltip>
             </Button>
-            <Button defaultButton="true" onAction="#onAddAction" prefWidth="105.0" text="_Add">
-               <tooltip>
-                  <Tooltip text="Add a new entry to the table" />
-               </tooltip></Button>
-            <Button fx:id="editButton" alignment="TOP_LEFT" onAction="#onEditAction" prefWidth="105.0" text="_Edit">
-               <graphic>
-                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../img/Edit.png" />
-                     </image>
-                  </ImageView>
-               </graphic>
-               <tooltip>
-                  <Tooltip text="Edit the selected entry" />
-               </tooltip>
+            <Button layoutX="10.0" layoutY="273.0" onAction="#onTestAction" prefWidth="105.0" text="_Test all">
+              <tooltip>
+                <Tooltip text="Begin a test for the whole table"/>
+              </tooltip>
             </Button>
-            <Button fx:id="swapButton" alignment="TOP_LEFT" layoutX="10.0" layoutY="76.0" onAction="#onSwapAction" prefWidth="105.0" text="S_wap">
-               <graphic>
-                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../img/Replace.png" />
-                     </image>
-                  </ImageView>
-               </graphic>
-               <tooltip>
-                  <Tooltip text="Make the answer the question and viceversa" />
-               </tooltip>
-            </Button>
-            <Button fx:id="duplicateButton" alignment="TOP_LEFT" layoutX="10.0" layoutY="76.0" onAction="#onDuplicateAction" prefWidth="105.0" text="D_uplicate">
-               <graphic>
-                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../img/Copy.png" />
-                     </image>
-                  </ImageView>
-               </graphic>
-               <tooltip>
-                  <Tooltip text="Make a copy (may appear at the end)" />
-               </tooltip>
-            </Button>
-            <Button fx:id="deleteButton" alignment="TOP_LEFT" onAction="#onDeleteAction" prefWidth="105.0" text="_Delete">
-               <graphic>
-                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
-                     <image>
-                        <Image url="@../img/Delete.png" />
-                     </image>
-                  </ImageView>
-               </graphic>
-               <tooltip>
-                  <Tooltip text="Delete all selected entries FOREVER" />
-               </tooltip>
-            </Button>
-            <VBox alignment="BOTTOM_CENTER" spacing="5.0" VBox.vgrow="ALWAYS">
-               <children>
-                  <Button fx:id="testSelectionButton" onAction="#onTestSelectionAction" prefWidth="105.0" text="Test _selected">
-                     <tooltip>
-                        <Tooltip text="Begin a test with the selected rows" />
-                     </tooltip></Button>
-                  <Button layoutX="10.0" layoutY="273.0" onAction="#onTestAction" prefWidth="105.0" text="_Test all">
-                     <tooltip>
-                        <Tooltip text="Begin a test for the whole table" />
-                     </tooltip></Button>
-               </children>
-               <VBox.margin>
-                  <Insets />
-               </VBox.margin>
-            </VBox>
-         </children>
-         <HBox.margin>
-            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
-         </HBox.margin>
-      </VBox>
-   </children>
+          </children>
+          <VBox.margin>
+            <Insets/>
+          </VBox.margin>
+        </VBox>
+      </children>
+      <HBox.margin>
+        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+      </HBox.margin>
+    </VBox>
+  </children>
 </HBox>
diff --git a/src/main/resources/es/kauron/jstudy/view/test.fxml b/src/main/resources/es/kauron/jstudy/view/test.fxml
index 835252b..e43cdf5 100644
--- a/src/main/resources/es/kauron/jstudy/view/test.fxml
+++ b/src/main/resources/es/kauron/jstudy/view/test.fxml
@@ -4,72 +4,79 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
-<BorderPane xmlns="http://javafx.com/javafx/8.0.202-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="es.kauron.jstudy.controller.TestController" stylesheets="@../css/test.css">
-   <center>
-      <VBox minHeight="280.0" minWidth="360.0" spacing="10.0">
-         <children>
-            <Label fx:id="question" text="Question" textOverrun="CLIP" wrapText="true" VBox.vgrow="ALWAYS">
-               <font>
-                  <Font size="30.0" />
-               </font>
-            </Label>
-            <TextField fx:id="answer">
-               <VBox.margin>
-                  <Insets top="5.0" />
-               </VBox.margin>
-            </TextField>
-            <Separator />
-            <HBox fx:id="feedback" alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
-               <children>
-                  <GridPane hgap="10.0" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS">
-                    <columnConstraints>
-                      <ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="NEVER" />
-                      <ColumnConstraints fillWidth="false" hgrow="ALWAYS" maxWidth="1.7976931348623157E308" />
-                    </columnConstraints>
-                    <rowConstraints>
-                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                    </rowConstraints>
-                     <children>
-                        <Label text="Previous question" wrapText="true" />
-                        <Label fx:id="prevQuestion" maxWidth="1.7976931348623157E308" styleClass="feedbackText" wrapText="true" GridPane.columnIndex="1" />
-                        <Label text="Previous answer" wrapText="true" GridPane.rowIndex="1" />
-                        <Label fx:id="prevAnswer" maxWidth="1.7976931348623157E308" styleClass="answer, feedbackText" wrapText="true" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                        <Label fx:id="correctLabel" text="Correct answer" wrapText="true" GridPane.rowIndex="2" />
-                        <Label fx:id="correctAnswer" maxWidth="1.7976931348623157E308" styleClass="feedbackText" wrapText="true" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                     </children>
-                  </GridPane>
-               </children>
-            </HBox>
-         </children>
-         <BorderPane.margin>
-            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
-         </BorderPane.margin>
-      </VBox>
-   </center>
-   <bottom>
-      <VBox alignment="CENTER" BorderPane.alignment="CENTER">
-         <children>
-            <Separator prefWidth="200.0" />
-            <Label fx:id="progressLabel" alignment="CENTER" contentDisplay="TOP" maxWidth="1.7976931348623157E308" text="1/40" />
-            <ProgressBar fx:id="progress" maxWidth="1.7976931348623157E308" progress="0.0" />
-         </children>
-         <BorderPane.margin>
-            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
-         </BorderPane.margin>
-      </VBox>
-   </bottom>
-   <right>
-      <VBox alignment="TOP_RIGHT" spacing="10.0" BorderPane.alignment="CENTER">
-         <children>
-            <Button defaultButton="true" focusTraversable="false" onAction="#onNextAction" prefWidth="110.0" text="_Next" />
-            <Button fx:id="skipButton" cancelButton="true" focusTraversable="false" onAction="#onSkipAction" prefWidth="110.0" text="_Skip question" />
-            <Button cancelButton="true" focusTraversable="false" layoutX="10.0" layoutY="48.0" onAction="#onEndAction" prefWidth="110.0" text="_End test" />
-         </children>
-         <BorderPane.margin>
-            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
-         </BorderPane.margin>
-      </VBox>
-   </right>
+<BorderPane xmlns="http://javafx.com/javafx/8.0.202-ea" xmlns:fx="http://javafx.com/fxml/1"
+            fx:controller="es.kauron.jstudy.controller.TestController" stylesheets="@../css/test.css">
+  <center>
+    <VBox minHeight="280.0" minWidth="360.0" spacing="10.0">
+      <children>
+        <Label fx:id="question" text="Question" textOverrun="CLIP" wrapText="true" VBox.vgrow="ALWAYS">
+          <font>
+            <Font size="30.0"/>
+          </font>
+        </Label>
+        <TextField fx:id="answer">
+          <VBox.margin>
+            <Insets top="5.0"/>
+          </VBox.margin>
+        </TextField>
+        <Separator/>
+        <HBox fx:id="feedback" alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
+          <children>
+            <GridPane hgap="10.0" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS">
+              <columnConstraints>
+                <ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="NEVER"/>
+                <ColumnConstraints fillWidth="false" hgrow="ALWAYS" maxWidth="1.7976931348623157E308"/>
+              </columnConstraints>
+              <rowConstraints>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+              </rowConstraints>
+              <children>
+                <Label text="Previous question" wrapText="true"/>
+                <Label fx:id="prevQuestion" maxWidth="1.7976931348623157E308" styleClass="feedbackText" wrapText="true"
+                       GridPane.columnIndex="1"/>
+                <Label text="Previous answer" wrapText="true" GridPane.rowIndex="1"/>
+                <Label fx:id="prevAnswer" maxWidth="1.7976931348623157E308" styleClass="answer, feedbackText"
+                       wrapText="true" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
+                <Label fx:id="correctLabel" text="Correct answer" wrapText="true" GridPane.rowIndex="2"/>
+                <Label fx:id="correctAnswer" maxWidth="1.7976931348623157E308" styleClass="feedbackText" wrapText="true"
+                       GridPane.columnIndex="1" GridPane.rowIndex="2"/>
+              </children>
+            </GridPane>
+          </children>
+        </HBox>
+      </children>
+      <BorderPane.margin>
+        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+      </BorderPane.margin>
+    </VBox>
+  </center>
+  <bottom>
+    <VBox alignment="CENTER" BorderPane.alignment="CENTER">
+      <children>
+        <Separator prefWidth="200.0"/>
+        <Label fx:id="progressLabel" alignment="CENTER" contentDisplay="TOP" maxWidth="1.7976931348623157E308"
+               text="1/40"/>
+        <ProgressBar fx:id="progress" maxWidth="1.7976931348623157E308" progress="0.0"/>
+      </children>
+      <BorderPane.margin>
+        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+      </BorderPane.margin>
+    </VBox>
+  </bottom>
+  <right>
+    <VBox alignment="TOP_RIGHT" spacing="10.0" BorderPane.alignment="CENTER">
+      <children>
+        <Button defaultButton="true" focusTraversable="false" onAction="#onNextAction" prefWidth="110.0" text="_Next"/>
+        <Button fx:id="skipButton" cancelButton="true" focusTraversable="false" onAction="#onSkipAction"
+                prefWidth="110.0" text="_Skip question"/>
+        <Button cancelButton="true" focusTraversable="false" layoutX="10.0" layoutY="48.0" onAction="#onEndAction"
+                prefWidth="110.0" text="_End test"/>
+      </children>
+      <BorderPane.margin>
+        <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
+      </BorderPane.margin>
+    </VBox>
+  </right>
 </BorderPane>