changes
bug fix date and popup