Small changes to cancel, modify and view