diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/NewJobView.css b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/NewJobView.css
new file mode 100644
index 0000000000000000000000000000000000000000..65d090c4224334c3948f7fa8749306f4dbf5fc8d
--- /dev/null
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/NewJobView.css
@@ -0,0 +1,4 @@
+{
+	-fx-padding: 3 3 3 3;
+	
+}
\ No newline at end of file
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/NewJobView.fxml b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/NewJobView.fxml
index 1414697d686982eeb0d314423b947814f072a984..6c68c44d47867bbfea76622e1a7f68cfc9a1f84b 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/NewJobView.fxml
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/NewJobView.fxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.RadioButton?>
 <?import javafx.scene.control.TextField?>
@@ -12,64 +12,46 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-
-
 <fx:root maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" type="BorderPane" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1">
    <center>
       <VBox BorderPane.alignment="CENTER">
          <children>
-            <TitledPane animated="false" collapsible="false" text="Input data">
+            <TitledPane animated="false" collapsible="false" text="Input">
                <content>
                   <AnchorPane>
                      <children>
                         <VBox>
                            <children>
-                              <CheckBox mnemonicParsing="false" text="Use own data" />
-                              <TitledPane animated="false" collapsible="false" text="Directory">
-                                <content>
-                                  <AnchorPane minHeight="0.0" minWidth="0.0">
+                              <RadioButton mnemonicParsing="false" selected="true">
+                                 <toggleGroup>
+                                    <ToggleGroup fx:id="Group" />
+                                 </toggleGroup>
+                                 <graphic>
+                                    <Label maxHeight="1.7976931348623157E308" text="Demonstration data" />
+                                 </graphic>
+                              </RadioButton>
+                              <RadioButton maxHeight="1.7976931348623157E308" mnemonicParsing="false" toggleGroup="$Group">
+                                 <graphic>
+                                    <Label maxHeight="1.7976931348623157E308" text="Working directory" />
+                                 </graphic>
+                              </RadioButton>
+                              <RadioButton mnemonicParsing="false" toggleGroup="$Group">
+                                 <graphic>
+                                    <HBox>
                                        <children>
-                                          <VBox>
-                                             <children>
-                                                <HBox>
-                                                   <children>
-                                                      <RadioButton maxHeight="1.7976931348623157E308" mnemonicParsing="false" selected="true">
-                                                         <toggleGroup>
-                                                            <ToggleGroup fx:id="Group" />
-                                                         </toggleGroup>
-                                                         <graphic>
-                                                            <Label maxHeight="1.7976931348623157E308" text="Working" />
-                                                         </graphic>
-                                                      </RadioButton>
-                                                   </children>
-                                                </HBox>
-                                                <HBox>
-                                                   <children>
-                                                      <RadioButton mnemonicParsing="false">
-                                                         <graphic>
-                                                            <HBox>
-                                                               <children>
-                                                                  <TextField />
-                                                                  <Button mnemonicParsing="false" text="Select" />
-                                                               </children>
-                                                            </HBox>
-                                                         </graphic>
-                                                      </RadioButton>
-                                                   </children>
-                                                </HBox>
-                                             </children>
-                                          </VBox>
+                                          <TextField />
+                                          <Button mnemonicParsing="false" text="Select" />
                                        </children>
-                                    </AnchorPane>
-                                </content>
-                              </TitledPane>
+                                    </HBox>
+                                 </graphic>
+                              </RadioButton>
                            </children>
                         </VBox>
                      </children>
                   </AnchorPane>
                </content>
             </TitledPane>
-            <TitledPane animated="false" collapsible="false" text="Output directory">
+            <TitledPane animated="false" collapsible="false" text="Output">
                <content>
                   <AnchorPane minHeight="0.0" minWidth="0.0">
                      <children>
@@ -82,14 +64,14 @@
                                           <ToggleGroup fx:id="Group1" />
                                        </toggleGroup>
                                        <graphic>
-                                          <Label maxHeight="1.7976931348623157E308" text="Working" />
+                                          <Label maxHeight="1.7976931348623157E308" text="Working directory" />
                                        </graphic>
                                     </RadioButton>
                                  </children>
                               </HBox>
                               <HBox>
                                  <children>
-                                    <RadioButton mnemonicParsing="false">
+                                    <RadioButton mnemonicParsing="false" toggleGroup="$Group1">
                                        <graphic>
                                           <HBox>
                                              <children>
@@ -113,8 +95,11 @@
    <bottom>
       <BorderPane BorderPane.alignment="CENTER">
          <right>
-            <Button mnemonicParsing="false" text="Start" BorderPane.alignment="CENTER" />
+            <Button mnemonicParsing="false" prefHeight="22.0" prefWidth="71.0" text="Start" BorderPane.alignment="CENTER">
+               <BorderPane.margin>
+                  <Insets right="3.0" />
+               </BorderPane.margin></Button>
          </right>
       </BorderPane>
    </bottom>
-</fx:root>
\ No newline at end of file
+</fx:root>