diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e602d0f47c8537e0439236574f4864cd5e9f480..eee5d81c40ed9b11643915af5df773f7672689b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,7 +51,7 @@ test:
 #   only:
 #   - master
 
-demo:now:
+demo:qa:
   image: $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
   stage: demo
   when: manual
@@ -60,11 +60,29 @@ demo:now:
   only:
     - master
   environment:
-    name: $PACKAGE_NAME/demo
-    url: https://xpub-faraday.now.sh/
+    name: qa/$PACKAGE_NAME
+    url: https://xpub-faraday-qa.now.sh/
   script:
     - npm i -g --unsafe-perm now
     - cd ${HOME}/now
     - echo "FROM ${IMAGE_ORG}/${IMAGE_NAME}:${CI_COMMIT_SHA}" >> Dockerfile
     - now --public --docker --token $NOW_TOKEN -e AWS_S3_ACCESS_KEY=$AWS_S3_ACCESS_KEY -e AWS_S3_SECRET_KEY=$AWS_S3_SECRET_KEY -e AWS_S3_REGION=$AWS_S3_REGION -e AWS_S3_BUCKET=$AWS_S3_BUCKET -e AWS_SES_SECRET_KEY=$AWS_SES_SECRET_KEY -e AWS_SES_ACCESS_KEY=$AWS_SES_ACCESS_KEY -e AWS_SES_REGION=$AWS_SES_REGION -e EMAIL_SENDER=$EMAIL_SENDER -e secret=$SECRET -e DATABASE=$DATABASE -e DB_USER=$DB_USER -e DB_PASS=$DB_PASS -e DB_HOST=$DB_HOST
+    - now alias $NOW_URL xpub-faraday-qa --token $NOW_TOKEN
+
+demo:staging:
+  image: $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
+  stage: demo
+  when: manual
+  variables:
+    PACKAGE_NAME: xpub-faraday
+  only:
+    - master
+  environment:
+    name: demo/$PACKAGE_NAME
+    url: https://xpub-faraday.now.sh/
+  script:
+    - npm i -g --unsafe-perm now
+    - cd ${HOME}/now
+    - echo "FROM ${IMAGE_ORG}/${IMAGE_NAME}:${CI_COMMIT_SHA}" >> Dockerfile
+    - now --public --docker --token $NOW_TOKEN -e AWS_S3_ACCESS_KEY=$AWS_S3_ACCESS_KEY -e AWS_S3_SECRET_KEY=$AWS_S3_SECRET_KEY -e AWS_S3_REGION=$AWS_S3_REGION -e AWS_S3_BUCKET=$AWS_S3_BUCKET -e AWS_SES_SECRET_KEY=$AWS_SES_SECRET_KEY -e AWS_SES_ACCESS_KEY=$AWS_SES_ACCESS_KEY -e AWS_SES_REGION=$AWS_SES_REGION -e EMAIL_SENDER=$EMAIL_SENDER -e secret=$SECRET -e DATABASE=$DATABASE_STAGING -e DB_USER=$DB_USER_STAGING -e DB_PASS=$DB_PASS_STAGING -e DB_HOST=$DB_HOST_STAGING
     - now alias $NOW_URL xpub-faraday --token $NOW_TOKEN
\ No newline at end of file
diff --git a/packages/components-faraday/src/components/Dashboard/DashboardCard.js b/packages/components-faraday/src/components/Dashboard/DashboardCard.js
index ab0f8adba45807c0e82005382e536a3fbd8e884d..721143e1a18c18cc6cc0d6cca7b6d57db62dcd13 100644
--- a/packages/components-faraday/src/components/Dashboard/DashboardCard.js
+++ b/packages/components-faraday/src/components/Dashboard/DashboardCard.js
@@ -31,7 +31,7 @@ const DashboardCard = ({
   ...rest
 }) => {
   const { submitted, title, type } = parseVersion(version)
-  const status = get(project, 'status') || 'Draft'
+  const status = get(project, 'status')
   const metadata = get(version, 'metadata')
   const files = get(version, 'files')
   const customId = project.customId || project.id.split('-')[0]
@@ -130,8 +130,7 @@ const DashboardCard = ({
                       {firstName} {middleName} {lastName}
                     </AuthorName>
                     {isSubmitting && <AuthorStatus>SA</AuthorStatus>}
-                    {isCorresponding &&
-                      !isSubmitting && <AuthorStatus>CA</AuthorStatus>}
+                    {isCorresponding && <AuthorStatus>CA</AuthorStatus>}
                     {arr.length - 1 === index ? '' : ','}
                   </Author>
                 ),
@@ -174,7 +173,7 @@ export default compose(
           return <EditorInChiefActions project={project} />
         if (status === 'under-review')
           return <AssignedHE>{get(assignedHE, 'name')}</AssignedHE>
-        return <div>bine bulanes</div>
+        return <div />
       }
 
       if (isHe) {
diff --git a/packages/components-faraday/src/components/Dashboard/utils.js b/packages/components-faraday/src/components/Dashboard/utils.js
index 6a006693279d0bf54d5b2ca48a670e7253323f8e..86a56611039076808f0977ad68b8639736d0e31b 100644
--- a/packages/components-faraday/src/components/Dashboard/utils.js
+++ b/packages/components-faraday/src/components/Dashboard/utils.js
@@ -78,11 +78,11 @@ export const parseJournalIssue = (journal, metadata) =>
 export const mapStatusToLabel = status => {
   switch (status) {
     case 'he-invited':
-      return 'Handling Editor Invited'
+      return 'Handling Editor Assigned'
     case 'submitted':
       return 'Submitted'
     case 'under-review':
-      return 'Under review'
+      return 'Under Review'
     default:
       return 'Draft'
   }