diff --git a/packages/component-faraday-ui/src/WizardFiles.js b/packages/component-faraday-ui/src/WizardFiles.js
index a95da12f3d7ae27404d72591b04baf6a57057689..ca5112d5187c7058ec95cf920a7e5800acf4041a 100644
--- a/packages/component-faraday-ui/src/WizardFiles.js
+++ b/packages/component-faraday-ui/src/WizardFiles.js
@@ -82,7 +82,7 @@ export default compose(
       })
     },
     downloadFile: ({ downloadFile, token }) => file => {
-      downloadFile({ fileId: file.id, token, fileName: file.name })
+      downloadFile(file)
     },
     deleteFile: ({ deleteFile, files, setFormFiles }) => type => file => {
       deleteFile(file.id, type).then(() => {
diff --git a/packages/component-faraday-ui/src/helpers/withFileDownload.js b/packages/component-faraday-ui/src/helpers/withFileDownload.js
index 8ed0e5fac29b49e451b257208f9a20ab446a8747..2285f8e0abc0bcb42bed06c49eee072df4226830 100644
--- a/packages/component-faraday-ui/src/helpers/withFileDownload.js
+++ b/packages/component-faraday-ui/src/helpers/withFileDownload.js
@@ -25,9 +25,9 @@ const removeAnchorElement = (a, url) => {
 }
 
 export const withFileDownload = withHandlers({
-  downloadFile: () => ({ fileId, token, fileName = 'file' }) => {
+  downloadFile: ({ token }) => file => {
     if (!token) return
-
+    const { id: fileId, name: fileName } = file
     const fileURL = `${
       window.location.origin
     }/api/files/${fileId}?${qs.stringify({
diff --git a/packages/component-faraday-ui/src/index.js b/packages/component-faraday-ui/src/index.js
index a7b1716c4f46d0595346576addc6cd618184d1ed..71413c78b0f10310aa085f19d5f8dabbcd6974f5 100644
--- a/packages/component-faraday-ui/src/index.js
+++ b/packages/component-faraday-ui/src/index.js
@@ -23,10 +23,6 @@ export { default as WizardAuthors } from './WizardAuthors'
 export { default as WizardFiles } from './WizardFiles'
 export { default as PreviewFile } from './PreviewFile'
 export { default as DownloadZipFiles } from './DownloadZipFiles'
-export { default as ManuscriptVersion } from './ManuscriptVersion'
-export { default as ManuscriptHeader } from './ManuscriptHeader'
-export { default as ManuscriptMetadata } from './ManuscriptMetadata'
-export { default as ManuscriptFileList } from './ManuscriptFileList'
 
 // Manuscript Details
 export * from './manuscriptDetails'
diff --git a/packages/component-faraday-ui/src/ManuscriptFileList.js b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.js
similarity index 97%
rename from packages/component-faraday-ui/src/ManuscriptFileList.js
rename to packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.js
index 74b5eb01e384837219740b4bc2a33414edf3faeb..3d139b5c248697eef3af4f9e47aa167485d8b7df 100644
--- a/packages/component-faraday-ui/src/ManuscriptFileList.js
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.js
@@ -1,7 +1,7 @@
 import React, { Fragment } from 'react'
 import { Text, FileItem, Item, Row } from 'pubsweet-component-faraday-ui'
 
-import { withFilePreview, withFileDownload } from './helpers'
+import { withFilePreview, withFileDownload } from '../helpers'
 
 const ManuscriptFileList = ({
   files: { manuscripts = [], coverLetter = [], supplementary = [] },
diff --git a/packages/component-faraday-ui/src/ManuscriptFileList.md b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.md
similarity index 100%
rename from packages/component-faraday-ui/src/ManuscriptFileList.md
rename to packages/component-faraday-ui/src/manuscriptDetails/ManuscriptFileList.md
diff --git a/packages/component-faraday-ui/src/ManuscriptHeader.js b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
similarity index 100%
rename from packages/component-faraday-ui/src/ManuscriptHeader.js
rename to packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
diff --git a/packages/component-faraday-ui/src/ManuscriptHeader.md b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.md
similarity index 100%
rename from packages/component-faraday-ui/src/ManuscriptHeader.md
rename to packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.md
diff --git a/packages/component-faraday-ui/src/ManuscriptMetadata.js b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptMetadata.js
similarity index 83%
rename from packages/component-faraday-ui/src/ManuscriptMetadata.js
rename to packages/component-faraday-ui/src/manuscriptDetails/ManuscriptMetadata.js
index 2978f4269543403927e8117402111620ad39dde3..911feef484e5a25e9c96dcbd73e6e744b4879ee0 100644
--- a/packages/component-faraday-ui/src/ManuscriptMetadata.js
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptMetadata.js
@@ -10,6 +10,7 @@ import {
 
 const ManuscriptMetadata = ({
   getSignedUrl,
+  currentUser: { token },
   fragment: {
     files = {},
     authors = [],
@@ -20,7 +21,7 @@ const ManuscriptMetadata = ({
   <Fragment>
     {!!abstract && (
       <Item mb={1}>
-        <ContextualBox label="Abstract" transparent>
+        <ContextualBox label="Abstract" startExpanded transparent>
           <Text dangerouslySetInnerHTML={{ __html: abstract }} mb={1} mt={1} />
         </ContextualBox>
       </Item>
@@ -44,7 +45,11 @@ const ManuscriptMetadata = ({
             files.supplementary.length})`}
           transparent
         >
-          <ManuscriptFileList files={files} getSignedUrl={getSignedUrl} />
+          <ManuscriptFileList
+            files={files}
+            getSignedUrl={getSignedUrl}
+            token={token}
+          />
         </ContextualBox>
       </Item>
     )}
diff --git a/packages/component-faraday-ui/src/ManuscriptMetadata.md b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptMetadata.md
similarity index 95%
rename from packages/component-faraday-ui/src/ManuscriptMetadata.md
rename to packages/component-faraday-ui/src/manuscriptDetails/ManuscriptMetadata.md
index 432cebaf3fe259ca28d1a73a5abab91e43e1316d..81ab9d0f560cf9ce83909a058504ae8b322628a6 100644
--- a/packages/component-faraday-ui/src/ManuscriptMetadata.md
+++ b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptMetadata.md
@@ -33,5 +33,5 @@ const fragment = {
     supplementary: [],
   },
 }
-;<ManuscriptMetadata fragment={fragment} />
+;<ManuscriptMetadata fragment={fragment} currentUser={{}}/>
 ```
diff --git a/packages/component-faraday-ui/src/ManuscriptVersion.js b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptVersion.js
similarity index 100%
rename from packages/component-faraday-ui/src/ManuscriptVersion.js
rename to packages/component-faraday-ui/src/manuscriptDetails/ManuscriptVersion.js
diff --git a/packages/component-faraday-ui/src/ManuscriptVersion.md b/packages/component-faraday-ui/src/manuscriptDetails/ManuscriptVersion.md
similarity index 100%
rename from packages/component-faraday-ui/src/ManuscriptVersion.md
rename to packages/component-faraday-ui/src/manuscriptDetails/ManuscriptVersion.md
diff --git a/packages/component-faraday-ui/src/manuscriptDetails/index.js b/packages/component-faraday-ui/src/manuscriptDetails/index.js
index 624245e73e1a08239472c700fb5436d94eb8d8f7..ea34a18be9fb673206f473a83a9ec5e92d1f2576 100644
--- a/packages/component-faraday-ui/src/manuscriptDetails/index.js
+++ b/packages/component-faraday-ui/src/manuscriptDetails/index.js
@@ -1 +1,5 @@
 export { default as ManuscriptDetailsTop } from './ManuscriptDetailsTop'
+export { default as ManuscriptVersion } from './ManuscriptVersion'
+export { default as ManuscriptHeader } from './ManuscriptHeader'
+export { default as ManuscriptMetadata } from './ManuscriptMetadata'
+export { default as ManuscriptFileList } from './ManuscriptFileList'
diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js
index 8120863b821bce25713a39cea7f39066644ca99f..aeca22f0ab50d97a744212cd7a164c07ee16d808 100644
--- a/packages/component-manuscript/src/components/ManuscriptLayout.js
+++ b/packages/component-manuscript/src/components/ManuscriptLayout.js
@@ -38,7 +38,11 @@ const ManuscriptLayout = ({
           fragment={fragment}
           journal={journal}
         />
-        <ManuscriptMetadata fragment={fragment} getSignedUrl={getSignedUrl} />
+        <ManuscriptMetadata
+          currentUser={currentUser}
+          fragment={fragment}
+          getSignedUrl={getSignedUrl}
+        />
       </Fragment>
     ) : (
       <Text>Loading...</Text>
diff --git a/packages/xpub-faraday/app/FaradayApp.js b/packages/xpub-faraday/app/FaradayApp.js
index 4b2e91eb2f832494b9ccb224dd73ce14bd99304d..10ebbe7f7fd3f451f90b8a8c5e140d21a46111e0 100644
--- a/packages/xpub-faraday/app/FaradayApp.js
+++ b/packages/xpub-faraday/app/FaradayApp.js
@@ -63,7 +63,7 @@ const MainContainer = styled.div`
   display: flex;
   flex-direction: column;
   overflow-y: auto;
-  padding: 0 calc(${th('gridUnit')} * 10);
+  padding: 0 calc(${th('gridUnit')} * 12);
   padding-top: calc(${th('appBar.height')} + ${th('gridUnit')} * 3 )};
 `
 // #endregion