Some small fixes for swipe behaviour & stuff.