Ui improvement
Merge origin/master