Refactor Shop views