diff --git a/app/views/registrant/domains/_domain.html.erb b/app/views/registrant/domains/_domain.html.erb
index 7228c9399..8cc8a490b 100644
--- a/app/views/registrant/domains/_domain.html.erb
+++ b/app/views/registrant/domains/_domain.html.erb
@@ -1,4 +1,4 @@
-<tr>
+<tr class="domain">
     <td><%= link_to domain, registrant_domain_path(domain) %></td>
     <td>
         <%= link_to domain.registrant.name,
diff --git a/app/views/registrant/domains/index.html.erb b/app/views/registrant/domains/index.html.erb
index 43a9122eb..acb9afcff 100644
--- a/app/views/registrant/domains/index.html.erb
+++ b/app/views/registrant/domains/index.html.erb
@@ -76,7 +76,7 @@
 <div class="row">
     <div class="col-md-12">
         <div class="table-responsive">
-            <table class="table table-hover table-bordered table-condensed">
+            <table class="table table-hover table-bordered table-condensed domains">
                 <thead>
                 <tr>
                     <th class="col-xs-2">
diff --git a/app/views/registrant/domains/partials/_domain_contact.html.erb b/app/views/registrant/domains/partials/_domain_contact.html.erb
new file mode 100644
index 000000000..e4eaf7115
--- /dev/null
+++ b/app/views/registrant/domains/partials/_domain_contact.html.erb
@@ -0,0 +1,7 @@
+<% contact = domain_contact.contact %>
+
+<tr class="<%= domain_contact.model_name.singular.dasherize %>">
+    <td><%= link_to contact, registrant_domain_contact_path(domain, contact) %></td>
+    <td><%= contact.code %></td>
+    <td><%= contact.email %></td>
+</tr>
\ No newline at end of file
diff --git a/app/views/registrant/domains/partials/_contacts.html.erb b/app/views/registrant/domains/partials/_domain_contacts.html.erb
similarity index 69%
rename from app/views/registrant/domains/partials/_contacts.html.erb
rename to app/views/registrant/domains/partials/_domain_contacts.html.erb
index c66d364c3..9b41288b7 100644
--- a/app/views/registrant/domains/partials/_contacts.html.erb
+++ b/app/views/registrant/domains/partials/_domain_contacts.html.erb
@@ -1,11 +1,12 @@
 <% panel_class = errors ? 'panel-danger' : 'panel-default' %>
 <div class="<%= panel_class %> panel">
     <div class="panel-heading">
-        <%= header %>
+        <%= t ".header_#{domain_contacts.model_name.plural.underscore}" %>
     </div>
 
     <div class="table-responsive">
-        <table class="table table-hover table-bordered table-condensed">
+        <table class="table table-hover table-bordered table-condensed
+            <%= domain_contacts.model_name.plural.dasherize %>">
             <thead>
                 <tr>
                     <th class="col-xs-4"><%= Contact.human_attribute_name :name %></th>
@@ -15,15 +16,9 @@
             </thead>
 
             <tbody>
-                <% contacts.each do |contact| %>
-                    <tr>
-                        <td>
-                            <%= link_to contact, registrant_domain_contact_path(domain, contact) %>
-                        </td>
-                        <td><%= contact.code %></td>
-                        <td><%= contact.email %></td>
-                    </tr>
-                <% end %>
+                <%= render partial: 'registrant/domains/partials/domain_contact',
+                           collection: domain_contacts,
+                           locals: { domain: domain } %>
             </tbody>
 
             <% if errors %>
diff --git a/app/views/registrant/domains/show.html.erb b/app/views/registrant/domains/show.html.erb
index fdbbc76cb..88d238c7d 100644
--- a/app/views/registrant/domains/show.html.erb
+++ b/app/views/registrant/domains/show.html.erb
@@ -19,20 +19,18 @@
 
 <div class="row">
     <div class="col-md-12">
-        <%= render 'registrant/domains/partials/contacts',
-                   header: t('.tech_contacts'),
+        <%= render 'registrant/domains/partials/domain_contacts',
                    domain: @domain,
-                   contacts: @domain.tech_contacts,
+                   domain_contacts: @domain.tech_domain_contacts,
                    errors: @domain.errors.messages[:tech_contacts] %>
     </div>
 </div>
 
 <div class="row">
     <div class="col-md-12">
-        <%= render 'registrant/domains/partials/contacts',
-                   header: t('.admin_contacts'),
+        <%= render 'registrant/domains/partials/domain_contacts',
                    domain: @domain,
-                   contacts: @domain.admin_contacts,
+                   domain_contacts: @domain.admin_domain_contacts,
                    errors: @domain.errors.messages[:admin_contacts] %>
     </div>
 </div>
diff --git a/config/locales/registrant/domains.en.yml b/config/locales/registrant/domains.en.yml
index ebb3d2aec..8df58239f 100644
--- a/config/locales/registrant/domains.en.yml
+++ b/config/locales/registrant/domains.en.yml
@@ -9,11 +9,11 @@ en:
       download_list:
         registrant: Registrant
 
-      show:
-        admin_contacts: Administrative contacts
-        tech_contacts: Technical contacts
-
       partials:
         registrant:
           header: Registrant
           view_details_btn: View details
+
+        domain_contacts:
+          header_admin_domain_contacts: Administrative contacts
+          header_tech_domain_contacts: Technical contacts