clean code
Merge origin/master
UI labels fix