Added datepicker
Fixed CS