Assessment refactoring and question block in answer

See commit messages for specific steps taken
@aboudreault Ok, thanks! To not ask too much of @dragonfi I'll create a task in the backlog to check this in depth and improve it. Merging this PR as the rest of the fixes are good.