diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java
index 96bf4e07043f94b1430f9352816b9a555187d289..bc58039c73e125e91dbb60e437db539b6b267280 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMControl.java
@@ -187,11 +187,12 @@ public class BenchmarkSPIMControl extends BorderPane implements CloseableControl
 						@Override
 						public void run() {
 							Alert al = new Alert(AlertType.CONFIRMATION,
-									"Main file \"" + CONFIG_YAML + "\" found in input directory \""
+									"The file \"" + CONFIG_YAML + "\" found in the defined data input directory \""
 											+ job.getInputDirectory()
-											+ "\". Would you like to copy it into job subdirectory \""
+											+ "\". Would you like to copy it into the job working directory \""
 											+ job.getDirectory() + "\"?",
 									ButtonType.YES, ButtonType.NO);
+					
 							al.setHeaderText(null);
 							al.setTitle("Copy " + CONFIG_YAML + "?");
 							al.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
diff --git a/haas-spim-benchmark/src/main/resources/cz/it4i/fiji/haas_spim_benchmark/ui/NewJobView.fxml b/haas-spim-benchmark/src/main/resources/cz/it4i/fiji/haas_spim_benchmark/ui/NewJobView.fxml
index 344e6488da521cba151f50e777b62333b2890d88..c111184733fda0fd5c56233790f8fcb6f9980516 100644
--- a/haas-spim-benchmark/src/main/resources/cz/it4i/fiji/haas_spim_benchmark/ui/NewJobView.fxml
+++ b/haas-spim-benchmark/src/main/resources/cz/it4i/fiji/haas_spim_benchmark/ui/NewJobView.fxml
@@ -7,6 +7,7 @@
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.control.TitledPane?>
 <?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
@@ -16,7 +17,7 @@
    <center>
       <VBox BorderPane.alignment="CENTER">
          <children>
-            <TitledPane animated="false" collapsible="false" text="Input">
+            <TitledPane animated="false" collapsible="false" text="Input data location">
                <content>
                   <AnchorPane>
                      <children>
@@ -27,13 +28,19 @@
                                     <ToggleGroup fx:id="tg_inputDataLocation" />
                                  </toggleGroup>
                                  <graphic>
-                                    <Label maxHeight="1.7976931348623157E308" text="Demonstration data on IT4I cluster" />
+                                    <Label maxHeight="1.7976931348623157E308" text="Demonstration data on the Salomon IT4I cluster" />
                                  </graphic>
+                                 <tooltip>
+                                    <Tooltip text="Demonstration data located on the Salomon IT4I cluster will be used and there will be created config.yaml in the job working directory." />
+                                 </tooltip>
                               </RadioButton>
                               <RadioButton maxHeight="1.7976931348623157E308" mnemonicParsing="false" toggleGroup="$tg_inputDataLocation">
                                  <graphic>
-                                    <Label maxHeight="1.7976931348623157E308" text="Job subdirectory" />
+                                    <Label maxHeight="1.7976931348623157E308" text="Job working directory" />
                                  </graphic>
+                                 <tooltip>
+                                    <Tooltip text="Job working directory will be used as location for input data. Data and config.yaml will be needed to copy into it." />
+                                 </tooltip>
                               </RadioButton>
                               <RadioButton fx:id="rb_ownInput" mnemonicParsing="false" toggleGroup="$tg_inputDataLocation">
                                  <graphic>
@@ -44,6 +51,9 @@
                                        </children>
                                     </HBox>
                                  </graphic>
+                                 <tooltip>
+                                    <Tooltip text="External directory will be used as location for the input data. The file config.yaml could be automaticaly copied from the directory into the job working directory." />
+                                 </tooltip>
                               </RadioButton>
                            </children>
                         </VBox>
@@ -51,7 +61,7 @@
                   </AnchorPane>
                </content>
             </TitledPane>
-            <TitledPane animated="false" collapsible="false" text="Output">
+            <TitledPane animated="false" collapsible="false" text="Output data location">
                <content>
                   <AnchorPane minHeight="0.0" minWidth="0.0">
                      <children>
@@ -64,7 +74,7 @@
                                           <ToggleGroup fx:id="tg_outputDataLocation" />
                                        </toggleGroup>
                                        <graphic>
-                                          <Label maxHeight="1.7976931348623157E308" text="Job subdirectory" />
+                                          <Label maxHeight="1.7976931348623157E308" text="Job working directory" />
                                        </graphic>
                                     </RadioButton>
                                  </children>