some ui changes
ui fix
Merge remote-tracking branch 'origin/master'