diff --git a/app/configuration/controllers/snmp-controller.html b/app/configuration/controllers/snmp-controller.html
index 2458e3d..3fd9aa3 100644
--- a/app/configuration/controllers/snmp-controller.html
+++ b/app/configuration/controllers/snmp-controller.html
@@ -9,15 +9,16 @@
       </div>
       <fieldset>
         <div class="row column snmp__managers-wrap">
-          <div class="snmp__managers" ng-repeat="manager in managers">
-            <div class="inline snmp__manager-field">
+          <div class="snmp__managers" ng-repeat="manager in managers track by $index">
+            <div class="snmp__manager-field">
               <label>SNMP Manager Server</label>
-              <input id="snmp-manager{{$index+1}}-address" type="text" ng-model="manager.address" ng-blur="managers[$index].address = manager.address"/>
+              <input class="inline" id="snmp-manager{{$index+1}}-address" type="text" ng-model="manager.address" ng-blur="managers[$index].address = manager.address"/>
             </div>
-            <div class="inline  snmp__manager-field">
+            <div class="snmp__manager-field">
               <label>Port</label>
-              <input id="snmp-manager{{$index+1}}-port" type="text" ng-model="manager.port" ng-blur="managers[$index].port = manager.port"/>
+              <input class="inline" id="snmp-manager{{$index+1}}-port" type="text" ng-model="manager.port" ng-blur="managers[$index].port = manager.port"/>
             </div>
+          <button class="snmp__manager-remove" ng-click="removeSNMPManager($index)">Remove</button>
           </div>
           <button type="button" class="btn-primary inline" ng-click="addNewSNMPManager()">Add SNMP manager</button>
         </div>
diff --git a/app/configuration/styles/snmp.scss b/app/configuration/styles/snmp.scss
index eabfb7a..1afefd0 100644
--- a/app/configuration/styles/snmp.scss
+++ b/app/configuration/styles/snmp.scss
@@ -10,8 +10,11 @@
   }
 
    .snmp__manager-field {
+    display:inline-block;
     padding-right: 4em;
     width: 350px;
+    padding-top: .6em;
+    padding-left: 0em;
   }
 
   .snmp__metadata-wrapper {
@@ -36,4 +39,13 @@
       margin: .5em;
     }
   }
+  .snmp__manager-remove {
+    display:inline-block;
+    color: $medblue;
+    height: 2.1em;
+    opacity: 1;
+    &:hover {
+      cursor: pointer;
+    }
+  }
 }