Updated basic templates and widgets to be error-aware