TimePicker added + refactor