More updates of the ongoing shop integration

More updates of the ongoing shop integration