Feature/pop off on drag right