Adding concept of layouts.
Merge branch 'layouts'