Date picker position
Merge Fix