More tweaks to itemTpl