Move Storage swap option to General tab