layout setting and display
Merge pull request #1 from CarrieSong/master

layout setting and display