diff --git a/packages/component-dashboard/src/components/Reviews.js b/packages/component-dashboard/src/components/Reviews.js
index dde994ec29cd3577fb9d28d23743adcaa9e8452d..dcd7ea5132c5823567a19b1b34a81a726f0e92f7 100644
--- a/packages/component-dashboard/src/components/Reviews.js
+++ b/packages/component-dashboard/src/components/Reviews.js
@@ -8,7 +8,10 @@ const Reviews = ({ reviews }) => (
   <div className={classes.root}>
     {['invited', 'accepted', 'rejected', 'completed'].map(status => (
       <span className={classes.badge} key={status}>
-        <Badge count={reviews[status].length} label={status} />
+        <Badge
+          count={reviews[status] ? reviews[status].length : 0}
+          label={status}
+        />
       </span>
     ))}
   </div>
diff --git a/packages/component-dashboard/src/components/sections/ReviewerItem.js b/packages/component-dashboard/src/components/sections/ReviewerItem.js
index b9381c6164ce0c3d4396473474949331d1a99e29..ccaff873f034c1a1cafc9f751321738641b36d2e 100644
--- a/packages/component-dashboard/src/components/sections/ReviewerItem.js
+++ b/packages/component-dashboard/src/components/sections/ReviewerItem.js
@@ -19,7 +19,7 @@ const ReviewerItem = ({ project, version, currentUser, reviewerResponse }) => {
         <VersionTitle className={classes.versionTitle} version={version} />
 
         {reviewer && (
-          <div>
+          <div className={classes.links}>
             {reviewer.status === 'accepted' && (
               <div className={classes.links}>
                 <div className={classes.link}>
@@ -60,8 +60,8 @@ const ReviewerItem = ({ project, version, currentUser, reviewerResponse }) => {
                 </div>
               </div>
             )}
-
-            {reviewer.status === 'rejected' && <div>rejected</div>}
+            {reviewer.status === 'completed' && 'completed'}
+            {reviewer.status === 'rejected' && 'rejected'}
           </div>
         )}
       </div>