diff --git a/README.md b/README.md
index 2c0d840..a5574eb 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ python run.py server
 ### Generate a transfer code
 Run the following curl command in the console using a valid server token (configurable in config.py) to obtain a transfer code valid for 24 hours
 ```sh
-curl -i -X POST -H "X-Server-Token: your-server-token" http://localhost:8000/transfers/
+curl -H "X-Server-Token: your-server-token" -H "Content-Type: application/json" -X POST -d '{"user":"your-user-id","name":"your-user-name","email":"your-user-email","duration":7}' http://localhost:8000/transfers/
 ```
 
 ### Upload a file:
diff --git a/config.py b/config.py
index 8b0fa52..42730bf 100644
--- a/config.py
+++ b/config.py
@@ -7,11 +7,12 @@
 DATABASE = os.path.join(os.getcwd(), 'DCC.db')
 SCHEMA = os.path.join(os.getcwd(), 'schema.sql')
 SECRET_KEY = 'development key'
-SERVER_TOKENS = {'server-token':
-                     {'name': 'server_name',
-                      'id': 'server_id'
-                      }
-                 }
+SERVER_TOKENS = {
+    'server-token': {
+        'name': 'server_name',
+        'id': 'server_id',
+    }
+}
 UPLOAD_FOLDER = os.path.join(os.getcwd(), 'uploads')
 LOGFILE = os.path.join(os.getcwd(), 'dcc.log')
 APPLICATION_ROOT = None
diff --git a/server/static/style.css b/server/static/style.css
index 091bd40..9a542e5 100644
--- a/server/static/style.css
+++ b/server/static/style.css
@@ -1,5 +1,62 @@
 /* Downloaded from: https://github.com/23/resumable.js/blob/master/samples/Node.js/public/style.css */
 
