Updaeted preferes and switches
Cleanup
Merge pull request #238 from breach/cross-origin

Review: Updaeted preferes and switches