Form refactoring.
merged development