Merge pull request #9 from CodeHardDevelopers/layout-implementation

Layout implementation
Merge pull request #10 from CodeHardDevelopers/hot-fix-merge-conflit

Merge pull request #9 from CodeHardDevelopers/layout-implementation