Combat datepicker styles and rebuild