Latest changes from class, widget areas.