New Entry / Date Picker added
Solved conflict