Layout v1
Merge pull request #1 from chris-mendoza/layout-v1

Layout v1