Added scope into Question
Updated template
Updated partials