#588 - enabled cancel and save functionality on the cancel and save buttons.