Updates to form creator