diff --git a/app/components/component-review/src/components/review/ReviewForm.js b/app/components/component-review/src/components/review/ReviewForm.js
index f742b665fc82fb86344825b08bff0ed448b5c05d..1b78959455d5212c3002ab6c867c568de5cfc1db 100644
--- a/app/components/component-review/src/components/review/ReviewForm.js
+++ b/app/components/component-review/src/components/review/ReviewForm.js
@@ -7,7 +7,6 @@ import { JournalContext } from '../../../../xpub-journal/src'
 import { reviewWithComment } from './util'
 import {
   AdminSection,
-  Container,
   Title,
   SectionHeader,
   SectionRowGrid,
@@ -15,47 +14,8 @@ import {
   SectionAction,
   RecommendationInputContainer,
 } from '../style'
-import { FilesUpload } from '../../../../shared'
 
-// const AttachmentsInput = ({
-//   field,
-//   form: { values },
-//   updateReview,
-//   uploadFile,
-//   type,
-// }) => (
-//   <>
-//     <UploadButton
-//       buttonText="↑ Upload files"
-//       onChange={event => {
-//         const val = event.target.files[0]
-//         const file = cloneDeep(val)
-//         file.filename = val.name
-//         file.type = type
-
-//         const { updateIndex, comment } = createComments(
-//           values,
-//           { files: [file] },
-//           type,
-//         )
-
-//         const data = cloneDeep(values)
-//         set(data, `comments.${updateIndex}`, comment)
-
-//         updateReview(data).then(({ data: { updateReview } }) => {
-//           uploadFile(val, updateReview, type)
-//         })
-//       }}
-//     />
-//     <Flexbox>
-//       {getCommentFiles(values, type).map(val => {
-//         const file = cloneDeep(val)
-//         file.name = file.filename
-//         return <UploadingFile file={file} key={file.name} uploaded />
-//       })}
-//     </Flexbox>
-//   </>
-// )
+import { SectionContent, FilesUpload } from '../../../../shared'
 
 const NoteInput = ({
   field,
@@ -200,7 +160,7 @@ const ReviewForm = ({
   uploadFile,
   review,
 }) => (
-  <Container>
+  <SectionContent>
     <form onSubmit={handleSubmit}>
       <AdminSection>
         <SectionHeader>
@@ -230,7 +190,7 @@ const ReviewForm = ({
         </SectionRowGrid>
       </AdminSection>
     </form>
-  </Container>
+  </SectionContent>
 )
 
 export default ReviewForm
diff --git a/app/components/component-review/src/components/review/ReviewLayout.js b/app/components/component-review/src/components/review/ReviewLayout.js
index 53b1bdd2a8c8e211e17b5df382addec486eecc61..e05244a672724ffc01695159d17c1fb6a11456d0 100644
--- a/app/components/component-review/src/components/review/ReviewLayout.js
+++ b/app/components/component-review/src/components/review/ReviewLayout.js
@@ -7,7 +7,7 @@ import ReviewForm from './ReviewForm'
 import ReviewMetadata from '../metadata/ReviewMetadata'
 import Review from './Review'
 import EditorSection from '../decision/EditorSection'
-import { Columns, Manuscript, Chat } from '../style'
+import { Columns, Manuscript, Chat } from '../../../../shared'
 import MessageContainer from '../../../../component-chat/src'
 
 const addEditor = (manuscript, label) => ({