Improve modify button action