fixed some description and layout.
Merge remote-tracking branch 'duty/master'