Added conditionals to download display