Refactored and added TimePicker