Improve download buttons some more