Revert back some of the mouse code
Merge pull request #57 from Jonty800/master

Revert back some of the mouse code