Moved Swap option to General Preference