diff --git a/app/configuration/controllers/snmp-controller.html b/app/configuration/controllers/snmp-controller.html
index e62c453..2458e3d 100644
--- a/app/configuration/controllers/snmp-controller.html
+++ b/app/configuration/controllers/snmp-controller.html
@@ -4,16 +4,29 @@
     <h1>SNMP settings</h1>
   </div>
   <form class="snmp__form" role="form" action="">
-    <section class="row column">
       <div class="page-header">
-        <h2 class="bold h4">SNMP information</h2>
+        <h2 class="bold h4">Set the Simple Network Management Protocol (SNMP)</h2>
       </div>
       <fieldset>
-        <div class="snmp__managers" ng-repeat="manager in managers track by $index">
-          <label>SNMP Manager {{$index+1}}</label>
-          <field>{{manager.Address}}:{{manager.Port}}</field>
+        <div class="row column snmp__managers-wrap">
+          <div class="snmp__managers" ng-repeat="manager in managers">
+            <div class="inline 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"/>
+            </div>
+            <div class="inline  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"/>
+            </div>
+          </div>
+          <button type="button" class="btn-primary inline" ng-click="addNewSNMPManager()">Add SNMP manager</button>
         </div>
       </fieldset>
-    </section>
+    <div class="snmp__submit-wrapper">
+      <button type="button" class="btn-primary inline" ng-click="setSNMP()">Save settings</button>
+      <button type="button" class="btn-secondary inline" ng-click="refresh()">Cancel</button>
+    </div>
+    <p class="success-msg" ng-show="success" role="alert">Success! SNMP managers updated!</p>
+    <p class="error error-msg" ng-show="error" role="alert">Error setting SNMP Managers!</p>
   </form>
 </div>