Results page refactor