More changes to clickDownloadButton() and downloadFIle()