diff --git a/fhem/contrib/YAF/FHEM/YAF/www/yaf.htm b/fhem/contrib/YAF/FHEM/YAF/www/yaf.htm
index 1b9df4c42..edc725fc7 100755
--- a/fhem/contrib/YAF/FHEM/YAF/www/yaf.htm
+++ b/fhem/contrib/YAF/FHEM/YAF/www/yaf.htm
@@ -104,6 +104,9 @@
 	        	<div class="menue_block">
 	            	<button id="button_back" class="menue_button">Zu FHEM</button>
 	            </div>
+				<div class="menue_block">
+		            <button id="button_saveconfig" class="menue_button">Config speichern</button>
+	            </div>				
 	            <div class="menue_block">
 	            	<button id="button_settings" class="menue_button">Einstellungen</button>
 	            </div>
@@ -119,9 +122,6 @@
 		                <input type="radio" id="button_switchmode_0" name="radio" checked="checked"/><label for="button_switchmode_0" style="width: 118px;">Live</label>
 		                <input type="radio" id="button_switchmode_1" name="radio"/><label for="button_switchmode_1" style="width: 118px;">Bearbeiten</label>
 		            </div>
-	            </div>
-				<div class="menue_block">
-		            <button id="button_saveconfig" class="menue_button">Config speichern</button>
 	            </div>
 	        </div>
 	        <div id="content">
@@ -178,6 +178,7 @@
 	    <div id="dialog_editwidget" title="Widget bearbeiten">
 	    	<div class="loading_animation" id="dialog_editwidget_loading"></div>
 	    	<p>Widget "<span><b id="label_editwidget"></b></span>" bearbeiten:</p>
+			<div id="dialog_editwidget_setup_form" />
 		</div>
 		
 	    <div id="dialog_deletewidget" title="Widget löschen">
diff --git a/fhem/contrib/YAF/controls_yaf.txt b/fhem/contrib/YAF/controls_yaf.txt
index 91efa0ff7..03a0fd133 100644
--- a/fhem/contrib/YAF/controls_yaf.txt
+++ b/fhem/contrib/YAF/controls_yaf.txt
@@ -29,7 +29,7 @@ UPD 2013-05-15_20:00:00 19226 FHEM/YAF/www/img/background.png
 UPD 2013-05-15_20:00:00 831 FHEM/YAF/www/img/lamp_on.png
 UPD 2013-08-01_11:10:00 12433 FHEM/YAF/www/js/yaf-basics.js
 UPD 2013-07-31_15:30:00 10727 FHEM/YAF/www/js/yaf-dialogs.js
-UPD 2013-08-01_11:10:00 7547 FHEM/YAF/www/yaf.htm
+UPD 2013-08-02_22:15:00 7596 FHEM/YAF/www/yaf.htm
 UPD 2013-05-15_20:00:00 3433 FHEM/YAF/www/js/combobox.js
 UPD 2013-05-15_20:00:00 4593 FHEM/YAF/www/js/jquery.ui.touch-punch.min.js
 UPD 2013-05-15_20:00:00 237176 FHEM/YAF/www/js/jquery-ui-1.9.1.custom.min.js