added widgets, fixed small bugs