diff --git a/app/fileManager.js b/app/fileManager.js
index 63043cc3..b43a91ca 100644
--- a/app/fileManager.js
+++ b/app/fileManager.js
@@ -233,11 +233,7 @@ export default function(state, emitter) {
       await dl;
       const time = Date.now() - start;
       const speed = size / (time / 1000);
-      if (document.querySelector('.page')) {
-        await delay(1000);
-      }
       state.storage.totalDownloads += 1;
-      state.transfer.reset();
       metrics.completedDownload({ size, time, speed });
     } catch (err) {
       if (err.message === '0') {
diff --git a/app/ui/download.js b/app/ui/download.js
index 73f1563e..9168aa21 100644
--- a/app/ui/download.js
+++ b/app/ui/download.js
@@ -7,21 +7,21 @@ function password(state, emit) {
   const fileInfo = state.fileInfo;
   const invalid = fileInfo.password === null;
 
-  const visible = invalid ? 'visible' : 'invisible';
-  const invalidBtn = invalid ? '' : '';
-
   const div = html`
-    <div class="">
+    <div class="h-full flex flex-col items-center justify-center border border-grey-light bg-white">
       <label
-        class="${visible}"
+        id="password-error"
+        class="${invalid ? '' : 'invisible'} text-red"
         for="password-input">
         ${state.translate('passwordTryAgain')}
       </label>
 
-      <form class="" onsubmit=${checkPassword} data-no-csrf>
+      <form class="w-5/6" onsubmit=${checkPassword} data-no-csrf>
         <input id="password-input"
-          class=""
-          maxlength="64"
+          class="w-full border rounded ${
+            invalid ? 'border-red' : 'border-grey'
+          } leading-loose"
+          maxlength="32"
           autocomplete="off"
           placeholder="${state.translate('unlockInputPlaceholder')}"
           oninput=${inputChanged}
@@ -29,7 +29,7 @@ function password(state, emit) {
 
         <input type="submit"
           id="password-btn"
-          class="${invalidBtn}"
+          class="hidden"
           value="${state.translate('unlockInputLabel')}"/>
       </form>
     </div>`;
@@ -39,11 +39,10 @@ function password(state, emit) {
   }
 
   function inputChanged() {
-    //TODO
-    const input = document.querySelector('.passwordForm__error');
-    input.classList.remove('visible');
-    const btn = document.getElementById('password-btn');
-    btn.classList.remove('unlockBtn--error');
+    const label = document.getElementById('password-error');
+    const input = document.getElementById('password-input');
+    label.classList.add('invisible');
+    input.classList.remove('border-red');
   }
 
   function checkPassword(event) {
@@ -87,7 +86,15 @@ module.exports = function(state, emit) {
         content = archiveTile.downloading(state, emit);
         break;
       case 'complete':
-        content = ''; //TODO
+        content = html`
+        <div class="flex flex-col items-center justify-center h-full bg-white border border-grey-light p-2">
+          <h1 class="text-center">${state.translate('downloadFinish')}</h1>
+          <p class="">
+            <a href="/" class="text-blue">${state.translate(
+              'sendYourFilesLink'
+            )}</a>
+          </p>
+        </div>`;
         break;
       default:
         content = archiveTile.preview(state, emit);
@@ -99,7 +106,7 @@ module.exports = function(state, emit) {
   <main class="main container">
     <section class="relative h-full w-full px-6 md:flex md:flex-row">
       <div class="pt-4 md:mr-6 md:pb-4 md:w-1/2">${content}</div>
-      <div class="pt-4 md:w-1/2">${intro(state)}</div>
+      <div class="py-4 md:w-1/2">${intro(state)}</div>
     </section>
   </main>`;
 };
diff --git a/app/ui/intro.js b/app/ui/intro.js
index cb546f0a..21a81a18 100644
--- a/app/ui/intro.js
+++ b/app/ui/intro.js
@@ -3,7 +3,7 @@ const assets = require('../../common/assets');
 
 module.exports = function intro(state) {
   return html`
-  <article class="flex flex-col items-center justify-center bg-white border border-grey-light p-2">
+  <article class="flex flex-col items-center justify-center h-full bg-white border border-grey-light p-2">
     <p class="text-center">
       <div class="font-semibold">${state.translate('uploadPageHeader')}</div>
       <div class="italic">${state.translate('pageHeaderCredits')}</div>