Updated layouts to use widget mapping.
Added support for layouts in content views.