Add Handlebars Layout possibility

Rebase onto master of #1285