Layout tweaks
Using variables instead of disable actions
Fixed bug with spaces in folder names