+/* Move down content because we have a fixed navbar that is 50px tall */
+body {
+  padding-top: 50px;
+}
+
+/*
+ * Global add-ons
+ */
+
+.sub-header {
+  padding-bottom: 10px;
+  border-bottom: 1px solid #eee;
+}
+
+/*
+ * Top navigation
+ * Hide default border to remove 1px line.
+ */
+.navbar-title {
+    font-size: 18px;
+    color: white;
+    padding: 15px;
+    cursor: default;
+}
+
+.navbar-fixed-top {
+  border: 0;
+}
+
+.tab-label,
+.tab-label:hover {
+    font-size: 14px;
+    color: black;
+}
+
+.main,
+.sample-table {
+    margin-top: 30px;
+}
+
+.step-header {
+    margin-top: 15px;
+    margin-bottom: 15px;
+}
+
+.step-description {
+    text-align: justify;
+    margin-bottom: 10px;
+}
+
+@media (min-width: 768px) {
+  .footer-row {
+    padding-right: 40px;
+    padding-left: 40px;
+  }
+}
+
 /* Reset */
 body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, fieldset, input, textarea, p, blockquote, th, td {
     margin: 0;
@@ -91,8 +148,7 @@ body {
     text-align: left;
 }
 
-.dcc-table,
-.sample-table,
+.main,
 .cancel-upload,
 .pause-upload {
     display: none;
@@ -160,11 +216,11 @@ th.header.files, th.header.option, th.header.progress {
     text-align: center;
 }
 
-.sample-header-row {
-    background-color: #f5f5f5;
+.table-striped>tbody>tr.sample-header-row {
+    background-color: #eeeeee;
 }
 
-.sample-header-row:hover {
+.table-striped>tbody>tr.sample-header-row:hover {
     background-color: #dadada;
 }
 
@@ -253,6 +309,7 @@ a.menu-item,
 }
 
 .sample-table td.file-progress.progress {
+    background-color: inherit;
     padding-right: 10px;
     width: 100px;
     display: none;
@@ -403,21 +460,7 @@ input.error {
 }
 
 .logout {
-    margin-top: 68px;
-    padding: 0;
-    display: none;
-}
-
-.logout-button {
-    color: black;
-    background-color: #eee;
-    border-color: #ddd;
-}
-
-.logout-button:hover {
-    color: black;
-    background-color: #dadada;
-    border-color: #a2a2a2;
+    font-size: 14px;
 }
 
 /* Add Sample */
@@ -439,10 +482,24 @@ p.error-description {
 }
 
 .start-upload,
-.modal-add-sample-button {
+.modal-add-sample-button,
+.modal-add-files-button {
     width: 120px;
 }
 
+.modal-add-files-button {
+    color: #2e6da4;
+    background-color: #fff;
+    border-color: #2e6da4;
+    width: 120px;
+}
+
+.add-other-title,
+.add-other-description,
+.edit-other-title {
+    display: none;
+}
+
 .cancel-upload {
     margin-right: 10px;
 }
@@ -460,14 +517,14 @@ p.error-description {
 }
 
 /* Uploader: Drag & Drop */
-.resumable-error {
+.flow-error {
     display: none;
     font-size: 14px;
     font-style: italic;
     margin-top: 40px;
 }
 
-.resumable-droparea {
+.flow-droparea {
     padding: 60px 0;
     margin-top: 20px;
     font-size: 16px;
@@ -480,17 +537,17 @@ p.error-description {
     display: none;
 }
 
-.resumable-dragging {
+.flow-dragging {
     color: white;
     background-color: rgba(51, 51, 51, 0.61);
     border: 2px solid #999;
 }
 
-.resumable-dragging * {
+.flow-dragging * {
     pointer-events: none;
 }
 
-.resumable-browse u {
+.flow-browse u {
     cursor: pointer;
 }
 
@@ -505,12 +562,12 @@ p.error-description {
 }
 
 /* Uploader: Progress bar */
-#resumable-progress-template,
+#flow-progress-template,
 .file-error-template {
     display: none;
 }
 
-.resumable-progress {
+.flow-progress {
     margin: 10px 0;
     width: 100%;
     height: 30px;
diff --git a/server/static/upload.js b/server/static/upload.js
index 9f26a04..3ee2ff7 100644
--- a/server/static/upload.js
+++ b/server/static/upload.js
@@ -2,17 +2,18 @@ $(function () {
     var reSampleName = /^[A-Z\d\-_]+$/i;
     var reLibrary = /^[A-Z\d\-_]*$/i;
     var reReadset = reLibrary;
-    var platforms = ['Illumina HiSeq', 'Illumina X10', 'SOLiDv4', 'PacBio', 'Ion Torrent', 'MinION'];
-    var captureKits = ['Nextera Rapid Capture', 'Agilent SureSelect', 'NimbleGen SeqCap EZ', 'Illumina TruSeq',
-        'Life Technologies TargetSeq', 'Life Technologies AmpliSeq', 'Agilent HaloPlex'];
+    var platforms = ['Illumina HiSeq 2500', 'Illumina HiSeq 2000', 'Illumina MiSeq', 'Illumina GE2',
+        'Illumina HiSeq X Ten', 'SOLiD 4', 'SOLiD 5500'];
+    var captureKits = ['Agilent SureSelect 3', 'Agilent SureSelect 4', 'Agilent SureSelect 5',
+        'Agilent SureSelect Clinical Research Exome (V5)', 'Illumina TruSight One'];
     var referenceGenomes = ['GRCh38/hg38', 'GRCh37/hg19', 'NCBI36/hg18'];
     var fieldProperties = {
         'type': {'type': 'freetext', 'default': ''},
         'readset': {'type': 'freetext', 'default': ''},
-        'run-type': {'type': 'freetext', 'default': 'N/A'},
+        'runType': {'type': 'freetext', 'default': 'N/A'},
         'library': {'type': 'freetext', 'default': ''},
         'platform': {'type': 'typeahead', 'default': ''},
-        'capture-kit': {'type': 'typeahead', 'default': ''},
+        'captureKit': {'type': 'typeahead', 'default': ''},
         'reference': {'type': 'typeahead', 'default': ''}
     };
     var fieldNames = $.map(fieldProperties, function (value, key) { return key });
@@ -29,10 +30,10 @@ $(function () {
         '.vcf.gz': 'VCF'
     };
     var fileTypeProperties = {
-        'BAM/SAM': {'fields': ['type', 'readset', 'platform', 'run-type', 'capture-kit', 'library', 'reference']},
-        'FASTQ': {'fields': ['type', 'readset', 'platform', 'run-type', 'capture-kit', 'library']},
-        'BED': {'fields': ['type', 'readset', 'platform', 'run-type', 'capture-kit', 'library', 'reference']},
-        'VCF': {'fields': ['type', 'readset', 'platform', 'run-type', 'capture-kit', 'library', 'reference']},
+        'BAM/SAM': {'fields': ['type', 'readset', 'platform', 'runType', 'captureKit', 'library', 'reference']},
+        'FASTQ': {'fields': ['type', 'readset', 'platform', 'runType', 'captureKit', 'library']},
+        'BED': {'fields': ['type', 'readset', 'platform', 'runType', 'captureKit', 'library', 'reference']},
+        'VCF': {'fields': ['type', 'readset', 'platform', 'runType', 'captureKit', 'library', 'reference']},
         'Other': {'fields': ['type', 'readset']}
     };
 
@@ -51,7 +52,7 @@ $(function () {
     };
 
     function toggleDropArea(toggle) {
-        $(this).toggleClass('resumable-dragging', toggle);
+        $(this).toggleClass('flow-dragging', toggle);
     }
 
     function activateDropArea() {
@@ -75,7 +76,7 @@ $(function () {
     }
 
     function getFileRow(file, table) {
-        return table.find('#'+file.uniqueIdentifier);
+        return table.find("[id='"+file.uniqueIdentifier+"']");
     }
 
     function getExtraParams(flowFile, flowChunk) {
@@ -86,8 +87,8 @@ $(function () {
             'fileType': fileRow.find('.file-type').text(),
             'readset': fileRow.find('.file-readset').text(),
             'platform': fileRow.find('.file-platform').text(),
-            'runType': fileRow.find('.file-run-type').text(),
-            'captureKit': fileRow.find('.file-capture-kit').text(),
+            'runType': fileRow.find('.file-runType').text(),
+            'captureKit': fileRow.find('.file-captureKit').text(),
             'library': fileRow.find('.file-library').text(),
             'reference': fileRow.find('.file-reference').text()
         };
@@ -102,7 +103,7 @@ $(function () {
                 $('.transfer-symbol').removeClass('glyphicon-log-in').addClass('glyphicon-ok-sign');
                 $('#auth-token').prop('disabled', true).closest('.form-group').removeClass('has-error');
                 $('.auth-success').addClass('disabled');
-                $('.sample-table, .dcc-table').show();
+                $('.main').show();
                 $('.transfer-code-invalid').hide();
                 $('.logout').show();
                 getSampleDataFromServer('complete', $('.dcc-table'));
@@ -133,7 +134,7 @@ $(function () {
     }
 
     function updateFileMetadata(metadata, table) {
-        var fileRow = table.find('#'+metadata.identifier);
+        var fileRow = table.find("[id='"+metadata.identifier+"']");
         for (var fieldName in fieldProperties) {
             if (fieldProperties.hasOwnProperty(fieldName)) {
                 var fieldType = fieldProperties[fieldName]['type'];
@@ -161,15 +162,32 @@ $(function () {
     }
 
     function resetSampleModal() {
-       // Set the library and and run-type fields to blank and N/A respectively
-        $('#add-library').val('');
-        $('#add-run-type').val('N/A');
+        // Set the readset, library and and runType fields to blank and N/A respectively
+        $('#add-readset, #add-library').val('');
+        $('#add-runType').val('N/A');
         // Set all typeahead fields to blank
-        $('#add-platform, #add-capture-kit, #add-reference').typeahead('val', '');
+        $('#add-platform, #add-captureKit, #add-reference').typeahead('val', '');
         // Set the sample/patient id field to blank and add the error class
-        $('#add-sample-name').val('');
+        $('#add-sample-name').val('').closest('.form-group').show();
         validateField.call($('#add-sample-name'), reSampleName);
         validateField.call($('#add-library'), reLibrary);
+        validateField.call($('#add-readset'), reReadset);
+    }
+
+    function showAdditionalFileModalOptions(isAuxiliary) {
+        if (isAuxiliary) {
+            $('#add-sample-name, #edit-sample-name')
+                .val('~')
+                .closest('.form-group')
+                .removeClass('has-error');
+        }
+        $('#add-sample-name, #edit-sample-name')
+            .prop('disabled', isAuxiliary)
+            .closest('.form-group')
+            .toggle(!isAuxiliary);
+        $('.add-other-title, .add-other-description, .edit-other-title').toggle(isAuxiliary);
+        //Show sample on False, hide on True
+        $('.add-sample-title, .add-sample-description, .edit-sample-title').toggle(!isAuxiliary);
     }
 
     function toggleEditableFields (fileType) {
@@ -195,19 +213,26 @@ $(function () {
             sampleTemplate
                 .find('.sample-file-template')
                 .remove();
-            // Add the sample name
-            sampleTemplate
-                .find('.sample-name')
-                .html(sampleName);
-            // Append the sample to to the table
-            sampleTemplate
-                .attr('name', sampleName)
-                .appendTo(table.find('.table-data'));
             // Remove the template classes
             sampleTemplate
+                .attr('name', sampleName)
                 .removeClass('sample-template')
                 .find('.sample-header-row')
                 .removeClass('sample-header-template');
+
+            if (sampleName === '~') {
+                sampleTemplate
+                    .find('.sample-name')
+                    .html('Additional Files');
+
+                sampleTemplate.insertAfter(table.find('.sample-template'));
+            } else {
+                sampleTemplate
+                    .find('.sample-name')
+                    .html(sampleName);
+
+                sampleTemplate.appendTo(table.find('.table-data'));
+            }
         }
     }
 
@@ -236,9 +261,10 @@ $(function () {
         }
         fileRow.find('.file-type').text(fileType);
         if (fileType !== 'Other') {
+            fileRow.find('.file-readset').text($('#add-readset').val());
             fileRow.find('.file-platform').text($('#add-platform').val());
-            fileRow.find('.file-run-type').text($('#add-run-type').find('option:selected').text());
-            fileRow.find('.file-capture-kit').text($('#add-capture-kit').val());
+            fileRow.find('.file-runType').text($('#add-runType').find('option:selected').text());
+            fileRow.find('.file-captureKit').text($('#add-captureKit').val());
             fileRow.find('.file-library').text($('#add-library').val());
             if (fileType !== 'FASTQ') {
                 fileRow.find('.file-reference').text($('#add-reference').val());
@@ -256,7 +282,7 @@ $(function () {
     }
 
     function validateField(regex) {
-        var isValid = regex.test($(this).val());
+        var isValid = $(this).is(':disabled') || regex.test($(this).val());
         // Toggle error classes based on regex test
         $(this)
             .closest('.form-group')
@@ -302,14 +328,16 @@ $(function () {
 
     function showUploadStateOptions() {
         $('.cancel-upload, .progress').show();
-        $('.option').hide();
-        $('.add-sample, .file-name, .sample-name, .sample-option, .start-upload').addClass('disabled');
+        $('.sample-table').find('.option').hide();
+        $('.sample-table').find('.file-name, .sample-name, .sample-option').addClass('disabled');
+        $('.modal-add-sample-button, .modal-add-files-button, .start-upload').addClass('disabled');
     }
 
     function hideUploadStateOptions() {
-        $('.option').show();
+        $('.sample-table').find('.option').show();
         $('.cancel-upload, .progress').hide();
-        $('.add-sample, .file-name, .sample-name, .sample-option, .start-upload').removeClass('disabled');
+        $('.sample-table').find('.file-name, .sample-name, .sample-option').removeClass('disabled');
+        $('.modal-add-sample-button, .modal-add-files-button, .start-upload').removeClass('disabled');
     }
 
     function clearTable(table) {
@@ -352,7 +380,7 @@ $(function () {
     function addFileToErrorTable (flowFile, errorMsg) {
         var id = flowFile.uniqueIdentifier;
         var fileErrorFields = {
-            'sample': $('#' + id).closest('.sample-section').attr('name'),
+            'sample': $("[id='"+id+"']").closest('.sample-section').attr('name'),
             'file': flowFile.name,
             'msg': errorMsg
         };
@@ -434,6 +462,14 @@ $(function () {
         flow.fire('fileComplete', file);
     }
 
+    function sendFileMetadata(target, data) {
+        $.ajax({
+            url: target,
+            type: 'PUT',
+            data: data
+        })
+    }
+
     //************************** FLOW OBJECT **************************
 
     // Create a new flow object
@@ -450,9 +486,9 @@ $(function () {
         permanentErrors: [400, 403, 404, 415, 500, 501]
     });
 
-    flow.assignBrowse($('.resumable-browse'));
+    flow.assignBrowse($('.flow-browse'));
 
-    flow.assignDrop($('.resumable-droparea'));
+    flow.assignDrop($('.flow-droparea'));
 
     flow.on('fileAdded', function (flowFile) {
         var sampleName = $('#add-sample-name').val();
@@ -487,7 +523,7 @@ $(function () {
         var fileRow = getFileRow(file, $('.sample-table'));
         var authToken = $('#auth-token').val();
         var uniqueIdentifier = file.uniqueIdentifier;
-        var sampleName = $('#'+uniqueIdentifier).closest('.sample-section').attr('name');
+        var sampleName = $("[id='"+uniqueIdentifier+"']").closest('.sample-section').attr('name');
         var urlParts = ['transfers', authToken, 'samples', sampleName, 'files', uniqueIdentifier];
         $.ajax({
             url: window.location.pathname + urlParts.join('/'),
@@ -522,7 +558,7 @@ $(function () {
     flow.on('complete', function () {
     });
 
-    $('.resumable-droparea').on({
+    $('.flow-droparea').on({
         'dragenter': activateDropArea,
         'dragleave': deactivateDropArea,
         'dragend': deactivateDropArea,
@@ -550,7 +586,7 @@ $(function () {
         validateField.call(this, reLibrary);
     });
     $('#add-sample-modal').on('fieldValidation', function(e) {
-        $('.resumable-droparea').toggle($(this).find('.has-error').length === 0);
+        $('.flow-droparea').toggle($(this).find('.has-error').length === 0);
     });
     $('#edit-sample-modal, #edit-file-modal').on('fieldValidation', function(e) {
         $('.save-edit-button').prop('disabled', $(this).find('.has-error').length);
@@ -567,7 +603,7 @@ $(function () {
     });
 
     // Capture Kit typeahead
-    $('#add-capture-kit, #edit-sample-capture-kit, #edit-file-capture-kit').typeahead({
+    $('#add-captureKit, #edit-sample-captureKit, #edit-file-captureKit').typeahead({
         hint: true,
         highlight: true,
         minLength: 1
@@ -592,20 +628,28 @@ $(function () {
     });
 
     // Enable sample name field after adding files to an existing sample
-    $('#add-sample-modal').on('hide.bs.modal', function () {
+    $('#add-sample-modal, #edit-sample-modal').on('hide.bs.modal', function () {
+        showAdditionalFileModalOptions(false);
         resetSampleModal();
-        $(this).find('#add-sample-name').prop('disabled', false);
     });
 
     $('#edit-file-modal').on('hide.bs.modal', function () {
         resetEditFileModal();
     });
 
+    $('body').on('click', '.modal-add-files-button', function (e) {
+        $('#add-sample-modal').modal('show');
+        showAdditionalFileModalOptions(true);
+        $('.flow-droparea').show();
+        return false;
+    });
+
     // Remove file from add sample table
     $('.table-data').on('click', '.remove-file', function (e) {
         var uniqueId = $(this).closest('.sample-file-row').attr('id');
         flow.removeFile(flow.getFromUniqueIdentifier(uniqueId));
-        $('#'+uniqueId).remove();
+        $(this).closest("[id='"+uniqueId+"']").remove();
+
     });
 
     // Remove entire sample from add sample table
@@ -618,13 +662,16 @@ $(function () {
             flow.removeFile(flowFile);
         });
         fileRows.remove();
-        $(this).closest('tbody').remove();
+        $(this).closest('.sample-section').remove();
         toggleUploadIfReady();
     });
 
     // Add files to a specific sample
     $('.table-data').on('click', '.add-files', function (e) {
-        var sampleName = $(this).closest('tbody').attr('name');
+        var sampleName = $(this).closest('.sample-section').attr('name');
+        if (sampleName === '~') {
+            showAdditionalFileModalOptions(true);
+        }
         var sampleRow = $(this).closest('.sample-header-row');
 
         if (!sampleRow.nextUntil('.sample-header-row').is(':visible')) {
@@ -633,7 +680,7 @@ $(function () {
         $('#add-sample-modal').modal('show');
         $('#add-sample-name').val(sampleName).prop('disabled', true);
         validateField.call($('#add-sample-name'), reSampleName);
-        $('.resumable-droparea').show();
+        $('.flow-droparea').show();
         //prevents bubbling of click event to .sample-collapse parent
         return false;
     });
@@ -641,14 +688,18 @@ $(function () {
     // Open edit sample modal
     $('.table-data').on('click', '.edit-sample, .sample-name', function (e) {
         var sampleRow = $(this).closest('.sample-header-row');
-        var currentName = sampleRow.find('.sample-name').text();
+        var currentName = sampleRow.closest('.sample-section').attr('name');
+
+
         $('#edit-sample-name').val(currentName);
-        validateField.call($('#edit-sample-name'), reSampleName);
+
         // Show modal in data-target
         var modalId = $(this).attr('data-target');
         if (modalId) {
             $(modalId).attr('data-sample-name', currentName).modal('show');
         }
+        showAdditionalFileModalOptions(currentName === '~');
+        validateField.call($('#edit-sample-name'), reSampleName);
         return false;
     });
 
@@ -660,8 +711,8 @@ $(function () {
         } else {
             formGroup.removeClass('has-error').find('.form-control').val('').attr('disabled',true);
             formGroup.find('.error-description').hide();
-            if (formGroup.find('.form-control').is('#edit-sample-run-type')) {
-                $('#edit-sample-run-type').val('N/A')
+            if (formGroup.find('.form-control').is('#edit-sample-runType')) {
+                $('#edit-sample-runType').val('N/A')
             }
         }
         if (!$('#edit-sample-name, #edit-sample-readset, #edit-sample-library').closest('.form-group').hasClass('has-error')){
@@ -672,24 +723,45 @@ $(function () {
     // Edit sample save
     $('body').on('click', '.save-edit-sample', function (e) {
         var oldName = $('#edit-sample-modal').attr('data-sample-name');
-        var sampleTbody = $('.sample-table').find('tbody[name="' + oldName + '"]');
+        var sampleTbody = $('.tab-pane.active.in').find('tbody[name="' + oldName + '"]');
         var newName = $('#edit-sample-name').val();
         var fileRows = sampleTbody.find('.sample-header-row').nextUntil();
 
-        sampleTbody.attr('name', newName).find('.sample-name').text(newName);
+        if (!$('#edit-sample-name').is(':disabled')) {
+            sampleTbody.attr('name', newName).find('.sample-name').text(newName);
+        }
         fileRows.each(function (index) {
+            var fileIdentifier = $(this).attr('id');
             var fileType = $(this).find('.file-type').text();
             var fieldNames = fileTypeProperties[fileType]['fields'];
+            var fileData = {
+                'status': 'update',
+                'identifier': fileIdentifier,
+                'new-sample-name': newName,
+                'fileType': fileType
+            };
             for (var i = 0; i < fieldNames.length; i++) {
                 var fieldName = fieldNames[i];
                 if ($('#edit-sample-' + fieldName).closest('.form-group').find('input[type="checkbox"]').is(':checked')) {
-                    $(this).find('.file-' + fieldName).text($('#edit-sample-' + fieldName).val());
+                    var newValue = $('#edit-sample-' + fieldName).val();
+                    $(this).find('.file-' + fieldName).text(newValue);
+                    fileData[fieldName] = newValue;
                 }
             }
-            var file = flow.getFromUniqueIdentifier($(this).attr('id'));
-            updateIdentifier(file, newName);
-            $(this).attr('id', file.uniqueIdentifier);
+            // If managing the sample, send update request to server on save
+            if ($('.tab-pane.active.in').is('#manage')) {
+                var authToken = $('#auth-token').val();
+                var target = ['transfers', authToken, 'samples', oldName, 'files', fileIdentifier].join('/');
+                sendFileMetadata(target, fileData);
+            // If uploading the sample, update the Flow object with the correct identifier
+            } else {
+                var file = flow.getFromUniqueIdentifier($(this).attr('id'));
+                updateIdentifier(file, newName);
+                $(this).attr('id', file.uniqueIdentifier);
+            }
         });
+        clearTable($('.dcc-table'));
+        getSampleDataFromServer('complete', $('.dcc-table'));
         $('#edit-sample-modal').removeAttr('data-sample-name').modal('hide');
     });
 
@@ -718,9 +790,40 @@ $(function () {
 
     // Save file edits to table
     $('body').on('click', '.save-edit-file', function (e) {
+        var authToken = $('#auth-token').val();
         var modal = $(this).closest('.modal');
-        var tableRow = $('#' + modal.attr('data-file-id'));
+        var tableRow = $('.tab-pane.active.in').find("[id='"+modal.attr('data-file-id')+"']");
+        var sampleName = tableRow.closest('.sample-section').attr('name');
+        var fileIdentifier = tableRow.attr('id');
+
+
+        if ($('.tab-pane.active.in').is('#manage')) {
+            var target = ['transfers', authToken, 'samples', sampleName, 'files', fileIdentifier].join('/');
+            var fileData = {
+                    'status': 'update',
+                    'identifier': fileIdentifier
+            };
+            for (var fieldName in fieldProperties) {
+                if (fieldProperties.hasOwnProperty(fieldName)) {
+                    var fieldType = fieldProperties[fieldName]['type'];
+                    var value = '';
+                    var field = $('#edit-file-' + fieldName);
+                    if (!field.prop('disabled')) {
+                        if (fieldType === 'freetext') {
+                            value = field.val();
+                        } else if (fieldType === 'typeahead') {
+                            value = field.typeahead('val');
+                        }
+                        fileData[fieldName] = value;
+                    }
+                }
+            }
+            fileData['fileType'] = fileData['type'];
+            sendFileMetadata(target, fileData);
+        }
         copyFromModalToTable(modal, tableRow);
+        clearTable($('.dcc-table'));
+        getSampleDataFromServer('complete', $('.dcc-table'));
         modal.removeAttr('data-file-id').modal('hide');
     });
 
@@ -743,7 +846,7 @@ $(function () {
             $.each(flow.files, function (i, file) {
                 var authToken = $('#auth-token').val();
                 var uniqueIdentifier = file.uniqueIdentifier;
-                var sampleName = $('#'+uniqueIdentifier).closest('.sample-section').attr('name');
+                var sampleName = $("[id='"+uniqueIdentifier+"']").closest('.sample-section').attr('name');
                 var urlParts = ['transfers', authToken, 'samples', sampleName, 'files', uniqueIdentifier];
                 var fileData = {
                     'status': 'start',
@@ -796,9 +899,4 @@ $(function () {
         refreshUploadReadyState();
         $('#upload-complete-modal').modal('hide');
     });
-
-    // Log out (refresh the page)
-    $('body').on('click', '.logout-button', function (e){
-        document.location.reload();
-    });
 });
diff --git a/server/templates/home.html b/server/templates/home.html
index 37ee276..027c79f 100644
--- a/server/templates/home.html
+++ b/server/templates/home.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
-<!-- Based off of example: https://raw.githubusercontent.com/23/resumable.js/master/samples/Node.js/public/index.html -->
+<!-- Based off of example: http://getbootstrap.com/examples/dashboard/# -->
 
 <head>
     <meta charset="UTF-8">
@@ -10,15 +10,38 @@
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='style.css') }}">
 </head>
 <body>
-    <header><h1>Upload files to the DCC</h1></header>
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container-fluid">
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar"
+                        aria-expanded="false" aria-controls="navbar">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <h6 class=" navbar-title">DCC Large File Upload</h6>
+            </div>
+            <div id="navbar" class="navbar-collapse collapse">
+                <ul class="nav navbar-nav navbar-right">
+                    <li>
+                        <a class="logout" href="/">
+                            <span class="glyphicon glyphicon-log-out"></span> Logout
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+
     <div class="container-fluid">
 
-        <!-- Transfer code and login -->
-        <div class="row col-sm-10 col-sm-offset-1 transfer-code">
-            <div class="resumable-error">
+         <!-- Transfer code and login -->
+        <div class="col-sm-10 col-sm-offset-1 col-md-10 col-md-offset-1 transfer-code">
+            <div class="flow-error">
                 Oh no! Your browser isn't supported. Please try a recent version of Chrome or Firefox.
             </div>
-            <form class="form-horizontal auth-token-form col-sm-10">
+            <form class="form-horizontal auth-token-form">
                 <div class="form-group">
                     <label for="auth-token" class="control-label">Transfer code</label>
                     <div class="input-group">
@@ -35,106 +58,227 @@
                     </div>
                 </div>
             </form>
-            <div class="logout col-sm-2">
-                    <button class="btn btn-default pull-right logout-button">
-                            <span class="glyphicon glyphicon-log-out"></span> Logout
-                    </button>
-            </div>
         </div>
 
-        <!-- Table showing selected sample files -->
-        <div class="row col-sm-10 col-sm-offset-1 sample-table">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <span class="collapse-icon glyphicon glyphicon-triangle-bottom pull-left"></span>
-                    <span class="collapse-icon glyphicon glyphicon-triangle-right pull-left" style="display: none;"></span>
-                    Select Samples for Upload
-                </div>
-                <div class="panel-body">
-                    <p>
-                        To start uploading your files hit the <em>Add Sample</em> button. You will be required to
-                        provide a sample name and specify all applicable metadata for the sample you wish to upload.
-                        You may also alter sample and individual metadata options after attaching your files. Sample
-                        name, readset, and library must be composed solely of letters, numbers, hyphens, and/or
-                        underscores to ensure compatibility with downstream pipelines.
-                    </p>
-                    <div data-toggle="tooltip" title="Add a new sample">
-                        <button class="btn btn-primary pull-right modal-add-sample-button"
-                                data-toggle="modal"
-                                data-target="#add-sample-modal">
-                            <span class="glyphicon glyphicon-plus"></span>
-                            Add Sample
-                        </button>
+        <div class="row">
+            <div class="main col-sm-10 col-sm-offset-1 col-md-10 col-md-offset-1">
+
+              <!-- Nav tabs -->
+                <ul class="nav nav-tabs" role="tablist">
+                    <li role="presentation" class="active">
+                        <a class="tab-label" href="#upload" role="tab" data-toggle="tab">Upload</a>
+                    </li>
+                    <li role="presentation">
+                        <a class="tab-label" href="#manage" role="tab" data-toggle="tab">Manage</a>
+                    </li>
+                    <li role="presentation">
+                        <a class="tab-label" href="#analyze" role="tab" data-toggle="tab">Analyze</a>
+                    </li>
+                </ul>
+
+                <!-- Tab panes -->
+                <div class="tab-content">
+                    <div role="tabpanel" class="tab-pane fade in active" id="upload">
+                        <div class="">
+                            <h1 class="page-header">Upload Files to the DCC</h1>
+
+                            <div class="row">
+                                <div class="col-xs-6 col-sm-3">
+                                    <h3 class="step-header">1. Select samples</h3>
+                                    <div class="step-description">
+                                        <span class="text-muted">
+                                            To start uploading sample/patient specific files, such as .fastq or .bam, click
+                                            the button below. Each sample should contain all the files pertaining to the
+                                            sequenced individual. You will be required to provide a sample name and specify
+                                            all applicable metadata for the sample you wish to upload.
+                                        </span>
+                                    </div>
+                                    <div>
+                                        <button class="btn btn-primary modal-add-sample-button"
+                                                data-toggle="modal"
+                                                data-target="#add-sample-modal">
+                                            <span class="glyphicon glyphicon-plus"></span>
+                                            Add Sample
+                                        </button>
+                                    </div>
+                                </div>
+                                <div class="col-xs-6 col-sm-3">
+                                    <h3 class="step-header">2. Additional files</h3>
+                                    <div class="step-description">
+                                        <span class="text-muted">
+                                            For non-sample related files that are necessary for your pipeline or
+                                            downstream analysis, such as capture kit BED files, references, or variant
+                                            files, click the button below. These files will be available to all samples
+                                            when choosing details about the analysis pipeline you would like to run.
+                                        </span>
+                                    </div>
+                                    <div>
+                                        <button class="btn btn-primary modal-add-files-button"
+                                                data-toggle="modal"
+                                                data-target="#add-sample-modal">
+                                            <span class="glyphicon glyphicon-plus"></span>
+                                            Other Files
+                                        </button>
+                                    </div>
+                                </div>
+                                <div class="clearfix visible-xs-block"></div>
+                                <div class="col-xs-6 col-sm-3">
+                                    <h3 class="step-header">3. Provide metadata</h3>
+                                    <div class="step-description">
+                                        <span class="text-muted">
+                                            Having complete and accurate metadata will help to ensure compatibility with
+                                            downstream pipelines and help automate manifest creation. All metadata can be
+                                            edited per file or for all files within a sample by clicking on the edit icon.
+                                            Please ensure that you have indicated the appropriate readset for each file
+                                            within a sample.
+                                        </span>
+                                    </div>
+                                </div>
+                                <div class="col-xs-6 col-sm-3">
+                                    <h3 class="step-header">4. Upload files</h3>
+                                    <div class="step-description">
+                                        <span class="text-muted">
+                                            Once you have selected all your files and provided their respective metadata,
+                                            you can begin uploading your files by click the button below. Once the upload of
+                                            all files is complete you will be able to view and manage them on the Manage
+                                            tab. Any files that fail to upload will be left in the table below and you may
+                                            choose to retry the upload.
+                                        </span>
+                                    </div>
+                                    <div>
+                                        <button class="btn btn-default cancel-upload"
+                                            data-toggle="tooltip" title="Cancel upload of all files">
+                                            Cancel
+                                        </button>
+                                        <button class="btn btn-primary start-upload disabled"
+                                                data-toggle="tooltip" title="Upload all files to the DCC">
+                                            <span class="glyphicon glyphicon-cloud-upload" aria-hidden="true"></span> Upload All
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="table-responsive sample-table">
+                                <table class="table table-striped table-data">
+                                    <thead>
+                                    <tr>
+                                        <th></th>
+                                        <th class="files header" colspan="2">Files</th>
+                                        <th class="type header">File Type</th>
+                                        <th class="readset header">Readset</th>
+                                        <th class="platform header">Platform</th>
+                                        <th class="runType header">Run Type</th>
+                                        <th class="captureKit header">Capture Kit</th>
+                                        <th class="library header">Library</th>
+                                        <th class="reference header">Reference</th>
+                                        <th class="progress header">Progress</th>
+                                        <th class="option header">Options</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody class="sample-template sample-section">
+                                    <tr class="sample-header-row sample-header-template">
+                                        <td class="sample-collapse">
+                                            <span class="sample-collapse-icon glyphicon glyphicon-folder-open"></span>
+                                            <span class="sample-collapse-icon glyphicon glyphicon-folder-close" style="display: none;"></span>
+                                        </td>
+                                        <td class="sample-collapse"><a class="sample-name pull-left" data-toggle="modal" data-target="#edit-sample-modal"></a></td>
+                                        <td class="sample-collapse" colspan="8"></td>
+                                        <td class="sample-collapse sample-option">
+                                            <span class="option-icon edit-sample glyphicon glyphicon-pencil"
+                                                  data-toggle="modal"
+                                                  data-target="#edit-sample-modal"
+                                                  title="Edit metadata for entire sample"></span>
+                                            <span class="option-icon flow-add add-files glyphicon glyphicon-plus"
+                                                  data-toggle="modal"
+                                                  data-target="#add-sample-modal"
+                                                  title="Add file(s) to sample"></span>
+                                            <span class="option-icon remove-sample glyphicon glyphicon-remove" data-toggle="tooltip"
+                                                  title="Remove sample"></span>
+                                        </td>
+                                    </tr>
+                                    <tr class="sample-file-row sample-file-template">
+                                        <td class="file-icon"><span class="glyphicon glyphicon-file pull-right"></span></td>
+                                        <td class="cell" colspan="2"><a class="file-name" data-toggle="modal" data-target="#edit-file-modal"></a></td>
+                                        <td class="file-type cell"></td>
+                                        <td class="file-readset cell"></td>
+                                        <td class="file-platform cell"></td>
+                                        <td class="file-runType cell"></td>
+                                        <td class="file-captureKit cell"></td>
+                                        <td class="file-library cell"></td>
+                                        <td class="file-reference cell"></td>
+                                        <td class="file-progress progress cell">
+                                            <div class="progress-bar progress-bar-striped active" role="progressbar"></div>
+                                        </td>
+                                        <td class="file-option option cell">
+                                            <span class="option-icon edit-file glyphicon glyphicon-pencil"
+                                                  data-toggle="modal"
+                                                  data-target="#edit-file-modal"
+                                                  title="Edit file metadata"></span>
+                                            <span class="option-icon remove-file glyphicon glyphicon-remove" data-toggle="tooltip"
+                                                  title="Remove file"></span>
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
                     </div>
-                </div>
-                <table class="table table-condensed table-data">
-                    <thead>
-                    <tr class="active">
-                        <th></th>
-                        <th class="files header" colspan="2">Files</th>
-                        <th class="type header">File Type</th>
-                        <th class="readset header">Readset</th>
-                        <th class="platform header">Platform</th>
-                        <th class="run-type header">Run Type</th>
-                        <th class="capture-kit header">Capture Kit</th>
-                        <th class="library header">Library</th>
-                        <th class="reference header">Reference</th>
-                        <th class="progress header">Status</th>
-                        <th class="option header">Options</th>
-                    </tr>
-                    </thead>
-                    <tbody class="sample-template sample-section">
-                    <tr class="sample-header-row sample-header-template">
-                        <td class="sample-collapse">
-                            <span class="sample-collapse-icon glyphicon glyphicon-folder-open"></span>
-                            <span class="sample-collapse-icon glyphicon glyphicon-folder-close" style="display: none;"></span>
-                        </td>
-                        <td class="sample-collapse"><a class="sample-name pull-left" data-toggle="modal" data-target="#edit-sample-modal"></a></td>
-                        <td class="sample-collapse" colspan="8"></td>
-                        <td class="sample-collapse sample-option">
-                             <span class="option-icon edit-sample glyphicon glyphicon-pencil"
-                                   data-toggle="modal"
-                                   data-target="#edit-sample-modal"
-                                   title="Edit metadata for entire sample"></span>
-                            <span class="option-icon resumable-add add-files glyphicon glyphicon-plus"
-                                  data-toggle="modal"
-                                  data-target="#add-sample-modal"
-                                  title="Add file(s) to sample"></span>
-                            <span class="option-icon remove-sample glyphicon glyphicon-remove" data-toggle="tooltip"
-                                  title="Remove sample"></span>
-                        </td>
-                    </tr>
-                    <tr class="sample-file-row sample-file-template">
-                        <td class="file-icon"><span class="glyphicon glyphicon-file pull-right"></span></td>
-                        <td class="cell" colspan="2"><a class="file-name" data-toggle="modal" data-target="#edit-file-modal"></a></td>
-                        <td class="file-type cell"></td>
-                        <td class="file-readset cell"></td>
-                        <td class="file-platform cell"></td>
-                        <td class="file-run-type cell"></td>
-                        <td class="file-capture-kit cell"></td>
-                        <td class="file-library cell"></td>
-                        <td class="file-reference cell"></td>
-                        <td class="file-progress progress cell">
-                            <div class="progress-bar progress-bar-striped active" role="progressbar"></div>
-                        </td>
-                        <td class="file-option option cell">
-                            <span class="option-icon edit-file glyphicon glyphicon-pencil"
-                                  data-toggle="modal"
-                                  data-target="#edit-file-modal"
-                                  title="Edit file metadata"></span>
-                            <span class="option-icon remove-file glyphicon glyphicon-remove" data-toggle="tooltip"
-                                  title="Remove file"></span>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-                <div class="panel-footer">
-                    <button type="button" class="btn btn-primary col-xs-2 pull-right start-upload disabled"
-                            data-toggle="tooltip" title="Upload all files to the DCC">
-                        <span class="glyphicon glyphicon-cloud-upload" aria-hidden="true"></span> Upload All
-                    </button>
-                    <button type="button" class="btn btn-default pull-right cancel-upload"
-                            data-toggle="tooltip" title="Cancel upload of all files">Cancel</button>
+                    <div role="tabpanel" class="tab-pane fade" id="manage">
+                        <h1 class="page-header">Files on the DCC</h1>
+                        <div class="table-responsive dcc-table">
+                            <table class="table table-striped table-data">
+                                <thead>
+                                <tr>
+                                    <th></th>
+                                    <th class="files header" colspan="2">Files</th>
+                                    <th class="type header">File Type</th>
+                                    <th class="readset header">Readset</th>
+                                    <th class="platform header">Platform</th>
+                                    <th class="runType header">Run Type</th>
+                                    <th class="captureKit header">Capture Kit</th>
+                                    <th class="library header">Library</th>
+                                    <th class="reference header">Reference</th>
+                                    <th class="status header">DCC Status</th>
+                                    <th class="options header">Options</th>
+                                </tr>
+                                </thead>
+                                <tbody class="sample-template sample-section">
+                                <tr class="sample-header-row sample-header-template">
+                                    <td class="sample-collapse">
+                                        <span class="sample-collapse-icon glyphicon glyphicon-folder-open"></span>
+                                        <span class="sample-collapse-icon glyphicon glyphicon-folder-close" style="display: none;"></span>
+                                    </td>
+                                     <td class="sample-collapse"><span class="sample-name pull-left"></span></td>
+                                    <td class="sample-collapse" colspan="9"></td>
+                                    <td class="sample-collapse sample-option">
+                                        <span class="option-icon edit-sample glyphicon glyphicon-pencil"
+                                              data-toggle="modal"
+                                              data-target="#edit-sample-modal"
+                                              title="Edit metadata for entire sample"></span>
+                                    </td>
+                                </tr>
+                                <tr class="sample-file-row sample-file-template">
+                                    <td class="file-icon"><span class="glyphicon glyphicon-file pull-right"></span></td>
+                                    <td class="cell" colspan="2"><span class="file-name"></span></td>
+                                    <td class="file-type cell"></td>
+                                    <td class="file-readset cell"></td>
+                                    <td class="file-platform cell"></td>
+                                    <td class="file-runType cell"></td>
+                                    <td class="file-captureKit cell"></td>
+                                    <td class="file-library cell"></td>
+                                    <td class="file-reference cell"></td>
+                                    <td class="file-status cell"></td>
+                                    <td class="file-option option cell">
+                                        <span class="option-icon edit-file glyphicon glyphicon-pencil"
+                                              data-toggle="modal"
+                                              data-target="#edit-file-modal"
+                                              title="Edit file metadata"></span>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                    <div role="tabpanel" class="tab-pane fade" id="analyze">...</div>
                 </div>
             </div>
         </div>
@@ -146,17 +290,23 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal">&times;</button>
-                        <h4 class="modal-title">Sample Metadata</h4>
+                        <h4 class="modal-title add-sample-title">Sample Metadata</h4>
+                        <h4 class="modal-title add-other-title">Additional Files Metadata</h4>
                     </div>
                     <div class="modal-body">
                         <form class="form-horizontal modal-sample-form">
-                            <p>
+                            <p class="add-sample-description">
                                 Please specify all applicable metadata for the sample you wish to upload. You may
                                 also alter sample and individual metadata options after attaching your files. Files
                                 already added to the queue cannot be added again. A sample name is required and, along
                                 with the readset and library, must be composed solely of letters, numbers, hyphens,
                                 and/or underscores.
                             </p>
+                            <p class="add-other-description">
+                                Please specify all applicable metadata for the additional files you wish to upload. You
+                                may also alter individual metadata options after attaching your files. Files
+                                already added to the queue cannot be added again.
+                            </p>
                             <div class="form-group has-error">
                                 <label for="add-sample-name" class="col-sm-3 control-label">Sample / Patient ID</label>
                                 <div class="col-sm-9">
@@ -164,6 +314,13 @@ <h4 class="modal-title">Sample Metadata</h4>
                                     <p class="error-description">* Required: may contain letters, numbers, hyphens, or underscores only.</p>
                                 </div>
                             </div>
+                            <div class="form-group">
+                                <label for="add-readset" class="col-sm-3 control-label">Readset Name</label>
+                                <div class="col-sm-9">
+                                    <input type="text" class="form-control field-readset" id="add-readset" placeholder="Readset name">
+                                    <p class="error-description readset-field-error">Optional: may contain letters, numbers, hyphens, or underscores only.</p>
+                                </div>
+                            </div>
                             <div class="form-group">
                                 <label for="add-platform" class="col-sm-3 control-label">Platform</label>
                                 <div class="col-sm-9">
@@ -171,9 +328,9 @@ <h4 class="modal-title">Sample Metadata</h4>
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="add-run-type" class="col-sm-3 control-label">Run Type</label>
+                                <label for="add-runType" class="col-sm-3 control-label">Run Type</label>
                                 <div class="col-sm-9">
-                                    <select class="form-control field-run-type" id="add-run-type">
+                                    <select class="form-control field-runType" id="add-runType">
                                         <option>Single End</option>
                                         <option>Paired End</option>
                                         <option selected>N/A</option>
@@ -181,9 +338,9 @@ <h4 class="modal-title">Sample Metadata</h4>
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="add-capture-kit" class="col-sm-3 control-label">Capture Kit</label>
+                                <label for="add-captureKit" class="col-sm-3 control-label">Capture Kit</label>
                                 <div class="col-sm-9">
-                                    <input class="typeahead field-capture-kit" id="add-capture-kit" type="text" placeholder="Capture kit name">
+                                    <input class="typeahead field-captureKit" id="add-captureKit" type="text" placeholder="Capture kit name">
                                 </div>
                             </div>
                             <div class="form-group">
@@ -201,9 +358,9 @@ <h4 class="modal-title">Sample Metadata</h4>
                             </div>
                             <div class="form-group">
                                 <div class="col-sm-11 col-sm-offset-1">
-                                    <div class="resumable-droparea">
+                                    <div class="flow-droparea">
                                         <span>Drop files here or</span>
-                                        <input type="button" class="resumable-browse btn btn-default" value="Browse your computer">
+                                        <input type="button" class="flow-browse btn btn-default" value="Browse your computer">
                                     </div>
                                 </div>
                             </div>
@@ -223,13 +380,14 @@ <h4 class="modal-title">Sample Metadata</h4>
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal">&times;</button>
-                        <h4 class="modal-title">Edit Sample Metadata</h4>
+                        <h4 class="edit-sample-title modal-title">Edit Sample Metadata</h4>
+                        <h4 class="edit-other-title modal-title">Edit Metadata for Additional Files</h4>
                     </div>
                     <div class="modal-body">
                         <form class="form-horizontal modal-sample-form">
                             <p>
                                 Check off <em>Edit All</em> to make changes across all the files included in this
-                                sample. Readset and library must be composed solely of letters, numbers, hyphens,
+                                group. Readset and library must be composed solely of letters, numbers, hyphens,
                                 and/or underscores. Sequencing metadata (except for readset) will not apply to file
                                 types detected as <em>Other</em>. Individual file types can be changed along with
                                 individual metadata by clicking the edit
@@ -265,9 +423,9 @@ <h4 class="modal-title">Edit Sample Metadata</h4>
                                 </label>
                             </div>
                             <div class="form-group">
-                                <label for="edit-sample-run-type" class="col-sm-3 control-label">Run Type</label>
+                                <label for="edit-sample-runType" class="col-sm-3 control-label">Run Type</label>
                                 <div class="col-sm-7">
-                                    <select class="form-control field-run-type" id="edit-sample-run-type" disabled>
+                                    <select class="form-control field-runType" id="edit-sample-runType" disabled>
                                         <option>Single End</option>
                                         <option>Paired End</option>
                                         <option selected>N/A</option>
@@ -279,9 +437,9 @@ <h4 class="modal-title">Edit Sample Metadata</h4>
                                 </label>
                             </div>
                             <div class="form-group">
-                                <label for="edit-sample-capture-kit" class="col-sm-3 control-label">Capture Kit</label>
+                                <label for="edit-sample-captureKit" class="col-sm-3 control-label">Capture Kit</label>
                                 <div class="col-sm-7">
-                                    <input class="typeahead form-control field-capture-kit" id="edit-sample-capture-kit" type="text" placeholder="Capture kit name" disabled>
+                                    <input class="typeahead form-control field-captureKit" id="edit-sample-captureKit" type="text" placeholder="Capture kit name" disabled>
                                 </div>
                                 <label class="col-sm-2 edit-checkbox">
                                      <input type="checkbox" value="">
@@ -369,7 +527,7 @@ <h4 class="modal-title">Edit File Metadata</h4>
                             <div class="form-group">
                                 <label class="col-sm-3 control-label">Run Type</label>
                                 <div class="col-sm-9">
-                                    <select class="form-control field-run-type" id="edit-file-run-type">
+                                    <select class="form-control field-runType" id="edit-file-runType">
                                         <option>Single End</option>
                                         <option>Paired End</option>
                                         <option>N/A</option>
@@ -379,7 +537,7 @@ <h4 class="modal-title">Edit File Metadata</h4>
                             <div class="form-group">
                                 <label class="col-sm-3 control-label">Capture Kit</label>
                                 <div class="col-sm-9">
-                                    <input class="typeahead form-control field-capture-kit" id="edit-file-capture-kit" type="text" placeholder="Capture kit name">
+                                    <input class="typeahead form-control field-captureKit" id="edit-file-captureKit" type="text" placeholder="Capture kit name">
                                 </div>
                             </div>
                             <div class="form-group">
@@ -442,70 +600,8 @@ <h4 class="modal-title">Upload Complete</h4>
             </div>
         </div>
 
-        <!-- Table showing the files currently sitting on the DCC -->
-        <div class="row col-sm-10 col-sm-offset-1 dcc-table">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <span class="collapse-icon glyphicon glyphicon-triangle-bottom pull-left"></span>
-                    <span class="collapse-icon glyphicon glyphicon-triangle-right pull-left" style="display: none;"></span>
-                    Uploaded Samples on the DCC
-                </div>
-                <div class="panel-body">
-                    <p>
-                        The samples below have been successfully uploaded to the DCC.
-                    </p>
-                </div>
-                <table class="table table-condensed table-data">
-                    <thead>
-                    <tr class="active">
-                        <th></th>
-                        <th class="files header" colspan="2">Files</th>
-                        <th class="type header">File Type</th>
-                        <th class="readset header">Readset</th>
-                        <th class="platform header">Platform</th>
-                        <th class="run-type header">Run Type</th>
-                        <th class="capture-kit header">Capture Kit</th>
-                        <th class="library header">Library</th>
-                        <th class="reference header">Reference</th>
-                        <th class="progress header">Status</th>
-                        <th class="option header">Options</th>
-                    </tr>
-                    </thead>
-                    <tbody class="sample-template sample-section">
-                    <tr class="sample-header-row sample-header-template">
-                        <td class="sample-collapse">
-                            <span class="sample-collapse-icon glyphicon glyphicon-folder-open"></span>
-                            <span class="sample-collapse-icon glyphicon glyphicon-folder-close" style="display: none;"></span>
-                        </td>
-                         <td class="sample-collapse"><span class="sample-name pull-left"></span></td>
-                        <td class="sample-collapse" colspan="8"></td>
-                        <td class="sample-collapse sample-option">
-                        </td>
-                    </tr>
-                    <tr class="sample-file-row sample-file-template">
-                        <td class="file-icon"><span class="glyphicon glyphicon-file pull-right"></span></td>
-                        <td class="cell" colspan="2"><span class="file-name"></span></td>
-                        <td class="file-type cell"></td>
-                        <td class="file-readset cell"></td>
-                        <td class="file-platform cell"></td>
-                        <td class="file-run-type cell"></td>
-                        <td class="file-capture-kit cell"></td>
-                        <td class="file-library cell"></td>
-                        <td class="file-reference cell"></td>
-                        <td class="file-progress progress cell">
-                            <div class="progress-bar progress-bar-striped active" role="progressbar"></div>
-                        </td>
-                        <td class="file-option option cell">
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-                 <div class="panel-footer"></div>
-            </div>
-        </div>
-
         <!-- Footer row -->
-        <div class="row col-sm-8 col-sm-offset-1 footer-row">
+        <div class="row col-sm-10 col-sm-offset-1 col-md-10 col-md-offset-1 footer-row">
             <div class="footer">
                 If you have any questions or run into issues, please email Orion
                 &lt;<a href="mailto:buske@cs.toronto.edu">buske@cs.toronto.edu</a>&gt;
@@ -515,6 +611,8 @@ <h4 class="modal-title">Upload Complete</h4>
         </div>
     </div>
 
+
+
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
             integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
diff --git a/server/utils.py b/server/utils.py
index 727238e..41aa054 100644
--- a/server/utils.py
+++ b/server/utils.py
@@ -188,8 +188,8 @@ def get_files_by_status(user_id, status):
                 'type': file_metadata[3],
                 'readset': file_metadata[4],
                 'platform': file_metadata[5],
-                'run-type': file_metadata[6],
-                'capture-kit': file_metadata[7],
+                'runType': file_metadata[6],
+                'captureKit': file_metadata[7],
                 'library': file_metadata[8],
                 'reference': file_metadata[9]
             }
@@ -228,9 +228,9 @@ def insert_file_metadata(form_dict):
 
 def update_file_metadata(form_dict):
     # Values that need to be updated in the db
-    update_keys = ['sample_name', 'filename', 'total_size', 'file_type', 'readset', 'platform', 'run_type',
-                   'capture_kit', 'library', 'reference']
-    update_dict = {}
+    update_keys = ['file_type', 'readset', 'platform', 'run_type', 'capture_kit', 'library',
+                   'reference', 'identifier']
+    update_dict = {'sample_name': form_dict['new_sample_name']}
     for key in update_keys:
         update_dict[key] = form_dict[key]
 
diff --git a/server/views.py b/server/views.py
index e1b0d97..7337b64 100755
--- a/server/views.py
+++ b/server/views.py
@@ -7,7 +7,7 @@
 from .database import connect_db
 from .utils import generate_auth_token, get_auth_status, get_auth_response, bam_test, \
     get_tempdir, get_chunk_filename, generate_file, remove_from_uploads, get_file_data, get_files_by_status, \
-    insert_file_metadata, update_file_status, get_user_by_auth_token
+    insert_file_metadata, update_file_metadata, update_file_status, get_user_by_auth_token
 
 
 def return_message(message, status_code):
@@ -62,10 +62,10 @@ def create_auth_token():
     # get server token from header (convert to str to fix weird encoding issue on production)
     server_token = request.headers.get('X-Server-Token', type=str)
     json_data = request.get_json()
-    user = str(json_data['user'])
-    name = str(json_data['name'])
-    email = str(json_data['email'])
-    duration = int(json_data['duration'])
+    user = str(json_data.get('user'))
+    name = str(json_data.get('name', ''))
+    email = str(json_data.get('email', ''))
+    duration = int(json_data.get('duration', 1))
 
     if not all([server_token, user]):
         return return_message('Error: missing parameter', 400)
@@ -116,6 +116,7 @@ def update_upload_status(auth_token, sample_name, identifier):
         'platform': request.form.get('platform', type=str, default=''),
         'capture_kit': request.form.get('captureKit', type=str, default=''),
         'reference': request.form.get('reference', type=str, default=''),
+        'new_sample_name': request.form.get('new-sample-name', type=str, default=sample_name),
     }
 
     if data['status'] == 'start':
@@ -128,6 +129,10 @@ def update_upload_status(auth_token, sample_name, identifier):
     elif data['status'] == 'complete':
         return generate_file(data)
 
+    elif data['status'] == 'update':
+        update_file_metadata(data)
+        return return_message('Success: Updated file metadata', 200)
+
     return return_message('Error: Unexpected status', 400)