Updated layouts for v11
Merge pull request #501 from jaypoulz/jp447

Updated layouts for v11