Survey page refactor