Renamed NewFillUp to FillUp
Added editDate button with DatePicker.