Form refactoring and user flow