diff --git a/_i18n/en.yml b/_i18n/en.yml
index 0c37f79..40f750c 100644
--- a/_i18n/en.yml
+++ b/_i18n/en.yml
@@ -35,8 +35,17 @@ ipfs_text: 'Upload a file from your device to the Interplanetary File System.  T
 ipfs_button_text: 'Upload'
 ipfs_secondary_cta: 'See what others have uploaded'
 ipfs_image_alt: 'Interplanetary File System logo'
-upload_ui_source_ack: "Upload UI upstream source"
-
+upload:
+  ui_source_ack: "Upload UI upstream source"
+  page_title: Upload files to
+  page_description: 
+  - This Butter Box is part of the Interplanetary File System (IPFS).  You can always upload files to this box and see the files others have uploaded.  Whenever the Butter Box is connected to the Internet, it'll make those files available to people everywhere.
+  - Remember, anyone will be able to see the files you upload here, so don't upload private things.
+  drop_files_here: Drop files here
+  or: or
+  choose_files: Choose Files
+  result: Result
+  upload: Upload
 
 captive:
   welcome_details: |
diff --git a/index.html b/index.html
index b84f90d..74340af 100644
--- a/index.html
+++ b/index.html
@@ -66,11 +66,6 @@ layout: default
           <a class="btn-main uppercase" href="/upload">{% t ipfs_button_text %}</a>
         </div>
       </div>
-      <a href="/view_uploads">
-        <div class="outlink content-expander">
-          <span>{% t ipfs_secondary_cta %}</span>
-        </div>
-      </a>
     </div>
     {% endif %}
   </div>
diff --git a/upload.html b/upload.html
index 5bf3ee7..c741d36 100644
--- a/upload.html
+++ b/upload.html
@@ -10,7 +10,7 @@ layout: empty
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>Upload files to IPFS from Browser</title>
+    <title>{% t upload.page_title %} IPFS</title>
     <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/upload/style.css?v0.1" type='text/css'>
     <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/upload/upload-utilities.css?v0.1" type='text/css'>
     <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/upload/node-menu.css?v0.1" type='text/css'>
@@ -24,15 +24,16 @@ layout: empty
     <div class="b-nav">
         <nav>
             <a href="#" title="home">
-                <h1>Upload files to <img src="{{ site.baseurl }}/assets/images/upload/ipfs.png" style="margin: 0 2px"></h1>
+                <h1>{% t upload.page_title %} <img src="{{ site.baseurl }}/assets/images/upload/ipfs.png" style="margin: 0 2px"></h1>
             </a>
         </nav>
     </div>
     <div id="content">
         <div id="wrapper">
             <div id="top">
-                <p>This Butter Box is part of the Interplanetary File System (IPFS).  You can always upload files to this box and see the files others have uploaded.  Whenever the Butter Box is connected to the Internet, it'll make those files available to people everywhere.</p>
-                <p>Remember, anyone will be able to see the files you upload here, so don't upload private things. </p>
+                {% for item in site.translations[site.lang].upload.page_description %}
+                    <p>{{ item }}</p>
+                {% endfor %}
             </div>
             <div id="hidden-menu">
                 <div class="form">
@@ -161,8 +162,8 @@ layout: empty
                             d="M48.4 26.5c-.9 0-1.7.7-1.7 1.7v11.6h-43.3v-11.6c0-.9-.7-1.7-1.7-1.7s-1.7.7-1.7 1.7v13.2c0 .9.7 1.7 1.7 1.7h46.7c.9 0 1.7-.7 1.7-1.7v-13.2c0-1-.7-1.7-1.7-1.7zm-24.5 6.1c.3.3.8.5 1.2.5.4 0 .9-.2 1.2-.5l10-11.6c.7-.7.7-1.7 0-2.4s-1.7-.7-2.4 0l-7.1 8.3v-25.3c0-.9-.7-1.7-1.7-1.7s-1.7.7-1.7 1.7v25.3l-7.1-8.3c-.7-.7-1.7-.7-2.4 0s-.7 1.7 0 2.4l10 11.6z">
                         </path>
                     </svg>
-                    Drop files here <br> or
-                    <label for='files'>Choose Files &#187;</label>
+                    {% t upload.drop_files_here %} <br> {% t upload.or %}
+                    <label for='files'>{% t upload.choose_files %} &#187;</label>
                     <input type="file" name="files[]" id="files" class="box_file"
                         data-multiple-caption="{count} files selected" multiple="">
                 </div>
@@ -172,13 +173,13 @@ layout: empty
                 </div>
                 <div id="divResponse">
                     <pre id="response">
-                        <spam id="info">Result:</spam>
+                        <spam id="info">{% t upload.result %}:</spam>
                     </pre>
                 </div>
             </div>
         </div>
         <div id="upload_conf">
-            <button type="button" onclick="upload()" class="box_button" id="buttonUpload">Upload<img
+            <button type="button" onclick="upload()" class="box_button" id="buttonUpload">{% t upload.upload %}<img
                     src="{{ site.baseurl }}/assets/images/upload/upload.png" /></button>
             <div class="min-loading blue loading-hidden">
                 <div></div>
@@ -190,7 +191,7 @@ layout: empty
     </div>
     </div>
     <div id="source-ack">
-        <small><a href="https://github.com/anarkrypto/upload-files-to-ipfs-from-browser-panel">{% t upload_ui_source_ack %}</a></small>
+        <small><a href="https://github.com/anarkrypto/upload-files-to-ipfs-from-browser-panel">{% t upload.ui_source_ack %}</a></small>
     </div>            
 </body>