@@ -7,7 +7,10 @@ var Data = {
   scans: [],
 
   config: {
-    data_client: 'http://127.0.0.1:44444/',
+    data_client: {
+      url: 'http://127.0.0.1:44444/',
+      connected: false
+    },
     domain: 'https://standing-fleet.apps.goonswarm.org/',
     apiUrl: '/api',
     alertStay: 5000,
@@ -61,6 +64,8 @@ var Data = {
 
     bottomMenu: $('#bottom-menu'),
     bottomMenu_spinner: $('#bottom-menu-spinner'),
+    bottomMenu_dataClient: $('#bottom-menu-data-client'),
+    bottomMenu_dataClient_icon: $('#bottom-menu-data-client i'),
     bottomMenu_local: $('#bottom-menu-local'),
     bottomMenu_scan: $('#bottom-menu-scan'),
     bottomMenu_unlink: $('#bottom-menu-unlink'),
 
@@ -3,10 +3,11 @@ $(function () {
   initialize();
 
   try {
-    Data.state.data_client = new Faye.Client(Data.config.data_client);
+    Data.state.data_client = new Faye.Client(Data.config.data_client.url);
     Data.state.data_client.subscribe('/events', function(event) {
       EventHandler.dispatchEvents([event]);
     });
+    Data.config.data_client.connected = true;
     log('Connected to local data client...');
   } catch(err) {
     log('Unable to connect to local data client...');
 
@@ -73,6 +73,7 @@ var UI = {
     Data.ui.statusHostile.on('click', $.proxy(UIPanels.showStatusPanel, null, false));
 
     UI.update_scrollables();
+    UI.data_client_check();
   },
 
   update_scrollables: function() {
@@ -82,6 +83,14 @@ var UI = {
     Data.ui.events_list.slimScroll({height: 'auto',  color: '#ffcc2a', alwaysVisible: true});
     Data.ui.fleet_list.slimScroll({height: 'auto',  color: '#ffcc2a', alwaysVisible: true});
   },
+  
+  data_client_check: function() {
+    if (Data.config.data_client.connected) {
+      Data.ui.bottomMenu_dataClient_icon.addClass('fa-chain');
+    } else {
+      Data.ui.bottomMenu_dataClient.remove();
+    }
+  },
 
   submitStatusClear: function() {
     submitStatus('clear', Data.state.self.characterName);
 
@@ -74,7 +74,7 @@ div#page, div#content-wrapper { position: relative; height: 100%; width: 100%; b
 }
 
 #current {
-  color: #ff;
+  color: #fff;
   font-family: 'Lato', sans-serif !important;
   font-size: 11px !important;
   font-weight: 700;
@@ -250,7 +250,8 @@ div#page, div#content-wrapper { position: relative; height: 100%; width: 100%; b
 .menu-button.active { height: 2rem }
 .menu-button.blink { background-color: #842; }
 
-#bottom-menu-spinner {
+#bottom-menu-spinner,
+#bottom-menu-data-client {
   width: 1.2rem;
   background: none;
   display: inline-block;
@@ -259,6 +260,11 @@ div#page, div#content-wrapper { position: relative; height: 100%; width: 100%; b
   border: none;
 }
 
+#bottom-menu-data-client {
+  cursor: default;
+  color: #ffcc2a;
+}
+
 #bottom-menu a {
   color: #fff;
 }
@@ -537,10 +543,6 @@ g.node {
   fill: #fff;
 }
 
-.node rect.current rect:last-child {
-
-}
-
 /* Link line styles */
 .link {
   stroke: #ccc;
 
@@ -53,6 +53,8 @@ block content
     #bottom-menu.sub-bar.right
       #bottom-menu-spinner.menu-button
         img(src='/images/spinner.gif', alt='Processing...')
+      #bottom-menu-data-client.menu-button
+        i.fa
       #bottom-menu-scan.menu-button
         i.fa.fa-bullseye
         span REPORT SCAN