add date picker, fix bug