Tweaks to mouse-grab component