Few patches for the notifications
Integrate previous patch for the schedule display