add target_saving_deadline and fix history layout