edit widgets, cleanup