feat(popover): merged in templating as per requests in issue #220