new UI classes was added
Merge branch 'origin/master'