diff --git a/app/views/admin/disputes/_form.html.erb b/app/views/admin/disputes/_form.html.erb
index a234c17bc..38d5fbda2 100644
--- a/app/views/admin/disputes/_form.html.erb
+++ b/app/views/admin/disputes/_form.html.erb
@@ -10,6 +10,9 @@
                     </div>
                 </div>
                 <div class="panel-body">
+                <div>
+                    <p>As per domain law, expiry time is <%= Setting.dispute_period_in_months / 12 %> years ahead from start date.</p>
+                </div>
                     <div class="form-group">
                         <div class="col-md-4 control-label">
                             <%= f.label :domain_name %>
@@ -32,17 +35,16 @@
                             <%= f.label :starts_at %>
                         </div>
                         <div class="col-md-7">
-                            <%= f.text_field(:starts_at, placeholder: t(:optional), class: 'form-control') %>
-                            <span class="help-block"><%= t '.password_hint' %></span>
+                            <%= f.text_field(:starts_at, class: 'form-control js-datepicker') %>
+                            <span class="help-block"><%= t '.in_future' %></span>
                         </div>
                     </div>
                     <div class="form-group">
                         <div class="col-md-4 control-label">
-                            <%= f.label :expires_at %>
+                            <%= f.label :comment %>
                         </div>
                         <div class="col-md-7">
-                            <%= f.text_field(:expires_at, placeholder: t(:optional), class: 'form-control') %>
-                            <span class="help-block"><%= t '.password_hint' %></span>
+                            <%= f.text_field(:comment, placeholder: t(:optional), class: 'form-control') %>
                         </div>
                     </div>
                 </div>
diff --git a/app/views/admin/disputes/edit.haml b/app/views/admin/disputes/edit.haml
index 51d77f0cc..966976891 100644
--- a/app/views/admin/disputes/edit.haml
+++ b/app/views/admin/disputes/edit.haml
@@ -1,3 +1,3 @@
-= render 'shared/title', name: t(:edit_pw)
+= render 'shared/title', name: t(:edit_dispute)
 
 = render 'form'
diff --git a/app/views/admin/disputes/index.haml b/app/views/admin/disputes/index.haml
index 63438ad9e..86ba2a093 100644
--- a/app/views/admin/disputes/index.haml
+++ b/app/views/admin/disputes/index.haml
@@ -40,14 +40,12 @@
               = sort_link(@q, 'name')
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'password')
+            %th{class: 'col-xs-2'}
+              = sort_link(@q, 'starts_at')
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'expires_at')
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'comment')
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'created_at', t(:created_at))
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'updated_at', t(:updated_at))
             %th{class: 'col-xs-2'}
               = t(:actions)
         %tbody
@@ -55,12 +53,11 @@
             %tr
               %td= x.domain_name
               %td= x.password
+              %td= x.starts_at
               %td= x.expires_at
               %td= x.comment
-              %td= l(x.created_at, format: :short)
-              %td= l(x.updated_at, format: :short)
               %td
-                = link_to(t(:edit_pw), edit_admin_dispute_path(id: x.id),
+                = link_to(t(:edit), edit_admin_dispute_path(id: x.id),
                   class: 'btn btn-primary btn-xs')
                 = link_to(t(:delete), delete_admin_dispute_path(id: x.id),
                   data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger btn-xs')
diff --git a/app/views/admin/settings/index.haml b/app/views/admin/settings/index.haml
index 23f87c4b2..977f81202 100644
--- a/app/views/admin/settings/index.haml
+++ b/app/views/admin/settings/index.haml
@@ -48,7 +48,7 @@
           = render 'setting_row', var: :request_confrimation_on_registrant_change_enabled
           = render 'setting_row', var: :request_confirmation_on_domain_deletion_enabled
           = render 'setting_row', var: :address_processing
-
+          = render 'setting_row', var: :dispute_period_in_months
           %tr
             %td.col-md-6= label_tag :default_language
             %td.col-md-6