Added X button for address change