Changed to use widget-templates