Added event to swapping button and made text neater.