improve UI, bigfix for end chat
Merge remote-tracking branch 'origin/master'