added controler
fixed names for questions/question