cleaning up and finishing widget changes