removed scratch, fixed some widgets