updated with fix for issues when tap and drag out of button