diff --git a/.dockerignore b/.dockerignore
index 4be88527..d4e0e5b6 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
+node_modules
 coverage
 uploads
 mocks
diff --git a/package.json b/package.json
index d24de967..fabce48b 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "passport-ldapauth": "^2.0.0",
     "passport-local": "^1.0.0",
     "passport-local-mongoose": "^5.0.0",
-    "pm2": "^3.1.2",
+    "pm2": "3.1.2",
     "pretty-data": "^0.40.0",
     "request": "^2.88.0",
     "soap": "^0.24.0",
diff --git a/public/js/app/controllers.js b/public/js/app/controllers.js
index e78132f6..71be8657 100644
--- a/public/js/app/controllers.js
+++ b/public/js/app/controllers.js
@@ -327,6 +327,14 @@ var ctrl = angular.module("mockapp.controllers",['mockapp.services','ngFileSaver
                   $('#failure-modal').modal('toggle');
               });
             };
+
+          $scope.totalDisplayed = 10;
+
+          $scope.loadMore = function () {
+            $scope.totalDisplayed += 10;
+          };
+
+
     }])
 
 
diff --git a/public/partials/addapiform.html b/public/partials/addapiform.html
index 30caacbd..614d98f7 100644
--- a/public/partials/addapiform.html
+++ b/public/partials/addapiform.html
@@ -1,5 +1,5 @@
 <h2>Mock a REST or SOAP Service</h2>
-<form name="form" class="well col-xs-12" ng-controller="myMenuAppController">
+<form name="form" class="well col-xs-12">
   <div class="form-group req row">
     <label for="service_payloadtype" class="col-xs-2 col-form-label">Service Type</label>
     <div class="col-xs-9">
diff --git a/public/partials/spec.html b/public/partials/spec.html
index 75ab1272..fa6dcbed 100644
--- a/public/partials/spec.html
+++ b/public/partials/spec.html
@@ -1,6 +1,6 @@
 <h2>Mock from WSDL or OpenAPI</h2>
 
-<form name="form" class="well col-xs-12" ng-controller="specController">
+<form name="form" class="well col-xs-12">
     
     <div class="form-group req row">
         <label for="service_payloadtype" class="col-xs-2 col-form-label">Spec Type</label>
diff --git a/public/partials/templateForm.html b/public/partials/templateForm.html
index 93d69853..9a200001 100644
--- a/public/partials/templateForm.html
+++ b/public/partials/templateForm.html
@@ -3,7 +3,7 @@ <h2>Import Mock Service</h2>
 <br>
 <div><p><i>Please import a virtual service in JSON format. You may use the JSON document that Mockiato creates with it's export function or create one from scratch in <a target= "_blank" href="/api-docs/#/services/addVirtualService">this format.</a></i><p></div>
 <br>
-<form class="col-xs-12" ng-controller="templateController">
+<form class="col-xs-12">
     <div class="form-group row">
         <div class="col-xs-2">
             <file-field class="btn btn-primary" ng-model="importTemp" preview="previewTemp"><i class="glyphicon glyphicon-import"></i> Import Template</file-field>
diff --git a/public/partials/updateForm.html b/public/partials/updateForm.html
index bc465b1b..be0ec32a 100644
--- a/public/partials/updateForm.html
+++ b/public/partials/updateForm.html
@@ -1,5 +1,5 @@
 <h2>Update Mock Service</h2>
-<form name="form" class="well col-xs-12" ng-controller="updateController">
+<form name="form" class="well col-xs-12">
   <div class="form-group row">
     <label for="service_payloadtype" class="col-xs-2 col-form-label">Service Type:</label>
     <div class="col-xs-8">
@@ -54,229 +54,236 @@ <h2>Update Mock Service</h2>
     <div class="col-xs-2">
       <input required type="number" id="service_delay" class="form-control" ng-model="servicevo.delay" placeholder="0">
     </div>
-  </div>
-
-  <!-- begin req / res pairs -->
-  <fieldset id="rrpairs" data-ng-repeat="rr in servicevo.rawpairs">
-  <hr style="height:1px;border:none;color:#9f9696;background-color:#9f9696;" />
-    <div class="form-group row">
-      <div class="col-xs-10">
-        <h4><ins><i>Request / Response Pair</i></ins></h4>
-      </div>
-
-      <div class="col-xs-1">
-        <button type="button" class="btn btn-danger" ng-click="servicevo.rawpairs.splice($index, 1)">
-          Delete
-        </button>
-      </div>
+  </div>  
 
