Fix Form refactor