Refactor pages product v0.1