Improved text & action for Edit and Cancel buttons