Rework widget to fix datepicker issues