Merged revision(s) 36 from trunk:
Try to modify UI from 360daquan. Work in progress.
........