Rename fieldsets
Introduce modal form validation handlers