add date picker
fix index
merge vxst's commit