Adding and Removing questions and choices
updated to karim last commit