Layout
Merge pull request #2 from thanhsm/layout

Layout