Fixed modify button nor firing and added user feedback