fixed calendar, added date pop-up