Replaced custom template with web component based template