Added cancel and save buttons