cleaned up widgets