Fix an issue when mouse leaves from canvas
Minor changes for slightly performance improvement
Expand element size
Merge branch 'develop'