fixed bugs
Merge remote-tracking branch 'origin/master'
fixed UI bugs
Merge remote-tracking branch 'origin/master'