Update add question screen to separate data into two fieldsets