Addressed feeback comments
Attempt to fix the calendar intermittent by improving the flick action