fixed cancel button save issues