logger removed
UI udpate
Merge origin/master