Improved collisions with mouse