Merge pull request #27 from programmerr47/layout

Layout
Merge pull request #28 from programmerr47/layout

Layout
Merge pull request #29 from programmerr47/layout

Layout
refresh layout