Fixed template issue, now row has its spanX child
Merge pull request #491 from macno/master

template fix