-      <div class="col-xs-1">
-        <button type="button" class="btn btn-success" ng-show="$last" ng-click="addNewRRPair()">
-          Add
-        </button>
-      </div>
-    </div>
-
-    <div class="form-group row" ng-show="servicevo.type === 'REST'">
-      <label for="service_method" class="col-xs-2 col-form-label">HTTP Method:</label>
-      <div class="col-xs-9">
-        <div class="radio">
-          <label class="move-radios">
-              <input ng-model="rr.method" id="service_method" type="radio" ng-value="'POST'" ng-required="servicevo.type === 'REST' && !rr.method">
-                POST
-          </label>
-          <label class="move-radios">
-              <input ng-model="rr.method" id="service_method" type="radio" ng-value="'GET'" ng-required="servicevo.type === 'REST' && !rr.method">
-                GET
-          </label>
-          <label class="move-radios">
-              <input ng-model="rr.method" id="service_method" type="radio" ng-value="'PUT'" ng-required="servicevo.type === 'REST' && !rr.method">
-                PUT
-          </label>
-          <label>
-              <input ng-model="rr.method" id="service_method" type="radio" ng-value="'DELETE'" ng-required="servicevo.type === 'REST' && !rr.method">
-                DELETE
-          </label>
+  <!--begin RR pairs-->
+    <fieldset id="rrpairs" data-ng-repeat="rr in servicevo.rawpairs | limitTo:totalDisplayed">
+    <hr style="height:1px;border:none;color:#9f9696;background-color:#9f9696;" />
+      <div class="form-group row">
+        <div class="col-xs-10">
+          <h4><ins><i>Request / Response Pair</i></ins></h4>
         </div>
-      </div>
-    </div>
 
-    <div class="form-group row" ng-show="servicevo.type === 'REST'">
-      <label for="service_endpoint" class="col-xs-2 col-form-label">Relative Path:</label>
-      <div class="col-xs-9">
-        <div class="input-group">
-          <input type="text" id="service_path" class="form-control" ng-model="rr.path" placeholder="Enter Relative Path">
+        <div class="col-xs-1">
+          <button type="button" class="btn btn-danger" ng-click="servicevo.rawpairs.splice($index, 1)">
+            Delete
+          </button>
         </div>
-      </div>
-    </div>
-
-    <div class="form-group row" ng-show="servicevo.type === 'REST'">
-      <label class="col-xs-2 col-form-label">Queries</label>
-      <div class="col-xs-9">
-        <fieldset data-ng-repeat="q in rr.queriesArr">
-            <div class="row">
-              <div class="col-xs-5">
-                <input type="text" class="form-control" ng-model="q.k" placeholder="e.g. name">
-              </div>
-
-              <div class="col-xs-5">
-                <input type="text" class="form-control" ng-model="q.v" placeholder="e.g. value">
-              </div>
-
-              <div class="col-xs-1">
-                <button type="button" class="btn btn-warning" ng-show="$last && !$first" ng-click="removeQuery(rr)">
-                  <span class="glyphicon glyphicon-minus"></span>
-                </button>
-              </div>
 
-              <div class="col-xs-1">
-                <button type="button" class="btn btn-success" ng-show="$last" ng-click="addQuery(rr)">
-                  <span class="glyphicon glyphicon-plus"></span>
-                </button>
-              </div>
-            </div>
-        </fieldset>
+        <div class="col-xs-1">
+          <button type="button" class="btn btn-success" ng-show="$last" ng-click="addNewRRPair()">
+            Add
+          </button>
+        </div>
       </div>
-    </div>
 
-    <div class="form-group row" ng-show="servicevo.type === 'REST'">
-        <label for="service_payloadtype" class="col-xs-2 col-form-label">Payload Type:</label>
+      <div class="form-group row" ng-show="servicevo.type === 'REST'">
+        <label for="service_method" class="col-xs-2 col-form-label">HTTP Method:</label>
         <div class="col-xs-9">
           <div class="radio">
             <label class="move-radios">
-                <input ng-model="rr.payloadType" id="service_payloadtype" ng-click="setContentType(rr, 'application/json')" type="radio" ng-value="'JSON'" ng-required="servicevo.type === 'REST' && !rr.payloadType">
-                  JSON
+                <input ng-model="rr.method" id="service_method" type="radio" ng-value="'POST'" ng-required="servicevo.type === 'REST' && !rr.method">
+                  POST
             </label>
             <label class="move-radios">
