More changes to clickDownloadButton()