-diff --git a/src/clients/disk_worker.ycp b/src/clients/disk_worker.ycp
-index c6d8c35..4fe7e9c 100644
---- a/src/clients/disk_worker.ycp
-+++ b/src/clients/disk_worker.ycp
-@@ -62,20 +62,9 @@
- 
-     boolean Dummy() { return true; }
- 
--
--    boolean StorageCmdline(map<string, string> options)
--    {
--	boolean disks = true;
--	boolean partitions = true;
--
--	if (!isempty(options))
--	{
--	    disks = haskey(options, "disks");
--	    partitions = haskey(options, "partitions");
--	}
--
--	list<symbol> fields = [ `device, `size, `fs_type, `mount_point, `label, `model ];
--
-+// we need global functions as Predicate used it to pass options
-+    boolean partitions = true;
-+    boolean disks = true;
- 	symbol Predicate(map disk, map partition)
- 	{
- 	    list<symbol> returns = [ `tmpfs, `nfs, `nfs4, `unknown ];
-@@ -101,6 +90,21 @@
- 	    }
- 	}
- 
-+
-+
-+    boolean StorageCmdline(map<string, string> options)
-+    {
-+	disks = true;
-+	partitions = true;
-+
-+	if (!isempty(options))
-+	{
-+	    disks = haskey(options, "disks");
-+	    partitions = haskey(options, "partitions");
-+	}
-+
-+	list<symbol> fields = [ `device, `size, `fs_type, `mount_point, `label, `model ];
-+
- 	map<string, map> target_map = Storage::GetTargetMap();
- 
- 	term header = StorageFields::TableHeader(fields);
 diff --git a/src/include/partitioning/auto_part_create.ycp b/src/include/partitioning/auto_part_create.ycp
 index a2a68e6..7e81d58 100644
 --- a/src/include/partitioning/auto_part_create.ycp

 void EpEditBtrfsDevice(string device)
     {
     if (device == nil)
@@ -116,23 +121,13 @@ boolean RemoveVols(string device, list<string> devs)
     return ret;
     }
 
-void EpResizeBtrfsDevice(string device)
-    {
-    if (device == nil)
-	{
-	// error popup
-	Popup::Error(_("No Btrfs device selected."));
-	return;
-	}
-
-    map<string, map> target_map = Storage::GetTargetMap();
-    map<string, any> data = Storage::GetPartition(target_map, device);
-    y2milestone( "EpResizeBtrfsDevice device:%1 data:%2", device, data );
+map<string, any> data_ep_resize = nil;
+string device_ep_resize = "";
 
-    symbol Commit()
+    symbol CommitEpResize()
 	{
-	list<string> devices_old = MergeDevices(data);
-	list<string> devices_new = data["devices_new"]:[];
+	list<string> devices_old = MergeDevices(data_ep_resize);
+	list<string> devices_new = data_ep_resize["devices_new"]:[];
 
 	list<string> devices_added = AddedToList(devices_old, devices_new);
 	list<string> devices_removed = RemovedFromList(devices_old, devices_new);
@@ -144,14 +139,14 @@ void EpResizeBtrfsDevice(string device)
 
 	if( size(devices_added) > 0 || size(devices_removed) > 0)
 	    {
-	    AddVols(device, devices_added);
+	    AddVols(device_ep_resize, devices_added);
 
-	    if (!RemoveVols(device, devices_removed))
+	    if (!RemoveVols(device_ep_resize, devices_removed))
 		{
 		// error popup
 		Popup::Error(_("Failed to remove some physical devices."));
 
-		// TODO: update data
+		// TODO: update data_ep_resize
 
 		return `back;
 		}
@@ -160,7 +155,22 @@ void EpResizeBtrfsDevice(string device)
 	return `finish;
 	}
 
-    if( DlgResizeBtrfsVolume(data, Commit))
+
+void EpResizeBtrfsDevice(string device)
+    {
+    if (device == nil)
+	{
+	// error popup
+	Popup::Error(_("No Btrfs device selected."));
+	return;
+	}
+    device_ep_resize = device;
+
+    map<string, map> target_map = Storage::GetTargetMap();
+    data_ep_resize = Storage::GetPartition(target_map, device);
+    y2milestone( "EpResizeBtrfsDevice device:%1 data_ep_resize:%2", device, data_ep_resize );
+
+    if( DlgResizeBtrfsVolume(data_ep_resize, CommitEpResize))
 	{
 	UpdateMainStatus();
 	UpdateNavigationTree(nil);
diff --git a/src/include/partitioning/ep-dialogs.ycp b/src/include/partitioning/ep-dialogs.ycp
index 23f250d..09e1521 100644
--- a/src/include/partitioning/ep-dialogs.ycp
+++ b/src/include/partitioning/ep-dialogs.ycp
@@ -30,6 +30,16 @@

 
 		if (Storage::GetPartMode() == "NORMAL")
diff --git a/src/include/partitioning/ep-nfs.ycp b/src/include/partitioning/ep-nfs.ycp
index d0c0d9b..2659e21 100644
--- a/src/include/partitioning/ep-nfs.ycp
+++ b/src/include/partitioning/ep-nfs.ycp
@@ -207,20 +207,14 @@
 	    switch (Event::IsWidgetActivated(event))
 	    {
 	        case `newbut:
