Added generic button logic and changed address field.