Fixed issue: Cleanup up widgets class