fix template and widgets for #426