Multiple layout and sample fixes
5 files changed