Cleanup

Cleanup of home widget and checkin before cleanup of grid widget