-                <input ng-model="rr.payloadType" id="service_payloadtype" ng-click="setContentType(rr, 'text/xml')" type="radio" ng-value="'XML'" ng-required="servicevo.type === 'REST' && !rr.payloadType">
-                  XML
+                <input ng-model="rr.method" id="service_method" type="radio" ng-value="'GET'" ng-required="servicevo.type === 'REST' && !rr.method">
+                  GET
             </label>
             <label class="move-radios">
-                <input ng-model="rr.payloadType" ng-click="setContentType(rr, 'text/plain')" id="service_payloadtype" type="radio" ng-value="'PLAIN'" ng-required="servicevo.type === 'REST' && !rr.payloadType">
-                  Plaintext
+                <input ng-model="rr.method" id="service_method" type="radio" ng-value="'PUT'" ng-required="servicevo.type === 'REST' && !rr.method">
+                  PUT
+            </label>
+            <label>
+                <input ng-model="rr.method" id="service_method" type="radio" ng-value="'DELETE'" ng-required="servicevo.type === 'REST' && !rr.method">
+                  DELETE
             </label>
           </div>
         </div>
       </div>
 
-    <div class="form-group row" ng-show="servicevo.type !== 'MQ'">
-      <label class="col-xs-2 col-form-label">Request Headers</label>
-      <div class="col-xs-9">
-        <fieldset data-ng-repeat="header in rr.reqHeadersArr">
-            <div class="row">
-              <div class="col-xs-5">
-                <div angucomplete-alt
-                  id="req-header-{{ header.id }}"
-                  placeholder="e.g. Content-Type"
-                  pause="100"
-                  initial-value="header.k"
-                  selected-object="header.k"
-                  local-data="possibleHeaders"
-                  override-suggestions="true"
-                  search-fields="name"
-                  title-field="name"
-                  minlength="3"
-                  input-class="form-control"
-                  match-class="highlight">
+      <div class="form-group row" ng-show="servicevo.type === 'REST'">
+        <label for="service_endpoint" class="col-xs-2 col-form-label">Relative Path:</label>
+        <div class="col-xs-9">
+          <div class="input-group">
+            <input type="text" id="service_path" class="form-control" ng-model="rr.path" placeholder="Enter Relative Path">
+          </div>
+        </div>
+      </div>
+
+      <div class="form-group row" ng-show="servicevo.type === 'REST'">
+        <label class="col-xs-2 col-form-label">Queries</label>
+        <div class="col-xs-9">
+          <fieldset data-ng-repeat="q in rr.queriesArr">
+              <div class="row">
+                <div class="col-xs-5">
+                  <input type="text" class="form-control" ng-model="q.k" placeholder="e.g. name">
                 </div>
-              </div>
 
-              <div class="col-xs-5">
-                <input type="text" class="form-control" id="req-head-val-{{ header.id }}" ng-model="header.v" placeholder="e.g. application/json">
-              </div>
+                <div class="col-xs-5">
+                  <input type="text" class="form-control" ng-model="q.v" placeholder="e.g. value">
+                </div>
 
-              <div class="col-xs-1">
-                <button type="button" class="btn btn-warning" ng-show="$last && !$first" ng-click="removeReqHeader(rr)">
-                  <span class="glyphicon glyphicon-minus"></span>
-                </button>
-              </div>
+                <div class="col-xs-1">
+                  <button type="button" class="btn btn-warning" ng-show="$last && !$first" ng-click="removeQuery(rr)">
+                    <span class="glyphicon glyphicon-minus"></span>
+                  </button>
+                </div>
 
-              <div class="col-xs-1">
-                <button type="button" class="btn btn-success" ng-show="$last" ng-click="addNewReqHeader(rr)">
-                  <span class="glyphicon glyphicon-plus"></span>
-                </button>
+                <div class="col-xs-1">
+                  <button type="button" class="btn btn-success" ng-show="$last" ng-click="addQuery(rr)">
+                    <span class="glyphicon glyphicon-plus"></span>
+                  </button>
+                </div>
               </div>
