Add Time Picker
change buttons
new changes