Redesign mouse handling (incomplete)