Added widgets to the logic