Well its a little ugly, but the buttons now switch properly