Fix for download not happening

Update element class names to new ones
Minor modification due to URL structure changes

If you have some way to test this out thoroughly, please do so before merging.