diff --git a/netforce_clinic/layouts/clinic_cycle_item_form.xml b/netforce_clinic/layouts/clinic_cycle_item_form.xml
index 605feb6..a0ab314 100644
--- a/netforce_clinic/layouts/clinic_cycle_item_form.xml
+++ b/netforce_clinic/layouts/clinic_cycle_item_form.xml
@@ -9,23 +9,13 @@
     <field name="date"/>
     <tabs>
         <tab string="Nurse">
-            <field name="nurses" nolabel="1" span="6">
+            <field name="nurses" nolabel="1">
                 <list>
                     <field name="nurse_id"/>
                     <field name="categ_id"/>
                 </list>
             </field>
         </tab>
-        <!--
-        <tab string="Docor">
-            <field name="doctors" nolabel="1" span="6">
-                <list>
-                    <field name="doctor_id"/>
-                    <field name="categ_id"/>
-                </list>
-            </field>
-        </tab>
-        -->
     </tabs>
     <foot>
     </foot>
diff --git a/netforce_clinic/layouts/clinic_hd_case_form.xml.old b/netforce_clinic/layouts/clinic_hd_case_form.xml.old
deleted file mode 100644
index 970965a..0000000
--- a/netforce_clinic/layouts/clinic_hd_case_form.xml.old
+++ /dev/null
@@ -1,132 +0,0 @@
-<form model="clinic.hd.case" attrs='{"readonly":[["state","in",["uncompleted","completed"]]]}' show_company="1">
-    <head>
-        <field name="state"/>
-        <button string="Options" dropdown="1">
-            <!--<item string="Print Payment" method="print_payment"/>-->
-        </button>
-    </head>
-    <group span="6" columns="1">
-        <field name="number"/>
-        <field name="time_start"/>
-        <field name="cycle_id" required="1"/>
-        <field name="department_id"/>
-        <field name="visit_id" readonly="1"/>
-    </group>
-    <group span="6" columns="1">
-        <field name="patient_id" onchange="onchange_patient"/>
-        <field name="time_stop"/>
-        <field name="duration"/>
-        <field name="doctor_id"/>
-        <field name="nurse_id"/>
-    </group>
-    <tabs>
-        <tab string="General">
-            <field name="wh_start"/>
-            <field name="wh_stop"/>
-            <field name="bp_start"/>
-            <field name="per_bp_start"/>
-            <field name="bp_stop"/>
-            <field name="per_bp_stop"/> 
-            <field name="hct" onchange="onchange_hct"/>
-            <newline/>
-            <field offset="2" name="hct_msg" nolabel="1" readonly="1"/>
-            <field name="dialyzers" nolabel="1">
-                <list>
-                    <field name="dialyzer_id" domain="[['patient_id','=',parent.patient_id],['state','=','active']]" onchange="onchange_dialyzer"/>
-                    <field name="description"/>
-                    <field name="use_time"/>
-                    <field name="max_use_time"/>
-                    <field name="member_type"/>
-                    <field name="dialyzer_type"/>
-                    <field name="bid_flow_rate"/>
-                    <field name="ultrafittration"/>
-                    <field name="state"/>
-                </list>
-            </field>
-        </tab>
-        <tab string="Expenes">
-            <field name="gm_lines" count="3" nolabel="1">
-                <list>
-                    <field name="product_id" onchange="onchange_gmproduct"/>
-                    <field name="description"/>
-                    <field name="qty" onchange="onchange_gmline"/>
-                    <field name="uom_id"/>
-                    <field name="price" onchange="onchange_gmline"/>
-                    <field name="amount"/>
-                </list>
-            </field>
-            <group span="8" columns="1">
-                <group span="6" columns="1">
-                    <!--<field name="fee_partner_id" domain="[['type','=','org']]" attrs='{"required":[["fee_amount","!=",0]]}'/>-->
-                </group>
-                <group span="2" columns="1">
-                </group>
-            </group>
-            <group span="4" columns="1">
-                <field name="fee_total"/>
-                <field name="fee_amount"/>
-            </group>
-        </tab>
-        <tab string="Other Expenses">
-            <field name="lines" count="3" nolabel="1">
-                <list>
-                    <field name="product_id" onchange="onchange_product"/>
-                    <field name="description"/>
-                    <field name="qty" onchange="onchange_line"/>
-                    <field name="uom_id"/>
-                    <field name="price" onchange="onchange_line"/>
-                    <field name="amount"/>
-                </list>
-            </field>
-            <group span="8" form_layout="stacked" attrs='{"invisible":[["amount","=",0]]}'>
-                <separator string="Make a payment"/>
-                <field name="pay_amount" attrs='{"required":[["amount","!=",0]]}' onchange="onchange_pay" span="3"/>
-                <field name="pay_date" span="3"/>
-                <field name="pay_account_id" span="3"/>
-                <!--<button string="Add Payment" method="make_payment" icon="ok" size="small" type="success"/>-->
-                <button string="Pay" type="success" icon="ok" action="clinic_payment" states="in_progress"/>
-            </group>
-            <group span="4" columns="1">
-                <field name="total"/>
-                <field name="payment_lines" nolabel="1">
-                    <template>
-                        {{#each context.data}}
-                            <div class="form-group nf-field">
-                                <label class="control-label col-md-4">Less 
-                                        <a href="#name=payment&amp;mode=form&amp;active_id={{payment_id.0.}}">Payment</a>
-                                </label>
-                                <div class="col-md-8" style="text-align:right">
-                                    {{currency amount}}
-                                </div>
-                            </div>
-                        {{/each}}
-                    </template>
-                </field>
-                <field name="amount"/>
-            </group>
-        </tab>
-        <tab string="Other Info">
-            <group span="6" columns="1">
-                <separator string="Fees"/>
-                <!--<field name="fee_partner_id" domain="[['type','=','org']]" attrs='{"required":[["fee_amount","!=",0]]}'/>-->
-                <field name="fee_partner_id" domain="[['type','=','org']]"/>
-            </group>
-            <group span="6" columns="1">
-                <separator string="Note"/>
-                <field name="note" nolabel="1"/>
-            </group>
-        </tab>
-    </tabs>
-    <foot>
-        <button string="Process" type="success" icon="arrow-right" method="do_treatment" states="draft"/>
-        <button string="Complete" type="success" icon="ok" method="complete" states="in_progress"/>
-        <button string="Discontinue" type="danger" icon="remove" action="clinic_hd_case_distcont" states="in_progress"/>
-        <button string="Undo" type="default" icon="refresh" method="undo" states="completed"/>
-   </foot>
-    <related>
-        <field name="invoices" click_action="view_invoice"/>
-        <field name="pickings" click_action="view_picking"/>
-        <field name="payments" click_action="view_payment"/>
-        <field name="comments"/>
-    </related>
-</form>
diff --git a/netforce_clinic/layouts/clinic_hd_case_list.xml b/netforce_clinic/layouts/clinic_hd_case_list.xml
index 269741e..a91d6ad 100644
--- a/netforce_clinic/layouts/clinic_hd_case_list.xml
+++ b/netforce_clinic/layouts/clinic_hd_case_list.xml
@@ -1,15 +1,9 @@
 <list model="clinic.hd.case" colors='{"#cfc":[["state","=","completed"]],"#bcbbb9":[["state","=","cancelled"]]}'>
-    <search>
-        <field name="number"/>
-        <field name="time_start"/>
-        <field name="time_stop"/>
-        <field name="patient_id"/>
-        <field name="cycle_id"/>
-    </search>
     <field name="number"/>
     <field name="time_start"/>
     <field name="time_stop"/>
     <field name="cycle_id"/>
     <field name="patient_id"/>
+    <field name="department_id"/>
     <field name="state"/>
 </list>
diff --git a/netforce_clinic/layouts/clinic_hd_case_search.xml b/netforce_clinic/layouts/clinic_hd_case_search.xml
new file mode 100644
index 0000000..5e28e08
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_hd_case_search.xml
@@ -0,0 +1,7 @@
+<search model="clinic.hd.case">
+        <field name="number"/>
+        <field name="time_start"/>
+        <field name="time_stop"/>
+        <field name="patient_id"/>
+        <field name="cycle_id"/>
+</search>
diff --git a/netforce_clinic/layouts/clinic_visit_search.xml b/netforce_clinic/layouts/clinic_visit_search.xml
new file mode 100644
index 0000000..84761de
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_visit_search.xml
@@ -0,0 +1,8 @@
+<search model="clinic.visit">
+    <field name="number"/>
+    <field name="time_start"/>
+    <field name="time_stop"/>
+    <field name="cycle_id"/>
+    <field name="patient_id"/>
+    <field name="doctor_id"/>
+</search>
