Refactoring to use a Question fragment instead of a Chapter Fragment made because the question flow is solved (in theory).