Began working adding support for extended layout templates.