Fix storage and datepicker