Updated to work when datepicker_use_button is not set