diff --git a/bemade_fsm/__manifest__.py b/bemade_fsm/__manifest__.py
index 5be42f7..79dc6d3 100644
--- a/bemade_fsm/__manifest__.py
+++ b/bemade_fsm/__manifest__.py
@@ -20,7 +20,7 @@
 ########################################################################################
 {
     'name': 'Improved Field Service Management',
-    'version': '15.0.0.3.0',
+    'version': '15.0.0.5.0',
     'summary': 'Adds functionality necessary for managing field service operations at Durpro.',
     'description': 'Adds functionality necessary for managing field service operations at Durpro.',
     'category': 'Services/Field Service',
diff --git a/bemade_fsm/models/equipment.py b/bemade_fsm/models/equipment.py
index 680d67b..4ebaf58 100644
--- a/bemade_fsm/models/equipment.py
+++ b/bemade_fsm/models/equipment.py
@@ -67,7 +67,6 @@ class Equipment(models.Model):
                 '|', '|', '|',
                 ('pid_tag', operator, name),
                 ('name', operator, name),
-                ('partner_id.name', operator, name),
                 ('partner_location_id.name', operator, name)],
                 limit=limit)
         else:
diff --git a/bemade_fsm/reports/worksheet_templates.xml b/bemade_fsm/reports/worksheet_templates.xml
index fd352e0..026f037 100644
--- a/bemade_fsm/reports/worksheet_templates.xml
+++ b/bemade_fsm/reports/worksheet_templates.xml
@@ -16,120 +16,130 @@
         <template id="worksheet_complete">
             <t t-call="web.html_container">
                 <t t-foreach="docs" t-as="doc">
-                    <t t-call="web.external_layout">
-                        <t t-call="bemade_fsm.worksheet_complete_page"
-                           t-lang="doc.partner_id.lang"/>
-                    </t>
+                    <t t-call="bemade_fsm.worksheet_complete_page"
+                       t-lang="doc.partner_id.lang"/>
                 </t>
             </t>
         </template>
 
         <template id="worksheet_complete_page">
-            <t t-set="address" t-if="doc.sale_order_id">
-                <strong class="big-red">Customer:</strong>
-                <div t-field="doc.sale_order_id.partner_id"
-                     t-options='{"widget": "contact",
+            <t t-call="web.external_layout">
+                <t t-set="address" t-if="doc.sale_order_id">
+                    <strong class="big-red">Customer:</strong>
+                    <div t-field="doc.sale_order_id.partner_id"
+                         t-options='{"widget": "contact",
                                 "fields": ["address", "name"], "no_marker": True}'/>
-            </t>
-            <t t-set="information_block">
-                <strong>Service Address:</strong>
-                <div t-field="doc.partner_id"
-                     t-options='{"widget": "contact",
+                </t>
+                <t t-set="information_block">
+                    <strong>Service Address:</strong>
+                    <div t-field="doc.partner_id"
+                         t-options='{"widget": "contact",
                                  "fields": ["address", "name", "phone"],
                                  "no_marker": True, "phone_icons": True}'/>
-            </t>
-            <div class="page">
-                <div class="oe_structure"/>
-                <h2 class="mt16">
-                    <span>Work Order </span>
-                    <span t-field="doc.name"/>
-                </h2>
-
-                <div class="container wo-information">
-                    <div class="row mt32 mb32" id="informations">
-                        <div t-if="doc.sale_order_id.client_order_ref" class="col-3">
-                            <p class="m-0">
-                                <strong>Your Reference: </strong>
+                </t>
+                <div class="page">
+                    <div class="oe_structure"/>
+                    <h2 class="mt-3">
+                        <span>Work Order </span>
+                        <span t-if="doc.sale_order_id" t-field="doc.sale_order_id.name"/>
+                        <span t-else="" t-field="doc.name"/>
+                    </h2>
+                    <div class="container">
+                        <div class="row mb-3 border-dark">
+                            <div t-if="doc.sale_order_id.client_order_ref" class="col-4">
+                                <span class="font-weight-bolder">Your Reference:</span>
                                 <span t-field="doc.sale_order_id.client_order_ref"/>
