Fix a few more bugs and replace mouse enter and exit features