Fix inconsistency width of date/time picker
Refactor code
Change done text on time picker