diff --git a/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html b/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html
index d7d4c77b1..9d78d1c1f 100644
--- a/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html
+++ b/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html
@@ -147,19 +147,27 @@
                                 </li>
                             </ul>
                         </span>
-                        <span ng-if="record.type == 'SPF'">
-                            <ul class="table-cell-list">
-                                <li ng-repeat="item in record.spfRecordData track by $index"
-                                    ng-if="!record.onlyFour || $index <= 3">{{item}}</li>
-                                <li ng-if="record.onlyFour && record.spfRecordData.length > 4">
-                                    <a href ng-click="record.onlyFour=false">more...</a>
-                                </li>
-                                <li ng-if="!record.onlyFour">
-                                    <a href ng-click="record.onlyFour=true">less...</a>
-                                </li>
-                            </ul>
-                        </span>
                         <span ng-if="record.type == 'CNAME'">{{ record.cnameRecordData }}</span>
+                        <span ng-if="record.type == 'DS'">
+                            <table>
+                                <tr>
+                                    <td>Keytag:</td>
+                                    <td> {{record.dsKeyTag}} </td>
+                                </tr>
+                                <tr>
+                                    <td>Algorithm:</td>
+                                    <td> {{record.dsAlgorithm}} </td>
+                                </tr>
+                                <tr>
+                                    <td>Digesttype:</td>
+                                    <td> {{record.dsDigestType}} </td>
+                                </tr>
+                                <tr>
+                                    <td>Digest:</td>
+                                    <td> {{record.dsDigest}} </td>
+                                </tr>
+                            </table>
+                        </span>
                         <span ng-if="record.type == 'MX'">
                             <ul class="table-cell-list">
                                 <li ng-repeat="item in record.mxItems track by $index"
@@ -174,11 +182,11 @@
                                 </li>
                             </ul>
                         </span>
-                        <span ng-if="record.type == 'PTR'">
+                        <span ng-if="record.type == 'NS'">
                             <ul class="table-cell-list">
-                                <li ng-repeat="item in record.ptrRecordData track by $index"
+                                <li ng-repeat="item in record.nsRecordData track by $index"
                                     ng-if="!record.onlyFour || $index <= 3">{{item}}</li>
-                                <li ng-if="record.onlyFour && record.ptrRecordData.length > 4">
+                                <li ng-if="record.onlyFour && record.nsRecordData.length > 4">
                                     <a href ng-click="record.onlyFour=false">more...</a>
                                 </li>
                                 <li ng-if="!record.onlyFour">
@@ -186,12 +194,11 @@
                                 </li>
                             </ul>
                         </span>
-                        <span ng-if="record.type == 'TXT'">{{ record.textRecordData }}</span>
-                        <span ng-if="record.type == 'NS'">
+                        <span ng-if="record.type == 'PTR'">
                             <ul class="table-cell-list">
-                                <li ng-repeat="item in record.nsRecordData track by $index"
-                                ng-if="!record.onlyFour || $index <= 3">{{item}}</li>
-                                <li ng-if="record.onlyFour && record.nsRecordData.length > 4">
+                                <li ng-repeat="item in record.ptrRecordData track by $index"
+                                    ng-if="!record.onlyFour || $index <= 3">{{item}}</li>
+                                <li ng-if="record.onlyFour && record.ptrRecordData.length > 4">
                                     <a href ng-click="record.onlyFour=false">more...</a>
                                 </li>
                                 <li ng-if="!record.onlyFour">
@@ -231,6 +238,18 @@
                                 </tr>
                             </table>
                         </span>
+                        <span ng-if="record.type == 'SPF'">
+                            <ul class="table-cell-list">
+                                <li ng-repeat="item in record.spfRecordData track by $index"
+                                    ng-if="!record.onlyFour || $index <= 3">{{item}}</li>
+                                <li ng-if="record.onlyFour && record.spfRecordData.length > 4">
+                                    <a href ng-click="record.onlyFour=false">more...</a>
+                                </li>
+                                <li ng-if="!record.onlyFour">
+                                    <a href ng-click="record.onlyFour=true">less...</a>
+                                </li>
+                            </ul>
+                        </span>
                         <span ng-if="record.type == 'SRV'">
                             <ul class="table-cell-list">
                                 <li ng-repeat="item in record.srvItems track by $index"
@@ -262,6 +281,7 @@
                                 </li>
                             </ul>
                         </span>
+                        <span ng-if="record.type == 'TXT'">{{ record.textRecordData }}</span>
                         </span>
                     </td>
                     @if(meta.sharedDisplayEnabled) {
diff --git a/modules/portal/app/views/zones/zoneTabs/manageZone.scala.html b/modules/portal/app/views/zones/zoneTabs/manageZone.scala.html
index d00f07f5d..788800061 100644
--- a/modules/portal/app/views/zones/zoneTabs/manageZone.scala.html
+++ b/modules/portal/app/views/zones/zoneTabs/manageZone.scala.html
@@ -355,7 +355,7 @@
                         ng-model="currentAclRule.recordTypes"
                         multiple
                         ng-disabled="aclModal.details.readOnly"
-                        ng-options="type for type in recordTypes">
+                        ng-options="type for type in aclRecordTypes">
                 </select>
                 <button type = "button"
                         class="btn btn-sm btn-info pull-right"
diff --git a/modules/portal/public/lib/controllers/controller.manageZones.js b/modules/portal/public/lib/controllers/controller.manageZones.js
index ac4474f9d..aac041786 100644
--- a/modules/portal/public/lib/controllers/controller.manageZones.js
+++ b/modules/portal/public/lib/controllers/controller.manageZones.js
@@ -63,6 +63,7 @@ angular.module('controller.manageZones', [])
             readOnly: false
         }
     };
