- Moved mouseover window checking to state check
- Reverted mouse buttons to previous code