Shopping VC, refactoring + other improvements