diff --git a/console/src/components/Services/EventTrigger/EventActions.js b/console/src/components/Services/EventTrigger/EventActions.js
index d85a6edf1e2..e3277f85058 100644
--- a/console/src/components/Services/EventTrigger/EventActions.js
+++ b/console/src/components/Services/EventTrigger/EventActions.js
@@ -195,7 +195,7 @@ const loadEventLogs = triggerName => (dispatch, getState) => {
         ],
         where: { event: { trigger_name: triggerName } },
         order_by: ['-created_at'],
-        limit: 20,
+        limit: 10,
       },
     }),
   };
diff --git a/console/src/components/Services/EventTrigger/PendingEvents/ViewRows.js b/console/src/components/Services/EventTrigger/PendingEvents/ViewRows.js
index 85bec104191..699096eb32f 100644
--- a/console/src/components/Services/EventTrigger/PendingEvents/ViewRows.js
+++ b/console/src/components/Services/EventTrigger/PendingEvents/ViewRows.js
@@ -313,12 +313,12 @@ const ViewRows = ({
                     showPagination={false}
                     SubComponent={logRow => {
                       const finalIndex = logRow.index;
+                      const finalRow = currentRow.logs[finalIndex];
                       const currentPayload = JSON.stringify(
-                        currentRow.payload,
+                        finalRow.request,
                         null,
                         4
                       );
-                      const finalRow = currentRow.logs[finalIndex];
                       const finalResponse = JSON.parse(
                         JSON.stringify(finalRow.response, null, 4)
                       );
diff --git a/console/src/components/Services/EventTrigger/ProcessedEvents/ViewRows.js b/console/src/components/Services/EventTrigger/ProcessedEvents/ViewRows.js
index 5797ca500d6..04230978ab1 100644
--- a/console/src/components/Services/EventTrigger/ProcessedEvents/ViewRows.js
+++ b/console/src/components/Services/EventTrigger/ProcessedEvents/ViewRows.js
@@ -306,12 +306,12 @@ const ViewRows = ({
                     showPagination={false}
                     SubComponent={logRow => {
                       const finalIndex = logRow.index;
+                      const finalRow = currentRow.logs[finalIndex];
                       const currentPayload = JSON.stringify(
-                        currentRow.payload,
+                        finalRow.request,
                         null,
                         4
                       );
-                      const finalRow = currentRow.logs[finalIndex];
                       // check if response is type JSON
                       let finalResponse = finalRow.response;
                       try {
diff --git a/console/src/components/Services/EventTrigger/RunningEvents/ViewRows.js b/console/src/components/Services/EventTrigger/RunningEvents/ViewRows.js
index 85bec104191..699096eb32f 100644
--- a/console/src/components/Services/EventTrigger/RunningEvents/ViewRows.js
+++ b/console/src/components/Services/EventTrigger/RunningEvents/ViewRows.js
@@ -313,12 +313,12 @@ const ViewRows = ({
                     showPagination={false}
                     SubComponent={logRow => {
                       const finalIndex = logRow.index;
+                      const finalRow = currentRow.logs[finalIndex];
                       const currentPayload = JSON.stringify(
-                        currentRow.payload,
+                        finalRow.request,
                         null,
                         4
                       );
-                      const finalRow = currentRow.logs[finalIndex];
                       const finalResponse = JSON.parse(
                         JSON.stringify(finalRow.response, null, 4)
                       );
diff --git a/console/src/components/Services/EventTrigger/Schema/Schema.js b/console/src/components/Services/EventTrigger/Schema/Schema.js
index 58a318727e8..c70067f42b6 100644
--- a/console/src/components/Services/EventTrigger/Schema/Schema.js
+++ b/console/src/components/Services/EventTrigger/Schema/Schema.js
@@ -46,7 +46,7 @@ class Schema extends Component {
                   dispatch(push(`${appPrefix}/manage/triggers/add`));
                 }}
               >
-                Create
+                Create Trigger
               </button>
             ) : null}
           </div>
diff --git a/console/src/components/Services/EventTrigger/StreamingLogs/LogActions.js b/console/src/components/Services/EventTrigger/StreamingLogs/LogActions.js
index b95caaa0ed1..94b5d87cbf5 100644
--- a/console/src/components/Services/EventTrigger/StreamingLogs/LogActions.js
+++ b/console/src/components/Services/EventTrigger/StreamingLogs/LogActions.js
@@ -95,7 +95,7 @@ const streamingLogsReducer = (triggerName, triggerList, logState, action) => {
               columns: ['*'],
             },
           ],
-          limit: 20,
+          limit: 10,
           where: { event: { trigger_name: triggerName } },
         },
         activePath: [triggerName],
diff --git a/console/src/components/Services/EventTrigger/StreamingLogs/Logs.js b/console/src/components/Services/EventTrigger/StreamingLogs/Logs.js
index 52c9dd57ac4..2865440a289 100644
--- a/console/src/components/Services/EventTrigger/StreamingLogs/Logs.js
+++ b/console/src/components/Services/EventTrigger/StreamingLogs/Logs.js
@@ -80,7 +80,7 @@ class StreamingLogs extends Component {
           }
           if (col === 'created_at') {
             const formattedDate = new Date(r.created_at).toUTCString();
-            return formattedDate;
+            return <div className={conditionalClassname}>{formattedDate}</div>;
           }
           const content = r[col] === undefined ? 'NULL' : r[col].toString();
           return <div className={conditionalClassname}>{content}</div>;
@@ -103,15 +103,18 @@ class StreamingLogs extends Component {
         <div>
           <button
             onClick={this.watchChanges.bind(this)}
-            className={' btn btn-default'}
+            className={styles.watchBtn + ' btn btn-default'}
             data-test="run-query"
           >
             {this.state.isWatching ? (
               <span>
-                Streaming... <i className={'fa fa-spinner fa-spin'} />
+                <i className={'fa fa-pause'} /> Streaming...{' '}
+                <i className={'fa fa-spinner fa-spin'} />
               </span>
             ) : (
-              'Stream Logs'
+              <span>
+                Stream Logs <i className={'fa fa-play'} />
+              </span>
             )}
           </button>
         </div>
diff --git a/console/src/components/Services/EventTrigger/TableCommon/Table.scss b/console/src/components/Services/EventTrigger/TableCommon/Table.scss
index 53bfb844063..cc68657a8a7 100644
--- a/console/src/components/Services/EventTrigger/TableCommon/Table.scss
+++ b/console/src/components/Services/EventTrigger/TableCommon/Table.scss
@@ -257,3 +257,9 @@ a.expanded {
     padding-left: 5px;
   }
 }
+
+.watchBtn {
+  i {
+    font-size: 12px;
+  }
+}