diff --git a/embark-ui/src/components/ExplorerLayout.js b/embark-ui/src/components/ExplorerLayout.js
index 5fd32a19..d7b9780f 100644
--- a/embark-ui/src/components/ExplorerLayout.js
+++ b/embark-ui/src/components/ExplorerLayout.js
@@ -33,6 +33,7 @@ const ExplorerLayout = () => (
         <List.Group transparent={true}>
           {groupItems.map((groupItem) => (
             <List.GroupItem
+              key={groupItem.value}
               className={className}
               to={groupItem.to}
               icon={groupItem.icon}
diff --git a/embark-ui/src/components/Versions.js b/embark-ui/src/components/Versions.js
index 48abacbf..f3e197f7 100644
--- a/embark-ui/src/components/Versions.js
+++ b/embark-ui/src/components/Versions.js
@@ -1,6 +1,5 @@
 import PropTypes from "prop-types";
 import React from 'react';
-import {Link} from "react-router-dom";
 import {Grid, Card} from 'tabler-react';
 
 const Version = ({version}) => (
diff --git a/embark-ui/src/containers/CommunicationContainer.js b/embark-ui/src/containers/CommunicationContainer.js
index 93d17a58..85cf9a97 100644
--- a/embark-ui/src/containers/CommunicationContainer.js
+++ b/embark-ui/src/containers/CommunicationContainer.js
@@ -16,7 +16,7 @@ class CommunicationContainer extends Component {
   }
 
   web3DisabledWarning() {
-    return <Alert type="warning">The node you are using does not support Whisper</Alert>
+    return <Alert type="warning">The node you are using does not support Whisper</Alert>;
   }
 
   web3Enabled() {
@@ -65,7 +65,7 @@ export default connect(
   mapStateToProps,
   {
     messageSend: messageSend.request,
-    messageListen: messageListen.request,
+    messageListen: messageListen.request
   }
 )(CommunicationContainer);
 
diff --git a/embark-ui/src/sagas/index.js b/embark-ui/src/sagas/index.js
index 2e056a67..8d90aac8 100644
--- a/embark-ui/src/sagas/index.js
+++ b/embark-ui/src/sagas/index.js
@@ -5,7 +5,7 @@ import {all, call, fork, put, takeEvery, take} from 'redux-saga/effects';
 
 const {account, accounts, block, blocks, transaction, transactions, processes, commands, processLogs,
        contracts, contract, contractProfile, messageSend, versions, plugins, messageListen, fiddle,
-       ensRecord, ensRecords} = actions;
+       ensRecord, ensRecords, contractLogs} = actions;
 
 function *doRequest(entity, apiFn, payload) {
   const {response, error} = yield call(apiFn, payload);
@@ -108,6 +108,14 @@ export function *watchPostEnsRecords() {
   yield takeEvery(actions.ENS_RECORDS[actions.REQUEST], postEnsRecord);
 }
 
+export function *watchListenToMessages() {
+  yield takeEvery(actions.MESSAGE_LISTEN[actions.REQUEST], listenToMessages);
+}
+
+export function *watchFetchFiddle() {
+  yield takeEvery(actions.FIDDLE[actions.REQUEST], fetchFiddle);
+}
+
 function createChannel(socket) {
   return eventChannel(emit => {
     socket.onmessage = ((message) => {
@@ -159,10 +167,6 @@ export function *watchListenToContractLogs() {
   yield takeEvery(actions.WATCH_NEW_CONTRACT_LOGS, listenToContractLogs);
 }
 
-export function *watchSendMessage() {
-  yield takeEvery(actions.MESSAGE_SEND[actions.REQUEST], sendMessage);
-}
-
 export function *listenToMessages(action) {
   const socket = api.listenToChannel(action.messageChannels[0]);
   const channel = yield call(createChannel, socket);
@@ -172,15 +176,6 @@ export function *listenToMessages(action) {
   }
 }
 
-export function *watchListenToMessages() {
-  yield takeEvery(actions.MESSAGE_LISTEN[actions.REQUEST], listenToMessages);
-}
-
-export function *watchFetchFiddle() {
-  yield takeEvery(actions.FIDDLE[actions.REQUEST], fetchFiddle);
-}
-
-
 export default function *root() {
   yield all([
     fork(watchInitBlockHeader),
@@ -204,7 +199,7 @@ export default function *root() {
     fork(watchFetchTransaction),
     fork(watchFetchContractProfile),
     fork(watchFetchFiddle),
-    fork(watchFetchENSRecord),
-    fork(watchPostENSRecords)
+    fork(watchFetchEnsRecord),
+    fork(watchPostEnsRecords)
   ]);
 }