Fixed swapButtons() initial state so buttons swap