+          </fieldset>
+        </div>
+      </div>
+
+      <div class="form-group row" ng-show="servicevo.type === 'REST'">
+          <label for="service_payloadtype" class="col-xs-2 col-form-label">Payload Type:</label>
+          <div class="col-xs-9">
+            <div class="radio">
+              <label class="move-radios">
+                  <input ng-model="rr.payloadType" id="service_payloadtype" ng-click="setContentType(rr, 'application/json')" type="radio" ng-value="'JSON'" ng-required="servicevo.type === 'REST' && !rr.payloadType">
+                    JSON
+              </label>
+              <label class="move-radios">
+                  <input ng-model="rr.payloadType" id="service_payloadtype" ng-click="setContentType(rr, 'text/xml')" type="radio" ng-value="'XML'" ng-required="servicevo.type === 'REST' && !rr.payloadType">
+                    XML
+              </label>
+              <label class="move-radios">
+                  <input ng-model="rr.payloadType" ng-click="setContentType(rr, 'text/plain')" id="service_payloadtype" type="radio" ng-value="'PLAIN'" ng-required="servicevo.type === 'REST' && !rr.payloadType">
+                    Plaintext
+              </label>
             </div>
-        </fieldset>
+          </div>
+        </div>
+
+      <div class="form-group row" ng-show="servicevo.type !== 'MQ'">
+        <label class="col-xs-2 col-form-label">Request Headers</label>
+        <div class="col-xs-9">
+          <fieldset data-ng-repeat="header in rr.reqHeadersArr">
+              <div class="row">
+                <div class="col-xs-5">
+                  <div angucomplete-alt
+                    id="req-header-{{ header.id }}"
+                    placeholder="e.g. Content-Type"
+                    pause="100"
+                    initial-value="header.k"
+                    selected-object="header.k"
+                    local-data="possibleHeaders"
+                    override-suggestions="true"
+                    search-fields="name"
+                    title-field="name"
+                    minlength="3"
+                    input-class="form-control"
+                    match-class="highlight">
+                  </div>
+                </div>
+
+                <div class="col-xs-5">
+                  <input type="text" class="form-control" id="req-head-val-{{ header.id }}" ng-model="header.v" placeholder="e.g. application/json">
+                </div>
+
+                <div class="col-xs-1">
+                  <button type="button" class="btn btn-warning" ng-show="$last && !$first" ng-click="removeReqHeader(rr)">
+                    <span class="glyphicon glyphicon-minus"></span>
+                  </button>
+                </div>
+
+                <div class="col-xs-1">
+                  <button type="button" class="btn btn-success" ng-show="$last" ng-click="addNewReqHeader(rr)">
+                    <span class="glyphicon glyphicon-plus"></span>
+                  </button>
+                </div>
+              </div>
+          </fieldset>
+        </div>
       </div>
-    </div>
 
-    <div class="form-group row" ng-class="servicevo.type === 'REST' ? '' : 'req'" ng-show="rr.method !== 'GET' || servicevo.type === 'SOAP'">
-      <label for="service_request_payload" class="col-xs-2 col-form-label">Request Payload:</label>
-      <div class="col-xs-9">
-        <textarea ng-required="servicevo.type === 'SOAP'" id="service_request_payload" class="form-control vertResize" ng-model="rr.requestpayload" placeholder="Insert Request Payload"></textarea>
+      <div class="form-group row" ng-class="servicevo.type === 'REST' ? '' : 'req'" ng-show="rr.method !== 'GET' || servicevo.type === 'SOAP'">
+        <label for="service_request_payload" class="col-xs-2 col-form-label">Request Payload:</label>
+        <div class="col-xs-9">
+          <textarea ng-required="servicevo.type === 'SOAP'" id="service_request_payload" class="form-control vertResize" ng-model="rr.requestpayload" placeholder="Insert Request Payload"></textarea>
+        </div>
       </div>
-    </div>
 
 
-    <div class="form-group row" ng-show="servicevo.type !== 'MQ'">
-      <label for="service_response_status" class="col-xs-2 col-form-label">Response Status:</label>
-      <div class="col-xs-2">
-        <div angucomplete-alt
-          id="res-status"
-          placeholder="e.g. 200"
-          pause="100"
-          initial-value="rr.resStatus.toString()"
-          selected-object="rr.resStatus"
-          local-data="statusCodes"
-          search-fields="value"
-          title-field="value,desc"
-          minlength="2"
-          input-class="form-control"
-          match-class="highlight">
+      <div class="form-group row" ng-show="servicevo.type !== 'MQ'">
+        <label for="service_response_status" class="col-xs-2 col-form-label">Response Status:</label>
+        <div class="col-xs-2">
+          <div angucomplete-alt
+            id="res-status"
+            placeholder="e.g. 200"
+            pause="100"
+            initial-value="rr.resStatus.toString()"
+            selected-object="rr.resStatus"
+            local-data="statusCodes"
+            search-fields="value"
+            title-field="value,desc"
+            minlength="2"
+            input-class="form-control"
+            match-class="highlight">
+          </div>
         </div>
       </div>
