Registration form update

Recreate registration form for new structure.