Drag correctly when height expanded
Merge branch 'drag' into kubas