CAP-134
Fix Hide/Show Date Picker Functionality