diff --git a/app/views/registrar/domains/partials/_dnskeys.haml b/app/views/registrar/domains/partials/_dnskeys.haml
index 5b8a95ade..7e8e5b940 100644
--- a/app/views/registrar/domains/partials/_dnskeys.haml
+++ b/app/views/registrar/domains/partials/_dnskeys.haml
@@ -2,41 +2,65 @@
   .panel-heading
     %h3.panel-title= t(:dnskeys)
   .panel-body{style: 'word-wrap: break-word;'}
-    - @data.css('dsData').each do |x|
-      %dl.dl-horizontal
-        - if x.css('digest').text.present?
-          %dt= t(:ds_key_tag)
-          %dd= x.css('keyTag').text
-          %dt= t(:ds_algorithm)
-          %dd= x.css('alg').first.text
-          %dt= t(:ds_digest_type)
-          %dd= x.css('digestType').text
-          %dt= t(:ds_digest)
-          %dd= x.css('digest').text
-          - @data.css('keyData').each do |x|
-            %dl.dl-horizontal
-            %dt= t(:flag)
-            %dd= x.css('flags').text
+    .table-responsive
+      %table.table.table-hover.table-condensed
+        %tbody
+        - @data.css('dsData').each_with_index do |x, index|
+          - if x.css('digest').text.present?
+            %tr
+              %td
+                %b= "#{t(:ds_key_tag)}:"
+                = x.css('keyTag').text
+            %tr
+              %td
+                %b= "#{t(:ds_algorithm)}:"
+                = x.css('alg').first.text
+            %tr
+              %td
+                %b= "#{t(:ds_digest_type)}:"
+                = x.css('digestType').text
+            %tr
+              %td
+                %b= "#{t(:ds_digest)}:"
+                = x.css('digest').text
+            %tr
+              %td
+                %b= "#{t(:flag)}:"
+                = x.css('keyData').css('flags').text
+            %tr
+              %td
+                %b= "#{t(:protocol)}:"
+                = x.css('keyData').css('protocol').text
+            %tr
+              %td
+                %b= "#{t(:algorithm)}:"
+                = x.css('alg').last.text
+            %tr
+              %td{:colspan => "3"}
+                %b= "#{t(:public_key)}:"
+                = x.css('keyData').css('pubKey').text
+            - if index != @data.css('keyData').size - 1
+              %tr
+                %td{:colspan => "3"}
+                  = " ".html_safe
 
-            %dt= t(:protocol)
-            %dd= x.css('protocol').text
-
-            %dt= t(:algorithm)
-            %dd= x.css('alg').text
-
-            %dt= t(:public_key)
-            %dd= x.css('pubKey').text
-    - if @data.css('dsData').empty?
-      %dl.dl-horizontal
-      - @data.css('keyData').each do |x|
-        %dt= t(:flag)
-        %dd= x.css('flags').text
-
-        %dt= t(:protocol)
-        %dd= x.css('protocol').text
-
-        %dt= t(:algorithm)
-        %dd= x.css('alg').text
-
-        %dt= t(:public_key)
-        %dd= x.css('pubKey').text
+        - if @data.css('dsData').empty?
+          - @data.css('keyData').each_with_index do |x, index|
+            %tr
+              %td
+                %b= "#{t(:flag)}:"
+                = x.css('flags').text
+              %td
+                %b= "#{t(:protocol)}:"
+                = x.css('protocol').text
+              %td
+                %b= "#{t(:algorithm)}:"
+                = x.css('alg').text
+            %tr
+              %td{:colspan => "3"}
+                %b= "#{t(:public_key)}:"
+                = x.css('pubKey').text
+            - if index != @data.css('keyData').size - 1
+              %tr
+                %td{:colspan => "3"}
+                  = " ".html_safe
\ No newline at end of file