Refactor pages product v0.2