Bugfix

Fixed flickering when returning to app
Removed fling for now