stock page refactor