Design Adjustment in save/restore functionality.