All forms changed to meet the forms dev requirements