Some adjustments of scratchpad
Removed some wizards
merge pu