Further work on Multiple Layouts sample