diff --git a/client/.eslintrc b/client/.eslintrc
index 4d6729d8f..6e26e27c5 100644
--- a/client/.eslintrc
+++ b/client/.eslintrc
@@ -40,7 +40,6 @@
     "jsx-a11y/click-events-have-key-events": 0,
     "jsx-a11y/mouse-events-have-key-events": 0,
 
-    "react/jsx-closing-tag-location": 0,
     "react/jsx-max-props-per-line": 0,
     "react/jsx-wrap-multilines": 0,
   }
diff --git a/client/app/scripts/components/__tests__/node-details-test.js b/client/app/scripts/components/__tests__/node-details-test.js
index ef6c795fb..dc481ffa3 100644
--- a/client/app/scripts/components/__tests__/node-details-test.js
+++ b/client/app/scripts/components/__tests__/node-details-test.js
@@ -19,9 +19,11 @@ describe('NodeDetails', () => {
   });
 
   it('shows n/a when node was not found', () => {
-    const c = TestUtils.renderIntoDocument(<Provider store={configureStore()}>
-      <NodeDetails notFound />
-    </Provider>);
+    const c = TestUtils.renderIntoDocument((
+      <Provider store={configureStore()}>
+        <NodeDetails notFound />
+      </Provider>
+    ));
     const notFound = TestUtils.findRenderedDOMComponentWithClass(
       c,
       'node-details-header-notavailable'
@@ -32,13 +34,15 @@ describe('NodeDetails', () => {
   it('show label of node with title', () => {
     nodes = nodes.set(nodeId, Immutable.fromJS({id: nodeId}));
     details = {label: 'Node 1'};
-    const c = TestUtils.renderIntoDocument(<Provider store={configureStore()}>
-      <NodeDetails
-        nodes={nodes}
-        topologyId="containers"
-        nodeId={nodeId} details={details}
-        />
-    </Provider>);
+    const c = TestUtils.renderIntoDocument((
+      <Provider store={configureStore()}>
+        <NodeDetails
+          nodes={nodes}
+          topologyId="containers"
+          nodeId={nodeId} details={details}
+          />
+      </Provider>
+    ));
 
     const title = TestUtils.findRenderedDOMComponentWithClass(c, 'node-details-header-label');
     expect(title.title).toBe('Node 1');
diff --git a/client/app/scripts/components/app.js b/client/app/scripts/components/app.js
index 08f2f1fe6..ceca9925e 100644
--- a/client/app/scripts/components/app.js
+++ b/client/app/scripts/components/app.js
@@ -194,9 +194,11 @@ class App extends React.Component {
             <TimeTravel />
             <div className="selectors">
               <div className="logo">
-                {!isIframe && <svg width="100%" height="100%" viewBox="0 0 1089 217">
-                  <Logo />
-                </svg>}
+                {!isIframe &&
+                  <svg width="100%" height="100%" viewBox="0 0 1089 217">
+                    <Logo />
+                  </svg>
+                }
               </div>
               <Search />
               <Topologies />
diff --git a/client/app/scripts/components/dev-tools.js b/client/app/scripts/components/dev-tools.js
index 068839fd7..65604d040 100644
--- a/client/app/scripts/components/dev-tools.js
+++ b/client/app/scripts/components/dev-tools.js
@@ -3,9 +3,11 @@ import { createDevTools } from 'redux-devtools';
 import LogMonitor from 'redux-devtools-log-monitor';
 import DockMonitor from 'redux-devtools-dock-monitor';
 
-export default createDevTools(<DockMonitor
-  defaultIsVisible={false}
-  toggleVisibilityKey="ctrl-h"
-  changePositionKey="ctrl-w">
-  <LogMonitor />
-</DockMonitor>);
+export default createDevTools((
+  <DockMonitor
+    defaultIsVisible={false}
+    toggleVisibilityKey="ctrl-h"
+    changePositionKey="ctrl-w">
+    <LogMonitor />
+  </DockMonitor>
+));
diff --git a/client/app/scripts/components/footer.js b/client/app/scripts/components/footer.js
index 595c2bd78..57713e0a9 100644
--- a/client/app/scripts/components/footer.js
+++ b/client/app/scripts/components/footer.js
@@ -49,13 +49,15 @@ class Footer extends React.Component {
     return (
       <div className="footer">
         <div className="footer-status">
-          {versionUpdate && <a
-            className="footer-versionupdate"
-            title={versionUpdateTitle}
-            href={versionUpdate.get('downloadUrl')}
-            target="_blank" rel="noopener noreferrer">
-            Update available: {versionUpdate.get('version')}
-          </a>}
+          {versionUpdate &&
+            <a
+              className="footer-versionupdate"
+              title={versionUpdateTitle}
+              href={versionUpdate.get('downloadUrl')}
+              target="_blank" rel="noopener noreferrer">
+              Update available: {versionUpdate.get('version')}
+            </a>
+          }
           <span className="footer-label">Version</span>
           {version}
           <span className="footer-label">on</span>
diff --git a/client/app/scripts/components/help-panel.js b/client/app/scripts/components/help-panel.js
index 8510ee6a9..c9e69fffb 100644
--- a/client/app/scripts/components/help-panel.js
+++ b/client/app/scripts/components/help-panel.js
@@ -116,14 +116,21 @@ function renderSearchPanel() {
 
 
 function renderFieldsPanel(currentTopologyName, searchableFields) {
-  const none = <span style={{fontStyle: 'italic'}}>None</span>;
+  const none = (
+    <span style={{fontStyle: 'italic'}}>None</span>
+  );
+  const currentTopology = (
+    <span className="help-panel-fields-current-topology">
+      {currentTopologyName}
+    </span>
+  );
+
   return (
     <div className="help-panel-fields">
       <h2>Fields and Metrics</h2>
       <p>
         Searchable fields and metrics in the <br />
-        currently selected <span className="help-panel-fields-current-topology">
-          {currentTopologyName}</span> topology:
+        currently selected {currentTopology} topology:
       </p>
       <div className="help-panel-fields-fields">
         <div className="help-panel-fields-fields-column">
diff --git a/client/app/scripts/components/matched-results.js b/client/app/scripts/components/matched-results.js
index 295d9820f..eb91e58c8 100644
--- a/client/app/scripts/components/matched-results.js
+++ b/client/app/scripts/components/matched-results.js
@@ -41,9 +41,11 @@ export default class MatchedResults extends React.PureComponent {
     return (
       <div className="matched-results" style={style}>
         {matches.keySeq().take(SHOW_ROW_COUNT).map(fieldId => Match(matches.get(fieldId)))}
-        {moreFieldMatches && <div className="matched-results-more" title={moreFieldMatchesTitle}>
-          {`${moreFieldMatches.size} more matches`}
-        </div>}
+        {moreFieldMatches &&
+          <div className="matched-results-more" title={moreFieldMatchesTitle}>
+            {`${moreFieldMatches.size} more matches`}
+          </div>
+        }
       </div>
     );
   }
diff --git a/client/app/scripts/components/metric-selector.js b/client/app/scripts/components/metric-selector.js
index d16ad22d8..bca5589d9 100644
--- a/client/app/scripts/components/metric-selector.js
+++ b/client/app/scripts/components/metric-selector.js
@@ -22,14 +22,16 @@ class MetricSelector extends React.Component {
 
     return (
       <div className="metric-selector">
-        {hasMetrics && <div className="metric-selector-wrapper" onMouseLeave={this.onMouseOut}>
-          {availableMetrics.map(metric => (
-            <MetricSelectorItem
-              key={metric.get('id')}
-              metric={metric}
-            />
-          ))}
-        </div>}
+        {hasMetrics &&
+          <div className="metric-selector-wrapper" onMouseLeave={this.onMouseOut}>
+            {availableMetrics.map(metric => (
+              <MetricSelectorItem
+                key={metric.get('id')}
+                metric={metric}
+              />
+            ))}
+          </div>
+        }
       </div>
     );
   }
diff --git a/client/app/scripts/components/node-details.js b/client/app/scripts/components/node-details.js
index fad4a2a3f..7b3d1bd33 100644
--- a/client/app/scripts/components/node-details.js
+++ b/client/app/scripts/components/node-details.js
@@ -63,12 +63,14 @@ class NodeDetails extends React.Component {
     return (
       <div className="node-details-tools-wrapper">
         <div className="node-details-tools">
-          {showSwitchTopology && <span
-            title={topologyTitle}
-            className="fa fa-long-arrow-left"
-            onClick={this.handleShowTopologyForNode}>
-            <span>Show in <span>{this.props.topologyId.replace(/-/g, ' ')}</span></span>
-          </span>}
+          {showSwitchTopology &&
+            <span
+              title={topologyTitle}
+              className="fa fa-long-arrow-left"
+              onClick={this.handleShowTopologyForNode}>
+              <span>Show in <span>{this.props.topologyId.replace(/-/g, ' ')}</span></span>
+            </span>
+          }
           <span
             title="Close details"
             className="fa fa-close close-details"
@@ -190,35 +192,42 @@ class NodeDetails extends React.Component {
           </div>
         </div>
 
-        {showControls && <div className="node-details-controls-wrapper" style={styles.controls}>
-          <NodeDetailsControls
-            nodeId={this.props.nodeId}
-            controls={details.controls}
-            pending={pending}
-            error={error} />
-        </div>}
+        {showControls &&
+          <div className="node-details-controls-wrapper" style={styles.controls}>
+            <NodeDetailsControls
+              nodeId={this.props.nodeId}
+              controls={details.controls}
+              pending={pending}
+              error={error} />
+          </div>
+        }
 
         <div className="node-details-content">
-          {details.metrics && <div className="node-details-content-section">
-            <div className="node-details-content-section-header">Status</div>
-            <NodeDetailsHealth
-              metrics={details.metrics}
-              topologyId={topologyId}
-              />
-          </div>}
-          {details.metadata && <div className="node-details-content-section">
-            <div className="node-details-content-section-header">Info</div>
-            <NodeDetailsInfo rows={details.metadata} matches={nodeMatches.get('metadata')} />
-          </div>}
+          {details.metrics &&
+            <div className="node-details-content-section">
+              <div className="node-details-content-section-header">Status</div>
+              <NodeDetailsHealth
+                metrics={details.metrics}
+                topologyId={topologyId}
+                />
+            </div>
+          }
+          {details.metadata &&
+            <div className="node-details-content-section">
+              <div className="node-details-content-section-header">Info</div>
+              <NodeDetailsInfo rows={details.metadata} matches={nodeMatches.get('metadata')} />
+            </div>
+          }
 
           {details.connections && details.connections.filter(cs => cs.connections.length > 0)
-            .map(connections => (<div className="node-details-content-section" key={connections.id}>
-              <NodeDetailsTable
-                {...connections}
-                nodes={connections.connections}
-                nodeIdKey="nodeId"
-              />
-            </div>
+            .map(connections => (
+              <div className="node-details-content-section" key={connections.id}>
+                <NodeDetailsTable
+                  {...connections}
+                  nodes={connections.connections}
+                  nodeIdKey="nodeId"
+                />
+              </div>
           ))}
 
           {details.children && details.children.map(children => (
@@ -233,10 +242,12 @@ class NodeDetails extends React.Component {
                 <div className="node-details-content-section" key={table.id}>
                   <div className="node-details-content-section-header">
                     {table.label && table.label.length > 0 && table.label}
-                    {table.truncationCount > 0 && <span
-                      className="node-details-content-section-header-warning">
-                      <Warning text={getTruncationText(table.truncationCount)} />
-                    </span>}
+                    {table.truncationCount > 0 &&
+                      <span
+                        className="node-details-content-section-header-warning">
+                        <Warning text={getTruncationText(table.truncationCount)} />
+                      </span>
+                    }
                   </div>
                   {this.renderTable(table)}
                 </div>
diff --git a/client/app/scripts/components/node-details/__tests__/node-details-table-test.js b/client/app/scripts/components/node-details/__tests__/node-details-table-test.js
index 1ac23263b..acd8ba366 100644
--- a/client/app/scripts/components/node-details/__tests__/node-details-table-test.js
+++ b/client/app/scripts/components/node-details/__tests__/node-details-table-test.js
@@ -71,14 +71,16 @@ describe('NodeDetailsTable', () => {
 
   describe('kubernetes_ip', () => {
     it('sorts by column', () => {
-      component = TestUtils.renderIntoDocument(<Provider store={configureStore()}>
-        <NodeDetailsTable
-          columns={columns}
-          sortedBy="kubernetes_ip"
-          nodeIdKey="id"
-          nodes={nodes}
-          />
-      </Provider>);
+      component = TestUtils.renderIntoDocument((
+        <Provider store={configureStore()}>
+          <NodeDetailsTable
+            columns={columns}
+            sortedBy="kubernetes_ip"
+            nodeIdKey="id"
+            nodes={nodes}
+            />
+        </Provider>
+      ));
 
       matchColumnValues('kubernetes_ip', [
         '10.44.253.255',
@@ -105,14 +107,16 @@ describe('NodeDetailsTable', () => {
 
   describe('kubernetes_namespace', () => {
     it('sorts by column', () => {
-      component = TestUtils.renderIntoDocument(<Provider store={configureStore()}>
-        <NodeDetailsTable
-          columns={columns}
-          sortedBy="kubernetes_namespace"
-          nodeIdKey="id"
-          nodes={nodes}
-          />
-      </Provider>);
+      component = TestUtils.renderIntoDocument((
+        <Provider store={configureStore()}>
+          <NodeDetailsTable
+            columns={columns}
+            sortedBy="kubernetes_namespace"
+            nodeIdKey="id"
+            nodes={nodes}
+            />
+        </Provider>
+      ));
 
       matchColumnValues('kubernetes_namespace', ['00000', '1111', '12', '5']);
       clickColumn('Namespace');
diff --git a/client/app/scripts/components/node-details/node-details-controls.js b/client/app/scripts/components/node-details/node-details-controls.js
index 4604512de..aecd6d1c5 100644
--- a/client/app/scripts/components/node-details/node-details-controls.js
+++ b/client/app/scripts/components/node-details/node-details-controls.js
@@ -15,10 +15,12 @@ export default function NodeDetailsControls({
 
   return (
     <div className="node-details-controls">
-      {error && <div className="node-details-controls-error" title={error}>
-        <span className="node-details-controls-error-icon fa fa-warning" />
-        <span className="node-details-controls-error-messages">{error}</span>
-      </div>}
+      {error &&
+        <div className="node-details-controls-error" title={error}>
+          <span className="node-details-controls-error-icon fa fa-warning" />
+          <span className="node-details-controls-error-messages">{error}</span>
+        </div>
+      }
       <span className="node-details-controls-buttons">
         {sortBy(controls, 'rank').map(control => <NodeDetailsControlButton
           nodeId={nodeId} control={control} pending={pending} key={control.id} />)}
diff --git a/client/app/scripts/components/node-details/node-details-relatives.js b/client/app/scripts/components/node-details/node-details-relatives.js
index 0968b4237..ec9d6dedf 100644
--- a/client/app/scripts/components/node-details/node-details-relatives.js
+++ b/client/app/scripts/components/node-details/node-details-relatives.js
@@ -38,11 +38,13 @@ export default class NodeDetailsRelatives extends React.Component {
             key={relative.id}
             match={matches.get(relative.id)}
             {...relative} />))}
-        {showLimitAction && <span
-          className="node-details-relatives-more"
-          onClick={this.handleLimitClick}>
-          {limitActionText}
-        </span>}
+        {showLimitAction &&
+          <span
+            className="node-details-relatives-more"
+            onClick={this.handleLimitClick}>
+            {limitActionText}
+          </span>
+        }
       </div>
     );
   }
diff --git a/client/app/scripts/components/nodes-resources/node-resources-metric-box-info.js b/client/app/scripts/components/nodes-resources/node-resources-metric-box-info.js
index b4e405080..e16540167 100644
--- a/client/app/scripts/components/nodes-resources/node-resources-metric-box-info.js
+++ b/client/app/scripts/components/nodes-resources/node-resources-metric-box-info.js
@@ -14,9 +14,11 @@ export default class NodeResourcesMetricBoxInfo extends React.Component {
         <strong>
           {showExtendedInfo ? humanizedRelativeConsumption : humanizedAbsoluteConsumption}
         </strong> used
-        {showExtendedInfo && <i>{' - '}
-          ({humanizedAbsoluteConsumption} / <strong>{humanizedTotalCapacity}</strong>)
-        </i>}
+        {showExtendedInfo &&
+          <i>
+            {' - '}({humanizedAbsoluteConsumption} / <strong>{humanizedTotalCapacity}</strong>)
+          </i>
+        }
       </span>
     );
   }
diff --git a/client/app/scripts/components/search.js b/client/app/scripts/components/search.js
index 67fc452b7..afe60f28c 100644
--- a/client/app/scripts/components/search.js
+++ b/client/app/scripts/components/search.js
@@ -163,11 +163,13 @@ class Search extends React.Component {
               Search
             </span>
           </div>
-          {!showPinnedSearches && <div className="search-hint">
-            {getHint(nodes)} <span
-              className="search-help-link fa fa-question-circle"
-              onMouseDown={this.props.toggleHelp} />
-          </div>}
+          {!showPinnedSearches &&
+            <div className="search-hint">
+              {getHint(nodes)} <span
+                className="search-help-link fa fa-question-circle"
+                onMouseDown={this.props.toggleHelp} />
+            </div>
+          }
         </div>
       </div>
     );
diff --git a/client/app/scripts/components/time-control.js b/client/app/scripts/components/time-control.js
index 9e33c3e7c..976dc1ab3 100644
--- a/client/app/scripts/components/time-control.js
+++ b/client/app/scripts/components/time-control.js
@@ -94,24 +94,27 @@ class TimeControl extends React.Component {
               {isPausedNow && <span className="fa fa-pause" />}
               <span className="label">{isPausedNow ? 'Paused' : 'Pause'}</span>
             </span>
-            {hasHistoricReports && <span
-              className={className(isTimeTravelling)}
-              onClick={this.handleTravelClick}
-              title="Travel back in time">
-              {isTimeTravelling && <span className="fa fa-clock-o" />}
-              <span className="label">Time Travel</span>
-            </span>}
+            {hasHistoricReports &&
+              <span
+                className={className(isTimeTravelling)}
+                onClick={this.handleTravelClick}
+                title="Travel back in time">
+                {isTimeTravelling && <span className="fa fa-clock-o" />}
+                <span className="label">Time Travel</span>
+              </span>
+            }
           </div>
         </div>
-        {(isPausedNow || isTimeTravelling) && <span
-          className="time-control-info"
-          title={moment(pausedAt).toISOString()}>
-          Showing state from {moment(pausedAt).fromNow()}
-        </span>}
-        {isRunningNow && timeTravelTransitioning && <span
-          className="time-control-info">
-          Resuming the live state
-        </span>}
+        {(isPausedNow || isTimeTravelling) &&
+          <span
+            className="time-control-info"
+            title={moment(pausedAt).toISOString()}>
+            Showing state from {moment(pausedAt).fromNow()}
+          </span>
+        }
+        {isRunningNow && timeTravelTransitioning &&
+          <span className="time-control-info">Resuming the live state</span>
+        }
       </div>
     );
   }