Improve flick charm widget
Try and fix touch scrolling
Merge branch 'flick'