diff --git a/app/views/layouts/registrant/application.haml b/app/views/layouts/registrant/application.haml
index 2eba33ea5..f0a3a58aa 100644
--- a/app/views/layouts/registrant/application.haml
+++ b/app/views/layouts/registrant/application.haml
@@ -49,7 +49,7 @@
 
     %footer.footer
       .container
-        %row
+        .row
           .col-md-6
             = image_tag 'eis-logo-et.png'
           .col-md-6.text-right
diff --git a/app/views/registrant/domains/index.html.erb b/app/views/registrant/domains/index.html.erb
index 6c8b3c579..427b00b93 100644
--- a/app/views/registrant/domains/index.html.erb
+++ b/app/views/registrant/domains/index.html.erb
@@ -1,17 +1,20 @@
-<%= render 'shared/title', name: t(:domains) %>
+<div class="page-header">
+    <h1><%= t '.header' %></h1>
+</div>
+
 <div class="row">
     <div class="col-md-12">
-        <%= search_form_for [:registrant, @q], html: { style: 'margin-bottom: 0;', autocomplete: 'off' } do |f| %>
+        <%= search_form_for [:registrant, @q], html: { autocomplete: 'off' } do |f| %>
             <div class="row">
                 <div class="col-md-3">
                     <div class="form-group">
-                        <%= f.label :name %>
+                        <%= f.label :name, for: nil %>
                         <%= f.search_field :name_matches, value: params[:q][:name_matches], class: 'form-control', placeholder: t(:name) %>
                     </div>
                 </div>
                 <div class="col-md-3">
                     <div class="form-group">
-                        <%= f.label t(:registrant_ident) %>
+                        <%= f.label t(:registrant_ident), for: nil %>
                         <%= f.search_field :registrant_ident_eq, class: 'form-control', placeholder: t(:registrant_ident) %>
                     </div>
                 </div>
@@ -19,13 +22,13 @@
             <div class="row">
                 <div class="col-md-3">
                     <div class="form-group">
-                        <%= f.label t(:valid_to_from) %>
+                        <%= f.label t(:valid_to_from), for: nil %>
                         <%= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_from) %>
                     </div>
                 </div>
                 <div class="col-md-3">
                     <div class="form-group">
-                        <%= f.label t(:valid_to_until) %>
+                        <%= f.label t(:valid_to_until), for: nil %>
                         <%= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until) %>
                     </div>
                 </div>
diff --git a/config/locales/registrant/domains.en.yml b/config/locales/registrant/domains.en.yml
index d426e24fe..be0a1c638 100644
--- a/config/locales/registrant/domains.en.yml
+++ b/config/locales/registrant/domains.en.yml
@@ -2,6 +2,7 @@ en:
   registrant:
     domains:
       index:
+        header: Domains
         registrant: Registrant
         reset_btn: Reset