UI improvements and cursor closing problem is fixed.
Merge remote-tracking branch 'origin/master'