Added demos for widget, made small template improvement