Save/Restore window geometry added