refine build process, split wrapper from infinite scroll