completed first layout
Merge branch 'layout' into staging