-    </div>
 
-    <div class="form-group row" ng-show="servicevo.type !== 'MQ'">
-      <label class="col-xs-2 col-form-label">Response Headers:</label>
-      <div class="col-xs-9">
-        <fieldset data-ng-repeat="header in rr.resHeadersArr">
-            <div class="row">
-              <div class="col-xs-5">
-                <div angucomplete-alt
-                  id="res-header-{{ header.id }}"
-                  placeholder="e.g. Content-Type"
-                  pause="100"
-                  initial-value="header.k"
-                  selected-object="header.k"
-                  local-data="possibleHeaders"
-                  override-suggestions="true"
-                  search-fields="name"
-                  title-field="name"
-                  minlength="3"
-                  input-class="form-control"
-                  match-class="highlight">
+      <div class="form-group row" ng-show="servicevo.type !== 'MQ'">
+        <label class="col-xs-2 col-form-label">Response Headers:</label>
+        <div class="col-xs-9">
+          <fieldset data-ng-repeat="header in rr.resHeadersArr">
+              <div class="row">
+                <div class="col-xs-5">
+                  <div angucomplete-alt
+                    id="res-header-{{ header.id }}"
+                    placeholder="e.g. Content-Type"
+                    pause="100"
+                    initial-value="header.k"
+                    selected-object="header.k"
+                    local-data="possibleHeaders"
+                    override-suggestions="true"
+                    search-fields="name"
+                    title-field="name"
+                    minlength="3"
+                    input-class="form-control"
+                    match-class="highlight">
+                  </div>
                 </div>
-              </div>
 
-              <div class="col-xs-5">
-                <input type="text" class="form-control" id="res-head-val-{{ header.id }}" ng-model="header.v" placeholder="e.g. application/json">
-              </div>
+                <div class="col-xs-5">
+                  <input type="text" class="form-control" id="res-head-val-{{ header.id }}" ng-model="header.v" placeholder="e.g. application/json">
+                </div>
 
-              <div class="col-xs-1">
-                <button type="button" class="btn btn-warning" ng-show="$last && !$first" ng-click="removeResHeader(rr)">
-                  <span class="glyphicon glyphicon-minus"></span>
-                </button>
-              </div>
+                <div class="col-xs-1">
+                  <button type="button" class="btn btn-warning" ng-show="$last && !$first" ng-click="removeResHeader(rr)">
+                    <span class="glyphicon glyphicon-minus"></span>
+                  </button>
+                </div>
 
-              <div class="col-xs-1">
-                <button type="button" class="btn btn-success" ng-show="$last" ng-click="addNewResHeader(rr)">
-                  <span class="glyphicon glyphicon-plus"></span>
-                </button>
+                <div class="col-xs-1">
+                  <button type="button" class="btn btn-success" ng-show="$last" ng-click="addNewResHeader(rr)">
+                    <span class="glyphicon glyphicon-plus"></span>
+                  </button>
+                </div>
               </div>
-            </div>
-        </fieldset>
+          </fieldset>
+        </div>
       </div>
-    </div>
 
-    <div class="form-group row" ng-class="servicevo.type === 'REST' ? '' : 'req'">
-      <label for="service_response_payload" class="col-xs-2 col-form-label">Response Payload:</label>
-      <div class="col-xs-9">
-        <textarea ng-required="servicevo.type === 'SOAP'" id="service_response_payload" class="form-control vertResize" ng-model="rr.responsepayload" placeholder="Insert Response Payload"></textarea>
+      <div class="form-group row" ng-class="servicevo.type === 'REST' ? '' : 'req'">
+        <label for="service_response_payload" class="col-xs-2 col-form-label">Response Payload:</label>
+        <div class="col-xs-9">
+          <textarea ng-required="servicevo.type === 'SOAP'" id="service_response_payload" class="form-control vertResize" ng-model="rr.responsepayload" placeholder="Insert Response Payload"></textarea>
+        </div>
       </div>
+    </fieldset>
+
+    <div ng-show="totalDisplayed <= servicevo.rawpairs.length">
+      <hr style="height:1px;border:none;color:#9f9696;background-color:#9f9696;" />
+      <btn class="btn btn-default" ng-click="loadMore()">
+        Show more pairs <span class="glyphicon glyphicon-chevron-down"></span>
+      </btn>
     </div>
-  </fieldset>
 
   <div class="form-group row">
     <div class="col-sm-12">