Minor changes of UI .  Codes clean up.
Merge remote-tracking branch 'origin/master'