diff --git a/packages/component-faraday-ui/src/ContextualBox.js b/packages/component-faraday-ui/src/ContextualBox.js
index 188d9a4a38cf3d9c215be5b1da47e778b5d41d68..d8ab44a43e961f2b62faa74e684b69092f85db90 100644
--- a/packages/component-faraday-ui/src/ContextualBox.js
+++ b/packages/component-faraday-ui/src/ContextualBox.js
@@ -34,7 +34,14 @@ const CustomHeader = ({
   </Header>
 )
 
-const ContextualBox = ({ label, children, rightChildren, ...props }) =>
+const ContextualBox = ({
+  label,
+  children,
+  rightChildren,
+  toggle,
+  expanded,
+  ...props
+}) =>
   !isUndefined(props.expanded) ? (
     <ControlledAccordion
       header={CustomHeader}
@@ -75,8 +82,8 @@ ContextualBox.propTypes = {
 ContextualBox.defaultProps = {
   label: '',
   rightChildren: undefined,
-  expanded: false,
-  toggle: () => {},
+  toggle: undefined,
+  expanded: undefined,
 }
 
 // #region styles
diff --git a/packages/component-faraday-ui/src/EditorialReportCard.js b/packages/component-faraday-ui/src/EditorialReportCard.js
index 649beafe62774e2832120318dedae476ce7d43bb..cceeda0b66b9da909a5bfa0b4c105ff64d753a8a 100644
--- a/packages/component-faraday-ui/src/EditorialReportCard.js
+++ b/packages/component-faraday-ui/src/EditorialReportCard.js
@@ -28,7 +28,6 @@ const EditorialReportCard = ({
         <Label mb={1 / 2}>
           {editorRole === 'HE' ? 'Recommendation' : 'Decision'}
         </Label>
-        )
         <Text>{recommendation}</Text>
       </Item>
 
diff --git a/packages/component-manuscript/src/components/ManuscriptPage.js b/packages/component-manuscript/src/components/ManuscriptPage.js
index 9b9a3cf79ea7c0111972b05ddffdcded7a430ac3..5d651d03a2727b35a30d4abe02f4336867f44718 100644
--- a/packages/component-manuscript/src/components/ManuscriptPage.js
+++ b/packages/component-manuscript/src/components/ManuscriptPage.js
@@ -368,10 +368,8 @@ export default compose(
         fetchUpdatedCollection,
         editorialRecommendations,
         fragment,
-        collection: { status },
         currentUser: {
           isEIC,
-          isReviewer,
           isInvitedHE,
           isInvitedToReview,
           isHEToManuscript,
@@ -398,15 +396,6 @@ export default compose(
         setEditorInChief(head(res.users)),
       )
 
-      if (isEIC && status === 'pendingApproval') {
-        this.props.toggleEicDecision()
-      }
-      if (isReviewer && status === 'reviewCompleted')
-        this.props.toggleReviewReport()
-
-      if (isHEToManuscript && status === 'reviewCompleted')
-        this.props.toggleHERecommentation()
-
       if (canInviteReviewers) {
         getPublonsReviewers(fragmentId, setError)
       }
diff --git a/packages/component-manuscript/src/components/ReviewerReports.js b/packages/component-manuscript/src/components/ReviewerReports.js
index 3533cbf907017038acf759d4e8e0f575749bc42c..8402e94315d4e5a5e3d49fec1d4b4305979cd66d 100644
--- a/packages/component-manuscript/src/components/ReviewerReports.js
+++ b/packages/component-manuscript/src/components/ReviewerReports.js
@@ -17,7 +17,6 @@ const SubmittedReports = ({ reports }) => (
       {reports}
     </Text>
     <Text mr={1 / 2} pr={1 / 2} secondary>
-      {' '}
       submitted
     </Text>
   </Row>