diff --git a/src/atoms/File.js b/src/atoms/File.js
index 50f453aa3109793fd862f237a326e873a6239cd0..810a5561ee8d0179394a715c72cdcdc55774707a 100644
--- a/src/atoms/File.js
+++ b/src/atoms/File.js
@@ -11,7 +11,11 @@ const File = ({ value, file, error, progress }) => (
       </div>
     </div>
 
-    <div className={classes.name}>{value.name}</div>
+    <div className={classes.name}>
+      <a href={value.url}>
+        {value.name}
+      </a>
+    </div>
   </div>
 )
 
diff --git a/src/molecules/Files.js b/src/molecules/Files.js
index e24229ef4395100e2f76508e6f53f5e4d780c4bd..c2590eb7faf7b527ccff2c822538f8e244fd6b9e 100644
--- a/src/molecules/Files.js
+++ b/src/molecules/Files.js
@@ -57,6 +57,7 @@ class Files extends React.Component {
         <div className={classes.files}>
           {uploads && uploads.map(upload => (
             <Upload
+              key={upload.file.name}
               file={upload.file}
               request={upload.request}/>
           ))}
diff --git a/src/molecules/Upload.js b/src/molecules/Upload.js
index 333e995d86e77bb76214b78686b95e513ca3b9f4..a5c0d08ecdbdcbe8d1ae656ce4349385f115fd87 100644
--- a/src/molecules/Upload.js
+++ b/src/molecules/Upload.js
@@ -31,8 +31,6 @@ class Upload extends React.Component {
       this.setState({
         progress: 1
       })
-
-      this.props.onComplete() // TODO: pass info?
     } else {
       this.setState({
         error: 'There was an error'