Download button + minor fixes