Refactoring view to create a matching question