Changed monitor widgets to new structure