form refactor
merged question add, question update model; merged 2 form