Fixing mouse issues - WIP