diff --git a/app/views/admin/domains/partials/_general.haml b/app/views/admin/domains/partials/_general.haml
deleted file mode 100644
index d64654a8f..000000000
--- a/app/views/admin/domains/partials/_general.haml
+++ /dev/null
@@ -1,32 +0,0 @@
-.panel.panel-default
- .panel-heading
- %h3.panel-title= t(:general)
- .panel-body
- %dl.dl-horizontal
- %dt= t(:name)
- %dd= @domain.name
-
- %dt= t(:registered_at)
- %dd= l(@domain.registered_at)
-
- %dt= t(:registrar_name)
- %dd= link_to(@domain.registrar, admin_registrar_path(@domain.registrar))
-
- %dt= t(:authinfo_pw)
- %dd
- = text_field_tag :password, @domain.auth_info, readonly: true, class: 'partially-hidden'
-
- %dt= t(:valid_from)
- %dd= l(@domain.valid_from)
-
- %dt= t(:valid_to)
- %dd= l(@domain.valid_to)
-
- %dt= t('.outzone_time')
- %dd= l(@domain.outzone_at)
-
- %dt= t('.delete_time')
- %dd= l(@domain.delete_at)
-
- %dt= t('.force_delete_time')
- %dd= l(@domain.force_delete_at)
diff --git a/app/views/admin/domains/partials/_general.html.erb b/app/views/admin/domains/partials/_general.html.erb
new file mode 100644
index 000000000..ff4ea6bbd
--- /dev/null
+++ b/app/views/admin/domains/partials/_general.html.erb
@@ -0,0 +1,37 @@
+
+
+
+ <%= t(:general) %>
+
+
+
+
+ - <%= t(:name) %>
+ - <%= @domain.name %>
+
+ - <%= t(:registered_at) %>
+ - <%= l(@domain.registered_at) %>
+
+ - <%= t(:registrar_name) %>
+ - <%= link_to(@domain.registrar, admin_registrar_path(@domain.registrar)) %>
+
+ - <%= t(:authinfo_pw) %>
+ - <%= text_field_tag :password, @domain.auth_info, readonly: true, class: 'partially-hidden' %>
+
+ - <%= t(:valid_from) %>
+ - <%= l(@domain.valid_from) %>
+
+ - <%= t(:valid_to) %>
+ - <%= l(@domain.valid_to) %>
+
+ - <%= t('.outzone_time') %>
+ - <%= l(@domain.outzone_at) %>
+
+ - <%= t('.delete_time') %>
+ - <%= l(@domain.delete_at) %>
+
+ - <%= t('.force_delete_time') %>
+ - <%= l(@domain.force_delete_at) %>
+
+
+
diff --git a/app/views/registrant/domains/partials/_general.haml b/app/views/registrant/domains/partials/_general.haml
deleted file mode 100644
index 7fb355c1f..000000000
--- a/app/views/registrant/domains/partials/_general.haml
+++ /dev/null
@@ -1,32 +0,0 @@
-.panel.panel-default
- .panel-heading
- %h3.panel-title= t(:general)
- .panel-body
- %dl.dl-horizontal
- %dt= t(:name)
- %dd= @domain.name
-
- %dt= t(:registered_at)
- %dd= l(@domain.registered_at)
-
- %dt= t(:registrar_name)
- %dd= link_to(@domain.registrar, registrant_registrar_path(@domain.registrar))
-
- %dt= t(:authinfo_pw)
- %dd
- = text_field_tag :password, @domain.auth_info, readonly: true, class: 'partially-hidden'
-
- %dt= t(:valid_from)
- %dd= l(@domain.valid_from)
-
- %dt= t(:valid_to)
- %dd= l(@domain.valid_to)
-
- %dt= t(:outzone_at)
- %dd= l(@domain.outzone_at)
-
- %dt= t(:delete_at)
- %dd= l(@domain.delete_at)
-
- %dt= t(:force_delete_at)
- %dd= l(@domain.force_delete_at)
diff --git a/app/views/registrant/domains/partials/_general.html.erb b/app/views/registrant/domains/partials/_general.html.erb
new file mode 100644
index 000000000..57dea3e30
--- /dev/null
+++ b/app/views/registrant/domains/partials/_general.html.erb
@@ -0,0 +1,37 @@
+
+
+
+ <%= t(:general) %>
+
+
+
+
+ - <%= t(:name) %>
+ - <%= @domain.name %>
+
+ - <%= t(:registered_at) %>
+ - <%= l(@domain.registered_at) %>
+
+ - <%= t(:registrar_name) %>
+ - <%= link_to(@domain.registrar, registrant_registrar_path(@domain.registrar)) %>
+
+ - <%= t(:authinfo_pw) %>
+ - <%= text_field_tag :password, @domain.auth_info, readonly: true, class: 'partially-hidden' %>
+
+ - <%= t(:valid_from) %>
+ - <%= l(@domain.valid_from) %>
+
+ - <%= t(:valid_to) %>
+ - <%= l(@domain.valid_to) %>
+
+ - <%= t(:outzone_at) %>
+ - <%= l(@domain.outzone_at) %>
+
+ - <%= t(:delete_at) %>
+ - <%= l(@domain.delete_at) %>
+
+ - <%= t(:force_delete_at) %>
+ - <%= l(@domain.force_delete_at) %>
+
+
+
diff --git a/app/views/registrar/domains/partials/_general.haml b/app/views/registrar/domains/partials/_general.haml
deleted file mode 100644
index db06b3376..000000000
--- a/app/views/registrar/domains/partials/_general.haml
+++ /dev/null
@@ -1,27 +0,0 @@
-.panel.panel-default
- .panel-heading
- %h3.panel-title= t(:general)
- .panel-body
- %dl.dl-horizontal
- %dt= t(:authinfo_pw)
- %dd= @data.css('pw').text.present? ? @data.css('pw').text : t('hidden')
-
- - if @data.css('pw').text.blank?
- %dt= t(:registrar_name)
- %dd= @data.css('clID').text
-
- - registrant = Contact.find_by_code(@data.css('registrant').text)
- %dt= t('.registrant')
- %dd= "#{registrant.name} (#{@data.css('registrant').text})"
-
- %dt= t('.registered')
- %dd= @data.css('crDate').text
-
- %dt= t(:valid_to)
- %dd= @data.css('exDate').text
-
- %dt= t('.created')
- %dd= @data.css('crDate').text
-
- %dt= t('.updated')
- %dd= @data.css('upDate').text
diff --git a/app/views/registrar/domains/partials/_general.html.erb b/app/views/registrar/domains/partials/_general.html.erb
new file mode 100644
index 000000000..7d878bba9
--- /dev/null
+++ b/app/views/registrar/domains/partials/_general.html.erb
@@ -0,0 +1,35 @@
+
+
+
+ <%= t(:general) %>
+
+
+
+
+
+ - <%= t(:authinfo_pw) %>
+ - <%= @data.css('pw').text.present? ? @data.css('pw').text : t('hidden') %>
+
+ <% if @data.css('pw').text.blank? %>
+ - <%= t(:registrar_name) %>
+ - <%= @data.css('clID').text %>
+ <% end %>
+
+ <% registrant = Contact.find_by_code(@data.css('registrant').text) %>
+ - <%= t('.registrant') %>
+ - <%= "#{registrant.name} (#{@data.css('registrant').text})" %>
+
+ - <%= t('.registered') %>
+ - <%= @data.css('crDate').text %>
+
+ - <%= t(:valid_to) %>
+ - <%= @data.css('exDate').text %>
+
+ - <%= t('.created') %>
+ - <%= @data.css('crDate').text %>
+
+ - <%= t('.updated') %>
+ - <%= @data.css('upDate').text %>
+
+
+