diff --git a/modules/purchase_trade/view/shipment_in_form.xml b/modules/purchase_trade/view/shipment_in_form.xml
index 764f668..091b696 100755
--- a/modules/purchase_trade/view/shipment_in_form.xml
+++ b/modules/purchase_trade/view/shipment_in_form.xml
@@ -113,13 +113,13 @@ this repository contains the full copyright notices and license terms. -->
             <newline/>
             <notebook colspan="4">
                 <page string="Owner Conditions" id="owner_conditions">
-                    <field name="owner_charter_conditions" colspan="4" mode="tree,form" height="120" view_ids="purchase_trade.charter_condition_view_tree,purchase_trade.charter_condition_view_form"/>
+                    <field name="owner_charter_conditions" colspan="4" mode="tree,form" height="200" view_ids="purchase_trade.charter_condition_view_tree,purchase_trade.charter_condition_view_form"/>
                 </page>
                 <page string="Supplier Conditions" id="supplier_conditions">
-                    <field name="purchase_charter_conditions" colspan="4" mode="tree,form" height="120" view_ids="purchase_trade.charter_condition_view_tree,purchase_trade.charter_condition_view_form"/>
+                    <field name="purchase_charter_conditions" colspan="4" mode="tree,form" height="200" view_ids="purchase_trade.charter_condition_view_tree,purchase_trade.charter_condition_view_form"/>
                 </page>
                 <page string="Customer Conditions" id="customer_conditions">
-                    <field name="sale_charter_conditions" colspan="4" mode="tree,form" height="120" view_ids="purchase_trade.charter_condition_view_tree,purchase_trade.charter_condition_view_form"/>
+                    <field name="sale_charter_conditions" colspan="4" mode="tree,form" height="200" view_ids="purchase_trade.charter_condition_view_tree,purchase_trade.charter_condition_view_form"/>
                 </page>
             </notebook>
             <newline/>
diff --git a/modules/purchase_trade/view/sof_form.xml b/modules/purchase_trade/view/sof_form.xml
index 99a5fa5..03ea310 100755
--- a/modules/purchase_trade/view/sof_form.xml
+++ b/modules/purchase_trade/view/sof_form.xml
@@ -16,47 +16,56 @@
       <field name="timebar_warn"/>
     </page>
 
-    <page string="Sof events" id="event" col="6">
+    <page string="Sof events" id="event" col="8">
       <label name="sof"/>
-      <field name="sof" colspan="5"/>
+      <field name="sof" colspan="7"/>
       <newline/>
-      <label name="arrival_time"/>
+      <label name="arrival_date"/>
       <field name="arrival_date"/>
+      <label name="arrival_hour"/>
       <field name="arrival_hour"/>
-      <label name="notice_of_readiness_time"/>
+      <label name="notice_of_readiness_date"/>
       <field name="notice_of_readiness_date"/>
+      <label name="notice_of_readiness_hour"/>
       <field name="notice_of_readiness_hour"/>
       <newline/>
-      <label name="hoses_connected"/>
+      <label name="hoses_connected_date"/>
       <field name="hoses_connected_date"/>
+      <label name="hoses_connected_hour"/>
       <field name="hoses_connected_hour"/>
-      <label name="start_pumping"/>
+      <label name="start_pumping_date"/>
       <field name="start_pumping_date"/>
+      <label name="start_pumping_hour"/>
       <field name="start_pumping_hour"/>
       <newline/>
-      <label name="end_pumping"/>
+      <label name="end_pumping_date"/>
       <field name="end_pumping_date"/>
+      <label name="end_pumping_hour"/>
       <field name="end_pumping_hour"/>
-      <label name="hoses_disconnected"/>
+      <label name="hoses_disconnected_date"/>
       <field name="hoses_disconnected_date"/>
+      <label name="hoses_disconnected_hour"/>
       <field name="hoses_disconnected_hour"/>
       <newline/>
-      <label name="sailing_time"/>
+      <label name="sailing_date"/>
       <field name="sailing_date"/>
+      <label name="sailing_hour"/>
       <field name="sailing_hour"/>
       <newline/>
-      <field name="sof_events" colspan="6" mode="tree,form" view_ids="purchase_trade.view_sof_event_tree,purchase_trade.view_sof_event_form"/>
+      <field name="sof_events" colspan="8" mode="tree,form" view_ids="purchase_trade.view_sof_event_tree,purchase_trade.view_sof_event_form"/>
     </page>
 
-    <page string="Calculation" id="calcul" col="6">
+    <page string="Calculation" id="calcul" col="8">
       <label name="quantity"/>
-      <field name="quantity" colspan="5"/>
+      <field name="quantity" colspan="7"/>
       <newline/>
-      <label name="laytime_commenced"/>
+      <label name="laytime_commenced_date"/>
       <field name="laytime_commenced_date"/>
+      <label name="laytime_commenced_hour"/>
       <field name="laytime_commenced_hour"/>
-      <label name="laytime_completed"/>
+      <label name="laytime_completed_date"/>
       <field name="laytime_completed_date"/>
+      <label name="laytime_completed_hour"/>
       <field name="laytime_completed_hour"/>
       <newline/>
       <label name="actual_time_used"/>