Feat/question - additional refinement for question page