diff --git a/src/main/resources/es/kauron/jstudy/view/table.fxml b/src/main/resources/es/kauron/jstudy/view/table.fxml
index 93baded..d6b40ca 100644
--- a/src/main/resources/es/kauron/jstudy/view/table.fxml
+++ b/src/main/resources/es/kauron/jstudy/view/table.fxml
@@ -11,12 +11,7 @@
       <children>
         <TextField fx:id="newQuestionField" promptText="Question" HBox.hgrow="ALWAYS" />
         <TextField fx:id="newAnswerField" promptText="Answer" HBox.hgrow="ALWAYS" />
-        <Button fx:id="addButton" defaultButton="true" maxWidth="1.7976931348623157E308" onAction="#onAddAction" prefWidth="105.0" text="_Add new" HBox.hgrow="SOMETIMES">
-          <tooltip>
-            <Tooltip text="Add a new entry to the table" />
-          </tooltip>
-        </Button>
-        <Button onAction="#onCancelAction" cancelButton="true" >
+        <Button cancelButton="true" onAction="#onCancelAction">
           <graphic>
             <ImageView fitHeight="10.0" preserveRatio="true">
               <Image url="@../img/Delete.png" />
@@ -26,8 +21,14 @@
             <Tooltip text="Clear question and answer fields, and cancel edit" />
           </tooltip>
         </Button>
+        <Button fx:id="addButton" defaultButton="true" maxWidth="1.7976931348623157E308" onAction="#onAddAction" text="_Add new" HBox.hgrow="SOMETIMES">
+          <tooltip>
+            <Tooltip text="Add a new entry to the table" />
+          </tooltip>
+        </Button>
+        <Separator orientation="VERTICAL" />
         <TextField fx:id="searchField" maxWidth="1.7976931348623157E308" promptText="Search..." HBox.hgrow="ALWAYS" />
-        <Button onAction="#onTestAction" prefWidth="105.0" text="_Test all">
+        <Button onAction="#onTestAction" text="Start _test">
           <tooltip>
             <Tooltip text="Begin a test for the whole table" />
           </tooltip>