-                            </p>
-                            <p t-if="doc.planned_date_begin" class="m-0">
-                                <strong t-if="doc.planned_date_begin">Planned
-                                    for: </strong>
-                                <span t-field="doc.planned_date_begin"
-                                      t-options='{"widget": "datetime"}'/>
-                            </p>
-                        </div>
-                        <div class="col-3">
-                            <strong>Technician(s):</strong>
-                            <t t-foreach="doc.user_ids" t-as="technician"
-                               t-if="doc.user_ids">
-                                <p class="m-0" t-field="technician.name"/>
-                            </t>
-                        </div>
-                        <div class="col-3">
-                            <strong>Site Contacts:</strong>
-                            <t t-foreach="doc.site_contacts" t-as="contact">
-                                <p class="m-0" t-out="contact"
-                                   t-options='{"widget": "contact",
-                                         "fields": ["name", "phone", "mobile", "email"],
+                            </div>
+                            <div t-if="doc.site_contacts" class="col-4">
+                                <span class="font-weight-bolder">Site Contacts:</span>
+                                <t t-foreach="doc.site_contacts" t-as="contact">
+                                    <span t-field="contact.name"/>
+                                    <span t-out="contact"
+                                          t-options='{"widget": "contact",
+                                         "fields": ["phone", "mobile", "email"],
                                          "no_marker": True, "phone_icons": True}'/>
-                            </t>
+                                </t>
+                            </div>
+                            <div t-if="doc.work_order_contacts" class="col-4">
+                                <span class="font-weight-bolder">Work order attn:</span>
+                                <t t-foreach="doc.work_order_contacts" t-as="contact">
+                                    <span t-field="contact.name"/>
+                                    <span t-out="contact"
+                                          t-options='{"widget": "contact",
+                                         "fields": ["phone", "mobile", "email"],
+                                         "no_marker": True, "phone_icons": True}'/>
+                                </t>
+                            </div>
                         </div>
-                        <div class="col-3">
-                            <strong>Work order attn:</strong>
-                            <t t-foreach="doc.work_order_contacts" t-as="contact">
-                                <p class="m-0" t-out="contact"/>
-                            </t>
+                        <div class="row mb-3 border-dark">
+                            <div class="col-4" t-if="doc.user_ids">
+                                <span class="font-weight-bolder">Technician(s)</span>
+                                <t t-foreach="doc.user_ids" t-as="technician">
+                                    <p class="m-0" t-field="technician.name"/>
+                                </t>
+                            </div>
+                            <div class="col-4" t-if="doc.planned_date_begin">
+                                <span class="font-weight-bolder">Planned Start</span>
+                                <p t-field="doc.planned_date_begin"
+                                   t-options="{'widget': 'datetime'}"/>
+                            </div>
+                            <div class="col-4" t-if="doc.planned_date_end">
+                                <span class="font-weight-bolder">Planned End</span>
+                                <p t-field="doc.planned_date_end"
+                                   t-options="{'widget': 'datetime'}"/>
+                            </div>
                         </div>
+
                     </div>
