Revert "Revert "Four settings in market""

This reverts commit 99b2b6fcec46c26c0bd11bfa6bad876caaf6f896.
Clean up