Proper fix for misplaced datepicker