Changed widget_boilerplate_fns to widget_fns, removed now unnecessary  macro