updated question controller. updated layouts