Revert "[Shop Grid] - Filter moved to the outside"

This reverts commit acdf2989e8311a6e45e7e6d4c343436db67b10c0.
Revert "Revert "[Shop Grid] - Filter moved to the outside""

This reverts commit 5fc862bc85c8ea6652ea59699c7e53de0facd765.
ARF github