#1361 and some datepicker
Signed-off-by:KProvance <kevin.provance@gmail.com>