diff --git a/app/components/bridge-finder.js b/app/components/bridge-finder.js
index 462e379..ed64abc 100644
--- a/app/components/bridge-finder.js
+++ b/app/components/bridge-finder.js
@@ -1,11 +1,15 @@
 import Em from 'ember';
 
 export default Em.Component.extend({
+  classNames: ['container'],
   bridgeIp: null,
 
   bridgeUsername: null,
 
   bridgeFindStatus: null,
+  bridgeFindSuccess: Em.computed.equal('bridgeFindStatus', 'success'),
+  bridgeFindMultiple: Em.computed.equal('bridgeFindStatus', 'multiple'),
+  bridgeFindFail: Em.computed.equal('bridgeFindStatus', 'fail'),
 
   // 30 seconds
   bridgeUsernamePingMaxTime: 30000,
@@ -29,12 +33,19 @@ export default Em.Component.extend({
       var self = this;
 
       Em.$.get('https://www.meethue.com/api/nupnp', function (result, status) {
-        if (status === 'success') {
+        var bridgeFindStatus = 'fail';
+
+        if (status === 'success' && result.length === 1) {
           self.set('bridgeIp', result[0].internalipaddress);
           localStorage.setItem('huegasm.bridgeIp', result[0].internalipaddress);
+          bridgeFindStatus = 'success';
+        } else if(result.length > 1) {
+          bridgeFindStatus = 'multiple';
+        } else {
+          bridgeFindStatus = 'fail';
         }
 
-        self.set('bridgeFindStatus', status);
+        self.set('bridgeFindStatus', bridgeFindStatus);
       });
     }
   },
diff --git a/app/styles/app.scss b/app/styles/app.scss
index 53d1f9b..b18c905 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -8,6 +8,10 @@ $playerHeight: 400px;
 $playListBackgroundColor: #1E1E1E;
 
 // BRIDGE FINDER
+#finderContainer {
+  
+}
+
 #pressButtonBridgeImg {
   width: 200px;
   margin: 0 auto 0 auto;
diff --git a/app/templates/components/bridge-finder.hbs b/app/templates/components/bridge-finder.hbs
index 1825b5b..4103a02 100644
--- a/app/templates/components/bridge-finder.hbs
+++ b/app/templates/components/bridge-finder.hbs
@@ -1,14 +1,28 @@
-{{#unless bridgeUsername}}
-  {{#if bridgeIp}}
+<div id="finderContainer" class="center-block">
+  {{#unless bridgeUsername}}
+    {{#if bridgeIp}}
       <img src="assets/images/pressButtonBridge.png" id="pressButtonBridgeImg">
       {{paper-progress-linear warn=true value=bridgeUserNamePingIntervalProgress}}
       {{#if isAuthenticating}}
-          <p>Press the button on your bridge to authenticate this application.</p>
+        <p>Your bridge IP is <b>{{bridgeIp}}</b></p>
+        <p>Press the button on your bridge to authenticate this application.</p>
       {{else}}
-          <p>You failed to press the button. <a class="noTextDecoration" href="#" {{action 'retry'}}>RETRY</a></p>
+        <p>You failed to press the button. <a class="noTextDecoration" href="#" {{action 'retry'}}>RETRY</a></p>
       {{/if}}
-  {{else}}
-    {{paper-progress-circular}}
-    <p>Trying to find your bridge's IP.</p>
-  {{/if}}
-{{/unless}}
\ No newline at end of file
+    {{else}}
+      {{#unless bridgeFindStatus}}
+        {{paper-progress-circular}}
+        <p>Trying to find your bridge's IP.</p>
+      {{/unless}}
+
+      {{#if bridgeFindMultiple}}
+        <p>Found multiple bridge IPs.</p>
+      {{else}}
+        {{#if bridgeFindFail}}
+          {{paper-progress-circular}}
+          <p>Trying to find your bridge's IP.</p>
+        {{/if}}
+      {{/if}}
+    {{/if}}
+  {{/unless}}
+</div>
\ No newline at end of file