Updated shop and cart