Tiny fixes + swipe movement