diff --git a/.gitignore b/.gitignore
index bfc26078..97424a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,8 @@
 /log
 /sessions
 /www
-script/cachedir
 script/Lib
-script/*.class
-script/*.pyc
+script/**/cachedir
+script/**/*.class
+script/**/*.pyc
 plugins/*.class
diff --git a/config/config.properties b/config/config.properties
index b6b35d53..dc8a028d 100644
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,4 +1,4 @@
-#Wed Jul 15 17:55:13 CEST 2015
+#Tue Jul 28 15:04:14 CEST 2015
 autoSaveScanData=true
 createSessionFiles=false
 dataFile={data}/{year}_{month}/{date}/{date}_{time}_{context}
@@ -20,6 +20,8 @@ simulation=false
 tasksFile={config}/tasks.properties
 terminalEnabled=true
 terminalPort=3579
+userAuthenticator=
+userManagement=false
 versionTrackingEnabled=true
 versionTrackingLogin={context}/agkey
 versionTrackingRemote=ssh\://git@github.psi.ch\:7999/psd/x03da.git
diff --git a/plugins/PhotonEnergy.form b/plugins/PhotonEnergy.form
index 859c3a17..59de2629 100644
--- a/plugins/PhotonEnergy.form
+++ b/plugins/PhotonEnergy.form
@@ -67,7 +67,7 @@
                       <Component id="radioCfs" max="32767" attributes="0"/>
                       <Group type="102" alignment="1" attributes="0">
                           <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
-                          <EmptySpace type="unrelated" max="32767" attributes="0"/>
+                          <EmptySpace type="unrelated" pref="90" max="32767" attributes="0"/>
                           <Component id="spinnerStart" linkSize="8" min="-2" max="-2" attributes="0"/>
                       </Group>
                       <Group type="102" attributes="0">
@@ -520,7 +520,7 @@
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
                       <Component id="buttonStart" max="32767" attributes="0"/>
-                      <Component id="buttonAbort" pref="203" max="32767" attributes="0"/>
+                      <Component id="buttonAbort" pref="241" max="32767" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
               </Group>