diff --git a/packages/component-manuscript/src/components/ReviewerReportForm.js b/packages/component-manuscript/src/components/ReviewerReportForm.js
index 542d92c253a36a2645c432b87c36f3b22e597fdd..b8ca662a4109bdd916cf195c0690bda6bc6e1c17 100644
--- a/packages/component-manuscript/src/components/ReviewerReportForm.js
+++ b/packages/component-manuscript/src/components/ReviewerReportForm.js
@@ -93,7 +93,6 @@ const ReviewerReportForm = ({
       />
     </Row>
     <Spacing />
-    <Spacing />
     <Row left>
       <Label>Report</Label>
       {!fileFetching.review ? (
@@ -112,7 +111,7 @@ const ReviewerReportForm = ({
       )}
     </Row>
     <Row>
-      <FullWidth>
+      <FullWidth className="full-width">
         <ValidatedField
           component={TextAreaField}
           name="public"
@@ -122,7 +121,6 @@ const ReviewerReportForm = ({
     </Row>
     {formValues.files && (
       <Fragment>
-        <Spacing />
         <Row left>
           {formValues.files.map(file => (
             <FileItem
@@ -318,7 +316,7 @@ const Textarea = styled.textarea`
 
 const Spacing = styled.div`
   flex: 1;
-  margin-top: ${th('gridUnit')};
+  margin-top: calc(${th('gridUnit')} / 2);
 `
 
 const FullWidth = styled.div`
@@ -337,6 +335,10 @@ const Row = styled.div`
   flex: 1;
   flex-wrap: wrap;
   justify-content: ${({ left }) => (left ? 'left' : 'space-between')};
+
+  div[role='alert'] {
+    margin-top: 0;
+  }
 `
 
 const ActionButton = styled(Button)`
diff --git a/packages/components-faraday/src/components/SignUp/ReviewerInviteDecision.js b/packages/components-faraday/src/components/SignUp/ReviewerInviteDecision.js
index 8bc8a1e6e11d95e3d425f6ae211028d12b1c88c7..f55c227cc963ce9101dde08b522e239cd43c15ee 100644
--- a/packages/components-faraday/src/components/SignUp/ReviewerInviteDecision.js
+++ b/packages/components-faraday/src/components/SignUp/ReviewerInviteDecision.js
@@ -43,7 +43,7 @@ const ReviewerInviteDecision = ({
     {agree === 'true' && (
       <FormContainer onSubmit={handleSubmit}>
         <Row>
-          <RowItem>
+          <RowItem vertical>
             <Label> Password </Label>
             <ValidatedField
               component={PasswordField}