diff --git a/data/Labcontrol.conf b/data/Labcontrol.conf
index bf54f48..9561019 100755
--- a/data/Labcontrol.conf
+++ b/data/Labcontrol.conf
@@ -1,11 +1,33 @@
[General]
-# The user names of all users which shall be able to conduct administrative tasks with Labcontrol
-admin_users="UserA|UserB|UserC"
-# The browser in which ORSEE shall be displayed
-browser_command=/usr/bin/firefox
+### Server settings
+# The IP of the server running zTree
+server_ip=192.168.1.200
+# Network broadcast address
+network_broadcast_address=192.168.1.255
+# The port which shall be used by zTree by default
+initial_port=8000
# The port the client help server shall listen on
client_help_server_port=XXXX
-# Client settings
+# User names of all users which shall be able to conduct administrative tasks with Labcontrol
+admin_users="UserA|UserB|UserC"
+# The public keys to access the clients as root
+pkey_path_root=/usr/local/share/labcontrol/id_labclient_root
+# The public keys to access the clients as unprivileged user
+pkey_path_user=/usr/local/share/labcontrol/id_labclient_dsa
+# The default name for locally started zLeaves
+local_zLeaf_name=local
+# Default dimension for locally started zLeaves
+local_zLeaf_size=1280x1024
+# If multiple receipts are availabe, this indicates, which one will be shown by default (the index counting from 0 following an alphabetical ordering)
+default_receipt_index=0
+# The URL address of your lab's ORSEE
+orsee_url=http://yourORSEEserver.tld
+# URLs to available webcams
+webcams="http://user:pass@webcam_left|http://user:pass@webcam_right"
+# Display names for the webcams
+webcam_names="Webcam right|Webcam left"
+
+### Client settings
# The client settings are represented as an array. So the info of the first client stands in the first field in every section and the same is valid for the other clients with other indices each.
client_ips=192.168.1.1|192.168.1.2|192.168.1.3|192.168.1.4|192.168.1.5|192.168.1.6|192.168.1.7|192.168.1.8|192.168.1.9|192.168.1.10|192.168.1.11|192.168.1.12|192.168.1.13|192.168.1.14|192.168.1.15|192.168.1.16|192.168.1.17|192.168.1.18|192.168.1.19|192.168.1.20|192.168.1.21|192.168.1.22|192.168.1.23|192.168.1.24
client_macs=00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00|00:00:00:00:00:00
@@ -16,50 +38,55 @@ client_quantity=24
# The following two coordinates specify where the client will be shown in the coordinate grid at the bottom of the Labcontrol screen
client_xpos=1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24
client_ypos=1|1|1|1|1|1|1|1|1|1|1|1|1|1|1|1|1|1|1|1|1|1|1|1
-# If multiple receipts are availabe, this indicates, which one will be shown by default (the index counting from 0 following an alphabetical ordering)
-default_receipt_index=0
-dvips_command=/usr/bin/dvips
-file_manager=/usr/bin/dolphin
-# The port which shall be used by zTree by default
-initial_port=8000
+# The name of the user of the clients which is used to conduct experiments
+user_name_on_clients=user
+
+[Binary paths]
+# Path to your lpr binary
+lpr_command=/usr/bin/lpr
+# Path to your netstat binary
+netstat_command=/bin/netstat
# The command used to kill 'zleaf.exe' instances (part of the 'psmisc' package)
killall_command=/usr/bin/killall
# Where all Labcontrol data got installed
labcontrol_installation_directory=/usr/local/share/labcontrol
+# Path to your latex binary
latex_command=/usr/bin/latex
-# The default name for locally started zLeaves
-local_zLeaf_name=local
-local_zLeaf_size=1280x1024
-lpr_command=/usr/bin/lpr
-netstat_command=/bin/netstat
-network_broadcast_address=192.168.1.255
-# The URL address of your lab's ORSEE
-orsee_url=http://yourORSEEserver.tld
+# Path to your dvips binary
+dvips_command=/usr/bin/dvips
+# Path to your filemanager binary
+file_manager=/usr/bin/dolphin
+# Path to your ping binary
ping_command=/bin/ping
-# The public keys to access the clients
-pkey_path_root=/usr/local/share/labcontrol/id_labclient_root
-pkey_path_user=/usr/local/share/labcontrol/id_labclient_dsa
+# Path to PDF/Postscript viewer binary
postscript_viewer=/usr/bin/okular
+# Path to ps2pdf binary
ps2pdf_command=/usr/bin/ps2pdf
+# Path to rm binary
rm_command=/bin/rm
+# Path to SCP binary
scp_command=/usr/bin/scp
-# The IP of the server running zTree
-server_ip=192.168.1.200
+# The browser in which ORSEE shall be displayed
+browser_command=/usr/bin/firefox
+# Path to wmctrl binary
ssh_command=/usr/bin/ssh
+# Path to taskset binary
taskset_command=/usr/bin/taskset
-terminal_emulator_command=/usr/bin/konsole
-# The name of the user of the clients which is used to conduct experiments
-user_name_on_clients=user
+# Path to terminal-emulator binary
+terminal_emulator_command=/usr/bin/gnome-terminal
+# Path to wine binary
+wine_command=/usr/bin/wine
+# Path to wmctrl binary
+wmctrl_command=/usr/bin/wmctrl
+# Path to xset binary
+xset_command=/usr/bin/xset
+# Path to VNC viewer binary
vnc_viewer=/usr/bin/vinagre
+# Path to wakeonlan binary
wakeonlan_command=/usr/bin/wakeonlan
# The program used to view the laboratory's webcams
webcam_command=/usr/local/bin/WebcamDisplay
-# URLs to available webcams
-webcams="webcam_left|webcam_right"
-wine_command=/usr/bin/wine
-wmctrl_command=/usr/bin/wmctrl
-xset_command=/usr/bin/xset
# The folder were all zTree versions are installed (in subfolders matching the scheme zTree_X.Y.Z)
ztree_installation_directory=/opt/z-Leaves
-# Script to be called after session crash
-restart_crashed_session_script=/home/scripts/start_zTree_after_crash.sh
\ No newline at end of file
+# Script to be called after session crash
+restart_crashed_session_script=/home/scripts/start_zTree_after_crash.sh
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 6be33ee..7ab21e1 100755
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -64,7 +64,7 @@
- 2
+ 0
true