+    $scope.aclRecordTypes = ['A', 'AAAA', 'CNAME', 'DS', 'MX', 'NS', 'PTR', 'SPF', 'SRV', 'SSHFP', 'TXT'];
 
     /**
      * Zone modal control functions
diff --git a/modules/portal/public/lib/controllers/controller.records.js b/modules/portal/public/lib/controllers/controller.records.js
index 5f3763543..80f836503 100644
--- a/modules/portal/public/lib/controllers/controller.records.js
+++ b/modules/portal/public/lib/controllers/controller.records.js
@@ -24,7 +24,7 @@ angular.module('controller.records', [])
     $scope.query = "";
     $scope.alerts = [];
 
-    $scope.recordTypes = ['A', 'AAAA', 'CNAME', 'MX', 'NS', 'TXT', 'SRV', 'PTR', 'SPF', 'SSHFP'];
+    $scope.recordTypes = ['A', 'AAAA', 'CNAME', 'MX', 'NS', 'PTR', 'SPF', 'SRV', 'SSHFP', 'TXT'];
     $scope.sshfpAlgorithms = [{name: '(1) RSA', number: 1}, {name: '(2) DSA', number: 2}, {name: '(3) ECDSA', number: 3},
         {name: '(4) Ed25519', number: 4}];
     $scope.sshfpTypes = [{name: '(1) SHA-1', number: 1}, {name: '(2) SHA-256', number: 2}];
diff --git a/modules/portal/public/lib/services/records/service.records.js b/modules/portal/public/lib/services/records/service.records.js
index 4c8c0e102..4e54c875b 100644
--- a/modules/portal/public/lib/services/records/service.records.js
+++ b/modules/portal/public/lib/services/records/service.records.js
@@ -100,16 +100,6 @@ angular.module('service.records', [])
                     });
                     newRecord.onlyFour = true;
                     break;
-                case 'CNAME':
-                    newRecord.cnameRecordData = record.records[0].cname;
-                    break;
-                case 'MX':
-                    newRecord.mxItems = [];
-                    angular.forEach(record.records, function(item) {
-                        newRecord.mxItems.push(item);
-                    });
-                    newRecord.onlyFour = true;
-                    break;
                 case 'AAAA':
                     newRecord.aaaaRecordData = [];
                     angular.forEach(record.records, function(aaaaRecord) {
@@ -117,8 +107,22 @@ angular.module('service.records', [])
                     });
                     newRecord.onlyFour = true;
                     break;
-                case 'TXT':
-                    newRecord.textRecordData = record.records[0].text;
+                case 'CNAME':
+                    newRecord.cnameRecordData = record.records[0].cname;
+                    break;
+                case 'DS':
+                    newRecord.dsKeyTag = record.records[0].keytag;
+                    newRecord.dsAlgorithm = record.records[0].algorithm;
+                    newRecord.dsDigestType = record.records[0].digesttype;
+                    newRecord.dsDigest = record.records[0].digest;
+                    newRecord.canBeEdited = false;
+                    break;
+                case 'MX':
+                    newRecord.mxItems = [];
+                    angular.forEach(record.records, function(item) {
+                        newRecord.mxItems.push(item);
+                    });
+                    newRecord.onlyFour = true;
                     break;
                 case 'NS':
                     newRecord.nsRecordData = [];
@@ -145,13 +149,6 @@ angular.module('service.records', [])
                     newRecord.soaMinimum = record.records[0].minimum;
                     newRecord.canBeEdited = false;
                     break;
-                case 'SRV':
-                    newRecord.srvItems = [];
-                    angular.forEach(record.records, function(item) {
-                        newRecord.srvItems.push(item);
-                    });
-                    newRecord.onlyFour = true;
-                    break;
                 case 'SPF':
                     newRecord.spfRecordData = [];
                     angular.forEach(record.records, function(spfRecord) {
@@ -159,6 +156,13 @@ angular.module('service.records', [])
                     });
                     newRecord.onlyFour = true;
                     break;
+                case 'SRV':
+                    newRecord.srvItems = [];
+                    angular.forEach(record.records, function(item) {
+                        newRecord.srvItems.push(item);
+                    });
+                    newRecord.onlyFour = true;
+                    break;
                 case 'SSHFP':
                     newRecord.sshfpItems = [];
                     angular.forEach(record.records, function(item) {
@@ -166,6 +170,9 @@ angular.module('service.records', [])
                     });
                     newRecord.onlyFour = true;
                     break;
+                case 'TXT':
+                    newRecord.textRecordData = record.records[0].text;
+                    break;
                 default:
                     newRecord.canBeEdited = false;
             }
@@ -186,6 +193,12 @@ angular.module('service.records', [])
                         newRecord.records.push({"address": address});
                     });
                     break;
+                case 'AAAA':
+                    newRecord.records = [];
+                    angular.forEach(record.aaaaRecordData, function(address) {
+                        newRecord.records.push({"address": address});
+                    });
+                    break;
                 case 'CNAME':
                     newRecord.records = [{"cname": record.cnameRecordData}];
                     break;
@@ -195,15 +208,12 @@ angular.module('service.records', [])
                         newRecord.records.push({"preference": Number(record.preference), "exchange": record.exchange})
                     });
                     break;
-                case 'AAAA':
+                case 'NS':
                     newRecord.records = [];
-                    angular.forEach(record.aaaaRecordData, function(address) {
-                        newRecord.records.push({"address": address});
+                    angular.forEach(record.nsRecordData, function(address) {
+                      newRecord.records.push({"nsdname": address});
                     });
                     break;
-                case 'TXT':
-                    newRecord.records = [{"text": record.textRecordData}];
-                    break;
                 case 'PTR':
                     newRecord.records = [];
                     angular.forEach(record.ptrRecordData, function(ptrdname) {
@@ -232,11 +242,8 @@ angular.module('service.records', [])
                             "fingerprint": record.fingerprint})
                     });
                     break;
-                case 'NS':
-                    newRecord.records = [];
-                    angular.forEach(record.nsRecordData, function(address) {
-                      newRecord.records.push({"nsdname": address});
-                    });
+                case 'TXT':
+                    newRecord.records = [{"text": record.textRecordData}];
                     break;
                 default:
             }
@@ -245,6 +252,4 @@ angular.module('service.records', [])
             }
             return newRecord;
         };
-
-
     });