Swap!
Minor bug fixes and UI improvement