Improved mouse coordinates - still needs work