Samples cleanup
New Layout smaples added