Modified QuestionActivity view
Merge