diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 1f1689b531a..ccac759a04f 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -58,9 +58,9 @@ class hr_payroll_structure(osv.osv):
         'name':fields.char('Name', size=256, required=True, readonly=False),
         'code':fields.char('Code', size=64, required=True, readonly=False),
 #        'line_ids':fields.one2many('hr.payslip.line', 'function_id', 'Salary Structure', required=False),
-        'company_id':fields.many2one('res.company', 'Company', required=False),
+        'company_id':fields.many2one('res.company', 'Company', required=True),
         'note': fields.text('Description'),
-        'parent_id':fields.many2one('hr.payroll.structure', 'Parent Structure'),
+        'parent_id':fields.many2one('hr.payroll.structure', 'Parent'),
     }
     _defaults = {
         'company_id': lambda self, cr, uid, context: \
@@ -336,8 +336,8 @@ class hr_salary_head(osv.osv):
     _name = 'hr.salary.head'
     _description = 'Salary Head'
     _columns = {
-        'name':fields.char('Salary Head', size=64, required=True, readonly=False),
-        'code':fields.char('Salary Head Code', size=64, required=True, readonly=False),
+        'name':fields.char('Name', size=64, required=True, readonly=False),
+        'code':fields.char('Code', size=64, required=True, readonly=False),
         'type':fields.many2one('hr.salary.head.type', 'Type', required=True, help="It is used only for the reporting purpose."),
         'note': fields.text('Description'),
         'user_id':fields.char('User', size=64, required=False, readonly=False),
@@ -1186,7 +1186,7 @@ class hr_payslip_line(osv.osv):
         if category_id:
             category = self.pool.get('hr.salary.head').browse(cr, uid, category_id)
             res.update({
-                'sequence':category.sequence,
+#                'sequence':category.sequence,
                 'name':category.name,
                 'code':category.code,
                 'type':category.type.id
@@ -1208,7 +1208,7 @@ class hr_payslip_line(osv.osv):
         'base':fields.char('Formula', size=1024, required=False, readonly=False),
         'code':fields.char('Code', size=64, required=False, readonly=False),
         'category_id':fields.many2one('hr.salary.head', 'Category', required=True),
-        'type':fields.many2one('hr.salary.head.type', 'Type', required=True),
+        'type':fields.many2one('hr.salary.head.type', 'Type', required=True, help="Used for the reporting purpose."),
         'amount_type':fields.selection([
             ('per','Percentage (%)'),
             ('fix','Fixed Amount'),
diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/hr_payroll_data.xml
index 4129b6b92e6..67811d4cc21 100644
--- a/addons/hr_payroll/hr_payroll_data.xml
+++ b/addons/hr_payroll/hr_payroll_data.xml
@@ -16,112 +16,112 @@
             <field name="code">HRA</field>
             <field name="type" ref="AL"/>
             <field name="name">House Rent Allowance</field>
-            <field name="sequence" eval="5"/>
+           <!-- <field name="sequence" eval="5"/>-->
         </record>
 
         <record id="CA" model="hr.salary.head">
             <field name="code">CA</field>
             <field name="type" ref="AL"/>
             <field name="name">Conveyance Allowance</field>
-            <field name="sequence" eval="10"/>
+            <!--<field name="sequence" eval="10"/>-->
         </record>
         
         <record id="MA" model="hr.salary.head">
             <field name="code">MA</field>
             <field name="type" ref="AL"/>
             <field name="name">Medical Allowance</field>
-            <field name="sequence" eval="15"/>
+           <!-- <field name="sequence" eval="15"/>-->
         </record>
 
         <record id="TELA" model="hr.salary.head">
             <field name="code">TELA</field>
             <field name="type" ref="AL"/>
             <field name="name">Telephone Allowance</field>
-            <field name="sequence" eval="20"/>
+           <!-- <field name="sequence" eval="20"/>-->
         </record>
         
         <record id="LTA" model="hr.salary.head">
             <field name="code">LTA</field>
             <field name="type" ref="AL"/>
             <field name="name">Leave Travel Allowance</field>
-            <field name="sequence" eval="25"/>
+           <!-- <field name="sequence" eval="25"/>-->
         </record>
         
         <record id="NA" model="hr.salary.head">
             <field name="code">NA</field>
             <field name="type" ref="AL"/>
             <field name="name">Newspaper Allowance</field>
-            <field name="sequence" eval="30"/>
+         <!--   <field name="sequence" eval="30"/>-->
         </record>
         
         <record id="TA" model="hr.salary.head">
             <field name="code">TA</field>
             <field name="type" ref="AL"/>
             <field name="name">Traveling Allowance</field>
-            <field name="sequence" eval="35"/>
+          <!--  <field name="sequence" eval="35"/>-->
         </record>
         
         <record id="FA" model="hr.salary.head">
             <field name="code">FA</field>
             <field name="type" ref="AL"/>
             <field name="name">Food Allowance</field>
-            <field name="sequence" eval="40"/>
+           <!-- <field name="sequence" eval="40"/>-->
         </record>
         
         <record id="DA" model="hr.salary.head">
             <field name="code">DA</field>
            <field name="type" ref="AL"/>
             <field name="name">Dearness Allowance</field>
-            <field name="sequence" eval="45"/>
+          <!--  <field name="sequence" eval="45"/>-->
         </record>
         
         <record id="PF" model="hr.salary.head">
             <field name="code">PF</field>
             <field name="type" ref="DED"/>
             <field name="name">Provident Fund</field>
-            <field name="sequence" eval="50"/>
+           <!-- <field name="sequence" eval="50"/>-->
         </record>
         
         <record id="PT" model="hr.salary.head">
             <field name="code">PT</field>
             <field name="type" ref="DED"/>
             <field name="name">Professional Tax</field>
-            <field name="sequence" eval="55"/>
+           <!-- <field name="sequence" eval="55"/>-->
         </record>
         
         <record id="WF" model="hr.salary.head">
             <field name="code">WF</field>
             <field name="type" ref="DED"/>
             <field name="name">Welfare</field>
-            <field name="sequence" eval="60"/>
+         <!--   <field name="sequence" eval="60"/>-->
         </record>
         
         <record id="TDS" model="hr.salary.head">
             <field name="code">TDS</field>
             <field name="type" ref="DED"/>
             <field name="name">Tax Deduct at Source</field>
-            <field name="sequence" eval="65"/>
+         <!--   <field name="sequence" eval="65"/>-->
         </record>
         
         <record id="LWP" model="hr.salary.head">
             <field name="code">LWP</field>
             <field name="type" ref="DED"/>
             <field name="name">Leave without pay</field>
-            <field name="sequence" eval="70"/>
+           <!-- <field name="sequence" eval="70"/>-->
         </record>
         
         <record id="FC" model="hr.salary.head">
             <field name="code">FC</field>
             <field name="type" ref="DED"/>
             <field name="name">Food Coupons</field>
-            <field name="sequence" eval="75"/>
+          <!--  <field name="sequence" eval="75"/>-->
         </record>
         
         <record id="ESI" model="hr.salary.head">
             <field name="code">ESI</field>
             <field name="type" ref="DED"/>
             <field name="name">Employee's State Insurance</field>
-            <field name="sequence" eval="80"/>
+           <!-- <field name="sequence" eval="80"/>-->
         </record>
         
        <!-- <record id="OTHERD" model="hr.allounce.deduction.categoty">
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index a36ea3d4389..84a236aa6ca 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -13,6 +13,7 @@
             <field name="category_id" ref="hr_payroll.HRA"/>
            <!-- <field name="function_id" ref="hr_payroll.structure_001"/>-->
             <field name="name">House Rent Allowance</field>
+            <field name="sequence" eval="5"/>
         </record>
 
         <record id="hr_payslip_line_convanceallowance1" model="hr.salary.rule">
@@ -24,6 +25,7 @@
             <field name="category_id" ref="hr_payroll.CA"/>
             <!--<field name="function_id" ref="hr_payroll.structure_001"/>-->
             <field name="name">Conveyance Allowance</field>
+            <field name="sequence" eval="10"/>
         </record>
 
         <record id="hr_payslip_line_professionaltax1" model="hr.salary.rule">
@@ -35,6 +37,7 @@
             <field name="category_id" ref="hr_payroll.PT"/>
          <!--   <field name="function_id" ref="hr_payroll.structure_001"/>-->
             <field name="name">Professional Tax</field>
+            <field name="sequence" eval="55"/>
         </record>
 
         <record id="hr_payslip_line_providentfund1" model="hr.salary.rule">
@@ -46,6 +49,7 @@
             <field name="category_id" ref="hr_payroll.PF"/>
            <!-- <field name="function_id" ref="hr_payroll.structure_001"/>-->
             <field name="name">Provident Fund</field>
+            <field name="sequence" eval="50"/>
         </record>
         
         <!-- Salary Structure -->
@@ -68,8 +72,7 @@
         </record>
 
         <!-- Employee Contract -->
-       <!-- <record id="hr_contract_firstcontract1" model="hr.contract">
-            <field name="wage_type_id" ref="hr_contract.hr_contract_monthly_gross"/>
+        <record id="hr_contract_firstcontract1" model="hr.contract">
             <field name="name">First Contract</field>
             <field name="type_id" ref="hr_contract.hr_contract_type_emp"/>
             <field name="date_start" eval="time.strftime('%Y-%m')+'-1'"/>
@@ -80,9 +83,9 @@
             <field eval="4000.0" name="wage"/>
             <field eval="5" name="working_days_per_week"/>
         </record>
--->
+
         <!-- Payslip -->
-       <!-- <record id="hr_payslip_salaryslipofbonamyforjune0" model="hr.payslip">
+        <!--<record id="hr_payslip_salaryslipofbonamyforjune0" model="hr.payslip">
             <field name="number">SLIP/001</field>
             <field name="deg_id" ref="hr_payroll.structure_001"/>
             <field name="employee_id" ref="hr_employee_bonamy0"/>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 6c5cff50c43..eb1f155d4e5 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -78,11 +78,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee Function">
-                    <group col="6" colspan="4">
-                        <field name="name" colspan="4" select="1"/>
+                    <group col="6" colspan="6">
+                        <field name="name" select="1"/>
                         <field name="code" select="1"/>
-                        <field name="parent_id"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="parent_id"/>
                     </group>
                     <notebook colspan="4">
 	                     <page string="Salary Rules">
@@ -103,6 +103,7 @@
             id="menu_hr_employee_function"
             action="action_view_hr_employee_grade_form"
             parent="payroll_configure"
+            sequence="13"
         />
         <!-- End Salary structure -->
 
@@ -397,6 +398,7 @@
             id="menu_hr_salary_head"
             action="action_hr_salary_head"
             parent="payroll_configure"
+            sequence="11"
         />
         <!-- End Payment Heads -->
 
@@ -537,6 +539,7 @@
             id="menu_action_hr_contibution_register_form"
             action="action_contibution_register_form"
             parent="payroll_configure"
+            sequence="14"
         />
         <record id="hr_contibution_register_line_form" model="ir.ui.view">
             <field name="name">hr.contibution.register.line.form</field>
@@ -594,7 +597,7 @@
                    <field name="code" select="1"/>
                    <field name="active"/>
                    <field name="sequence" />
-                   <field name="company_id"/>
+                   <field name="company_id" widget="selection"/>
                    <field name="appears_on_payslip"/>
                 </group>
                 <group col="6" colspan="6">
@@ -603,11 +606,10 @@
 	                    <field name="category_id" on_change="onchange_category(category_id)"/>
 	                    <field name="type"/>
 	                    <field name="amount_type"/>
+	                    <field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'readonly':[('amount_type','=','func')]}"/>
+	                    <field name="conditions"/>
 	                    <field name="condition_range_min"/>
                         <field name="condition_range_max"/>
-	                    <field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'readonly':[('amount_type','=','func')]}"/>
-	                   
-	                    <field name="conditions"/>
 	                </group>
 	                <group col="2" colspan="2">
 		                <group col="2" colspan="2">
@@ -643,7 +645,7 @@
         <field name="view_id" ref="hr_salary_rule_tree"/>
     </record>
     
-    <menuitem id="menu_action_hr_salary_rule_form" action="action_salary_rule_form" parent="payroll_configure"/>
+    <menuitem id="menu_action_hr_salary_rule_form" action="action_salary_rule_form" parent="payroll_configure" sequence="12"/>
 
         <!-- Salary Head Type -->
         <record id="salary_head_type_tree" model="ir.ui.view">
@@ -677,7 +679,7 @@
             <field name="view_id" ref="salary_head_type_tree"/>
         </record>
         
-        <menuitem id="menu_action_salary_head_type" action="action_salary_head_type" parent="payroll_configure"/>
+        <menuitem id="menu_action_salary_head_type" action="action_salary_head_type" parent="payroll_configure" sequence="10"/>
         
     </data>
 </openerp>