diff --git a/assets/js/src/common/key_value_table.jsx b/assets/js/src/common/key_value_table.jsx
index bcda7fee7e..3293dd4a41 100644
--- a/assets/js/src/common/key_value_table.jsx
+++ b/assets/js/src/common/key_value_table.jsx
@@ -3,7 +3,7 @@ import React from 'react';
 const KeyValueTable = props => (
   <table className={'widefat fixed'} style={{ maxWidth: props.max_width }}>
     <tbody>
-      {props.children.map(row => (
+      {props.rows.map(row => (
         <tr key={`row_${row.key}`}>
           <td className={'row-title'}>{ row.key }</td><td>{ row.value }</td>
         </tr>
@@ -14,7 +14,7 @@ const KeyValueTable = props => (
 
 KeyValueTable.propTypes = {
   max_width: React.PropTypes.string,
-  children: React.PropTypes.arrayOf(React.PropTypes.shape({
+  rows: React.PropTypes.arrayOf(React.PropTypes.shape({
     key: React.PropTypes.string.isRequired,
     value: React.PropTypes.oneOfType([
       React.PropTypes.string,
diff --git a/assets/js/src/help/cron_status.jsx b/assets/js/src/help/cron_status.jsx
index e399302560..04b446cdde 100644
--- a/assets/js/src/help/cron_status.jsx
+++ b/assets/js/src/help/cron_status.jsx
@@ -12,32 +12,35 @@ const CronStatus = (props) => {
   return (
     <div>
       <h2>{MailPoet.I18n.t('systemStatusCronStatusTitle')}</h2>
-      <KeyValueTable max_width={'400px'}>{[
-        {
-          key: MailPoet.I18n.t('accessible'),
-          value: <PrintBoolean>{status.accessible}</PrintBoolean>,
-        },
-        {
-          key: MailPoet.I18n.t('status'),
-          value: activeStatusMapping[status.status] ? activeStatusMapping[status.status] : MailPoet.I18n.t('unknown'),
-        },
-        {
-          key: MailPoet.I18n.t('lastUpdated'),
-          value: status.updated_at ? MailPoet.Date.full(status.updated_at * 1000) : MailPoet.I18n.t('unknown'),
-        },
-        {
-          key: MailPoet.I18n.t('lastRunStarted'),
-          value: status.run_accessed_at ? MailPoet.Date.full(status.run_started_at * 1000) : MailPoet.I18n.t('unknown'),
-        },
-        {
-          key: MailPoet.I18n.t('lastRunCompleted'),
-          value: status.run_completed_at ? MailPoet.Date.full(status.run_completed_at * 1000) : MailPoet.I18n.t('unknown'),
-        },
-        {
-          key: MailPoet.I18n.t('lastSeenError'),
-          value: status.last_error || MailPoet.I18n.t('none'),
-        }]}
-      </KeyValueTable>
+      <KeyValueTable
+        max_width={'400px'}
+        rows={[
+          {
+            key: MailPoet.I18n.t('accessible'),
+            value: <PrintBoolean>{status.accessible}</PrintBoolean>,
+          },
+          {
+            key: MailPoet.I18n.t('status'),
+            value: activeStatusMapping[status.status] ? activeStatusMapping[status.status] : MailPoet.I18n.t('unknown'),
+          },
+          {
+            key: MailPoet.I18n.t('lastUpdated'),
+            value: status.updated_at ? MailPoet.Date.full(status.updated_at * 1000) : MailPoet.I18n.t('unknown'),
+          },
+          {
+            key: MailPoet.I18n.t('lastRunStarted'),
+            value: status.run_accessed_at ? MailPoet.Date.full(status.run_started_at * 1000) : MailPoet.I18n.t('unknown'),
+          },
+          {
+            key: MailPoet.I18n.t('lastRunCompleted'),
+            value: status.run_completed_at ? MailPoet.Date.full(status.run_completed_at * 1000) : MailPoet.I18n.t('unknown'),
+          },
+          {
+            key: MailPoet.I18n.t('lastSeenError'),
+            value: status.last_error || MailPoet.I18n.t('none'),
+          },
+        ]}
+      />
     </div>
   );
 };
diff --git a/assets/js/src/help/queue_status.jsx b/assets/js/src/help/queue_status.jsx
index 3014573993..1e91893917 100644
--- a/assets/js/src/help/queue_status.jsx
+++ b/assets/js/src/help/queue_status.jsx
@@ -9,40 +9,42 @@ const QueueStatus = (props) => {
   return (
     <div>
       <h2>{MailPoet.I18n.t('systemStatusQueueTitle')}</h2>
-      <KeyValueTable max_width={'400px'}>{
-        [{
-          key: MailPoet.I18n.t('status'),
-          value: status.status === 'paused' ? MailPoet.I18n.t('paused') : MailPoet.I18n.t('running'),
-        }, {
-          key: MailPoet.I18n.t('startedAt'),
-          value: status.started ? MailPoet.Date.full(status.started * 1000) : MailPoet.I18n.t('unknown'),
-        }, {
-          key: MailPoet.I18n.t('sentEmails'),
-          value: status.sent || 0,
-        }, {
-          key: MailPoet.I18n.t('retryAttempt'),
-          value: status.retry_attempt || MailPoet.I18n.t('none'),
-        }, {
-          key: MailPoet.I18n.t('retryAt'),
-          value: status.retry_at ? MailPoet.Date.full(status.retry_at * 1000) : MailPoet.I18n.t('none'),
-        }, {
-          key: MailPoet.I18n.t('error'),
-          value: status.error || MailPoet.I18n.t('none'),
-        }, {
-          key: MailPoet.I18n.t('totalCompletedTasks'),
-          value: status.tasksStatusCounts.completed,
-        }, {
-          key: MailPoet.I18n.t('totalRunningTasks'),
-          value: status.tasksStatusCounts.running,
-        }, {
-          key: MailPoet.I18n.t('totalPausedTasks'),
-          value: status.tasksStatusCounts.paused,
-        }, {
-          key: MailPoet.I18n.t('totalScheduledTasks'),
-          value: status.tasksStatusCounts.scheduled,
-        }]}
-      </KeyValueTable>
-
+      <KeyValueTable
+        max_width={'400px'}
+        rows={[
+          {
+            key: MailPoet.I18n.t('status'),
+            value: status.status === 'paused' ? MailPoet.I18n.t('paused') : MailPoet.I18n.t('running'),
+          }, {
+            key: MailPoet.I18n.t('startedAt'),
+            value: status.started ? MailPoet.Date.full(status.started * 1000) : MailPoet.I18n.t('unknown'),
+          }, {
+            key: MailPoet.I18n.t('sentEmails'),
+            value: status.sent || 0,
+          }, {
+            key: MailPoet.I18n.t('retryAttempt'),
+            value: status.retry_attempt || MailPoet.I18n.t('none'),
+          }, {
+            key: MailPoet.I18n.t('retryAt'),
+            value: status.retry_at ? MailPoet.Date.full(status.retry_at * 1000) : MailPoet.I18n.t('none'),
+          }, {
+            key: MailPoet.I18n.t('error'),
+            value: status.error || MailPoet.I18n.t('none'),
+          }, {
+            key: MailPoet.I18n.t('totalCompletedTasks'),
+            value: status.tasksStatusCounts.completed,
+          }, {
+            key: MailPoet.I18n.t('totalRunningTasks'),
+            value: status.tasksStatusCounts.running,
+          }, {
+            key: MailPoet.I18n.t('totalPausedTasks'),
+            value: status.tasksStatusCounts.paused,
+          }, {
+            key: MailPoet.I18n.t('totalScheduledTasks'),
+            value: status.tasksStatusCounts.scheduled,
+          },
+        ]}
+      />
       <h4>{MailPoet.I18n.t('scheduledTasks')}</h4>
       <TasksList show_scheduled_at tasks={status.latestTasks.filter(task => (task.status === 'scheduled'))} />