Adding support for alternative layout templating