-                    <div class="row">
-                        <div class="col mb16">
-                            <h3 class="mb32"><strong>Interventions</strong></h3>
-                        </div>
-                    </div>
-                    <t t-foreach="doc.child_ids" t-as="intervention">
-                        <div class="container wo-intervention mb16">
-                            <div class="row mb16 pb16">
-                                <div class="col-12 mb16 tb16">
-                                    <h4><strong>
-                                        <span t-field="intervention.name"/>
-                                        <t t-foreach="intervention.equipment_ids"
-                                           t-as="equipment">
-                                            <span t-field="equipment.name"/>
-                                            <span t-if="intervention_index &lt; intervention_size - 1"
-                                                  t-out="', '" />
-                                        </t>
-                                    </strong></h4>
-                                    <p class="mb16" t-field="intervention.description"/>
+                    <div class="container">
+                        <h3 class="mb32"><strong>Interventions</strong></h3>
+                        <t t-foreach="doc.child_ids" t-as="intervention">
+                            <div class="row">
+                                <div class="col-6">
+                                    <h4><span t-field="intervention.name"/></h4>
+                                        <span t-if="intervention.description"
+                                              t-field="intervention.description"/>
+                                </div>
+                                <div t-if="intervention.equipment_ids"
+                                     class="col-6">
+                                    <h4>Equipment: </h4>
+                                    <t t-foreach="intervention.equipment_ids"
+                                       t-as="equipment">
+                                        <span t-field="equipment.complete_name"/>
+                                        <span t-if="equipment_index &lt; equipment_size -1"
+                                              t-out="', '"/>
+                                    </t>
                                 </div>
                             </div>
-                            <table class="table table-borderless">
-                                <thead>
-                                    <th>Done</th>
-                                    <th>Task to do</th>
-                                </thead>
-                                <tbody>
-                                    <t t-foreach="intervention.child_ids" t-as="task">
-                                        <tr class="wo-task">
-                                            <td style="width: 5%">
-                                                <input type="checkbox"
-                                                       t-att-checked="task.is_complete"/>
-                                            </td>
-                                            <td style="width: 95%">
-                                                <p t-field="task.name"/>
-                                                <p t-field="task.description"/>
-                                            </td>
-                                            <!-- TODO: Figure out what to do with the old
-                                                       concept of task comments -->
-                                        </tr>
-                                    </t>
-                                </tbody>
-                            </table>
-
-                        </div>
-                    </t>
+                            <div class="row">
+                                <table class="table table-borderless col-12">
+                                    <thead>
+                                        <th>Done</th>
+                                        <th>Task to do</th>
+                                    </thead>
+                                    <tbody>
+                                        <t t-foreach="intervention.child_ids"
+                                           t-as="task">
+                                            <tr class="wo-task">
+                                                <td style="width: 5%">
+                                                    <input type="checkbox"
+                                                           t-att-checked="task.is_complete"/>
+                                                </td>
+                                                <td style="width: 95%">
+                                                    <p t-field="task.name"/>
+                                                    <p t-field="task.description"/>
+                                                </td>
+                                                <!-- TODO: Figure out what to do with the old
+                                                           concept of task comments -->
+                                            </tr>
+                                        </t>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </t>
+                    </div>
                 </div>
-            </div>
+            </t>
         </template>
 
     </data>
diff --git a/bemade_fsm/views/task_views.xml b/bemade_fsm/views/task_views.xml
index 8a84daa..552a6bd 100644
--- a/bemade_fsm/views/task_views.xml
+++ b/bemade_fsm/views/task_views.xml
@@ -7,14 +7,12 @@
             <field name="inherit_id" ref="industry_fsm.view_task_form2_inherit"/>
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='partner_id']" position="after">
-                    <field name="equipment_ids"
-                           domain="[('partner_location_id', '=', partner_id)]"
-                           context="{'tree_view_ref': 'bemade_fsm.equipment_view_tree'}"/>
-                </xpath>
                 <xpath expr="//page[@name='extra_info']" position="after">
                     <page string="Field Service" name="field_service">
-                        <group name="contacts">
+                        <group name="equipment_and_contacts">
+                            <field name="equipment_ids"
+                                   domain="[('partner_location_id', '=', partner_id)]"
+                                   context="{'tree_view_ref': 'bemade_fsm.equipment_view_tree'}"/>
                             <field name="site_contacts"
                                    context="{'tree_view_ref': 'bemade_fsm.fsm_contacts_view_tree'}"/>
                             <field name="work_order_contacts"