Improve UI
add cursor healing
merge