added fixes from Paully for swiping animation bugs