Issue1701

redirect both download all and download buttons to the download function and then call download_zip if the download_zip button was clicked.

also fixed that annotations were not being downloaded for single file downloads
Indentation