code cleaning
added CustomTimePicker