Changed the way the swap button is implemented. Much more "readable" now.