Updated CWorld class. Updated Widget class