delivery popup msg and calendar bug fix