fix date pick button bugs, still left one bug