More changes regarding adding the button.