(GFW-352) Adjusted date pickers