Minor factory form revamp, make checkbox toggles work for factory
produced trigger