modify assist area method from click to hover
Merge branch 'toolbar' into dev