Changed saving and canceling to be bound values