Screen preview code cleanup ; Setup Wizard design changes
Form design changes, misc other design tuning