Transition fix + swipe scroll