#188 Improved switch animation