[form] [controls/scripts] tested first cut and fixed some issues