Time bug fixed and save button added