Tightened up some animations, fixed a swipe/scanning bug