Manualpicker main checkbox & next button sync fixes
Refactored stepperfactory into separate file