diff --git a/app/Views/POlist.php b/app/Views/POlist.php
index da983066..66ffaf2c 100755
--- a/app/Views/POlist.php
+++ b/app/Views/POlist.php
@@ -169,11 +169,40 @@
 
                                         <?php $statusCode =  $record->StatusCode;
 
-                                            if ($statusCode == PO_DRAFT || $statusCode == PO_CREATED) {  ?>
-                                            <td> <a data-toggle="tooltip" href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType . '&CapitalRange=' . $record->CapitalRange; ?>"><i class="fa fa-pencil" data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to Edit Purchase Order details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
+                                            if ($statusCode == PO_DRAFT || $statusCode == PO_CREATED) { 
+                                                
+                                              
+                                                
+                                                ?>
+
+                                            <td> 
+
+                                                <a data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to Edit Purchase Order details"
+                                            href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType 
+                                            . '&CapitalRange=' . $record->CapitalRange; ?>">
+                                            <i class="fa fa-pencil-alt" data-toggle="tooltip" > </i>
+                                             &nbsp;&nbsp;&nbsp;</a> 
+
+                                            </td>
                                         <?php
-                                            } else { ?>
-                                            <td> <a data-toggle="tooltip" href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType . '&CapitalRange=' . $record->CapitalRange; ?>"><i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to view Purchase Order details"></i>&nbsp;&nbsp;&nbsp;</a> &nbsp;&nbsp;&nbsp; <a data-toggle="tooltip" href="<?php echo base_url() . 'purchaseorder/CreatePOPrint?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType; ?>" target="new"><i class="fa fa-print" data-toggle="tooltip" title="<?php echo $record->PONO; ?>  -  Click here to Print the Purchase Order details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
+                                            } else {
+                                               
+                                                ?>
+                                            <td> 
+
+                                           
+
+                                                <a data-toggle="tooltip" href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType 
+                                                . '&CapitalRange=' . $record->CapitalRange; ?>"><i class="fa fa-eye" data-toggle="tooltip" 
+                                                title="<?php echo $record->PONO; ?>  -  Click here to view Purchase Order details"></i>
+                                                &nbsp;&nbsp;&nbsp;</a> &nbsp;&nbsp;&nbsp;
+
+                                                 <a data-toggle="tooltip" href="<?php echo base_url() . 'purchaseorder/CreatePOPrint?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType; ?>" 
+                                                 target="new"><i class="fa fa-print" data-toggle="tooltip" title="<?php echo $record->PONO; ?> 
+                                                  -  Click here to Print the Purchase Order details"></i>
+                                                  &nbsp;&nbsp;&nbsp;
+                                                </a> 
+                                            </td>
                                         <?php
                                             } ?>
                                         </tr>
@@ -278,4 +307,9 @@ $(document).ready(function() {
         }
     });
 });
+
+$(document).ready(function(){
+    $('[data-toggle="tooltip"]').tooltip();
+});
+
 </script>
\ No newline at end of file
diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php
index 227b5bfd..38b68481 100755
--- a/app/Views/addEmployeenew.php
+++ b/app/Views/addEmployeenew.php
@@ -848,6 +848,25 @@
                                                                     onkeypress="return alpha(event);">
                                                             </div>
                                                         </div>
+                                                    </div>
+                                                    
+                                                    <div class="col-md-3" >
+                                                        <div class="form-group"><span>ESI Number</span>
+                                                            <input type="text" id="esino" name="esino" maxlength="10"
+                                                                onchange="validateESI();" class="form-control"
+                                                                title=" 10 digit number"
+                                                                onkeypress="return isNumberKey(event)">
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-md-3" >
+                                                        <div class="form-group">
+                                                            <span for="ESI_Rate">ESI Rate(%)</span>
+                                                            <font color="Red">*</font>
+                                                            <input type="text" name="ESI_Rate" value="<?= $esi_rate; ?>"
+                                                                class="form-control num" style="text-transform:uppercase;"
+                                                                pattern="([0-9]{1,2}([.][0-9]{1,2})?)"
+                                                                title="Enter the Valid ESI Rate, Minimum 1 digit, Maximum 2 digits"
+                                                                readonly />
 
                                                         <div class="col-md-3">
                                                             <div class="form-group">
diff --git a/app/Views/configlisting.php b/app/Views/configlisting.php
index a9d90d96..fcade84d 100755
--- a/app/Views/configlisting.php
+++ b/app/Views/configlisting.php
@@ -34,6 +34,26 @@
   .icon-button:hover {
     color: #0056b3;
   }
+
+  td {
+    padding-left: 0;
+    padding-right: 0;
+  }
+
+  td {
+    padding-left: 0;
+    padding-right: 0;
+  }
+
+  .configIdTh {
+    text-align: center !important;
+    width: 15%;
+  }
+
+  .configIdTd {
+    text-align: center !important;
+    width: 15%;
+  }
 </style>
 
 
@@ -88,52 +108,51 @@
                 <div class="error" id="error"></div>
               </form>
               <div class="card-body">
-                <table class="table dt-responsive nowrap w-100" id="datatable">
+                <table id="config_list_table" class="table dt-responsive nowrap w-100">
+                  <thead>
+                    <tr>
+                      <th>Create Date</th>
+                      <th class="configIdTh">Configuration ID</th>
+                      <th>Configuration Name</th>
+                      <th>Description</th>
+                      <th>Action</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <?php
+                    if (!empty($userRecords)) {
+                      foreach ($userRecords as $record) {
+                    ?>
+                        <tr>
+                          <?php if (date('d-m-Y', strtotime($record->CreatedDate)) == "30-11--0001") {
+                            $cdate =  '00-00-0000';
+                          } else {
+                            $cdate =  date('d-m-Y', strtotime($record->CreatedDate));
+                          } ?>
+                          <td><?php echo $cdate; ?> </td>
+                          <td class="configIdTd"><?php echo $record->Config_ID ?></td>
+                          <td><?php echo $record->ConfigName ?></td>
+                          <td><?php echo $record->Comments  ?> </td>
+                          <!-- <td><?php echo $record->CreatedDate ?></td>   -->
 
-                  <table id="config_list_table" class="table dt-responsive nowrap w-100">
-                    <thead>
-                      <tr>
-                        <th>Create Date</th>
-                        <th>Configuration ID</th>
-                        <th>Configuration Name</th>
-                        <th>Description</th>
-                        <th>Action</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      <?php
-                      if (!empty($userRecords)) {
-                        foreach ($userRecords as $record) {
-                      ?>
-                          <tr>
-                            <?php if (date('d-m-Y', strtotime($record->CreatedDate)) == "30-11--0001") {
-                              $cdate =  '00-00-0000';
-                            } else {
-                              $cdate =  date('d-m-Y', strtotime($record->CreatedDate));
-                            } ?>
-                            <td><?php echo $cdate; ?> </td>
-                            <td><?php echo $record->Config_ID ?></td>
-                            <td><?php echo $record->ConfigName ?></td>
-                            <td><?php echo $record->Comments  ?> </td>
-                            <!-- <td><?php echo $record->CreatedDate ?></td>   -->
-
-                            <!--    <td align="right"><?php $dt = new DateTime($record->CreatedDate);
-                                                      $CreatedDate =  $dt->format('d-m-Y');
-                                                      echo $CreatedDate  ?> </td> -->
+                          <!--    <td align="right"><?php $dt = new DateTime($record->CreatedDate);
+                                                    $CreatedDate =  $dt->format('d-m-Y');
+                                                    echo $CreatedDate  ?> </td> -->
 
 
 
-                            <td><a href="<?php echo base_url() . 'configurationctrl/editconfig?ConfigID=' . $record->Config_ID; ?>"><i class="fas fa-pencil-alt"></i>&nbsp;&nbsp;&nbsp;</a>
-                              <!-- <a><i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a> -->
-                            </td>
+                          <td>
+                            <a href="<?php echo base_url() . 'configurationctrl/editconfig?ConfigID=' . $record->Config_ID; ?>"><i class="fas fa-pencil-alt"></i>&nbsp;&nbsp;&nbsp;</a>
+                            <!-- <a><i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a> -->
+                          </td>
 
-                          </tr>
-                      <?php
-                        }
+                        </tr>
+                    <?php
                       }
-                      ?>
-                    </tbody>
-                  </table>
+                    }
+                    ?>
+                  </tbody>
+                </table>
               </div> <!-- end card body-->
             </div> <!-- end card -->
           </div><!-- end col-->
diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php
index faf6c2b0..6a028107 100755
--- a/app/Views/editServiceAmendPO.php
+++ b/app/Views/editServiceAmendPO.php
@@ -753,11 +753,11 @@ foreach ($PaymentTerms as $TER) {
 										</div>
 									</div>
 								</div>
-								</div>
-							</div>
-							</div>
-							</div>
-							<div class="form-row">
+
+
+
+
+								<div class="form-row">
 							<div class="form-group col-md-3">
 										<label>Work Status<span class="text-danger">*</span></label>
 										<?php
@@ -998,6 +998,16 @@ foreach ($PaymentTerms as $TER) {
 						
 							</div>
 
+
+
+
+
+								</div>
+							</div>
+							</div>
+							</div>
+						
+
 							<div class="form-row">
 						
 							</div>
diff --git a/app/Views/editrequisitionform.php b/app/Views/editrequisitionform.php
index db11431b..4ed9849e 100755
--- a/app/Views/editrequisitionform.php
+++ b/app/Views/editrequisitionform.php
@@ -50,6 +50,32 @@ if (!empty($ReqPOType)) {
 	font-size: 14px;
 }
 
+td {
+    padding-left: 0;
+    padding-right: 0;
+}
+
+td {
+    padding-left: 0;
+    padding-right: 0;
+}
+
+.th-materialCode{
+  text-align:center !important;
+  width:15%;
+}
+
+
+.th-requestedQuantity{
+  text-align:center !important;
+  width:15%;
+}
+
+.th-PoQuantity{
+  text-align:center !important;
+  width:15%;
+}
+
 </style>
 <script type="text/javascript">
 	window.onload = function() {
@@ -158,11 +184,11 @@ if (!empty($ReqPOType)) {
 										<thead>
 											<tr>
 												<th class="th">SNo</th>
-												<th class="th">Material Code</th>
-												<th class="th">Material Name</th>
+												<th class="th th-materialCode">Material Code</th>
+												<th class="th th-materialName">Material Name</th>
 												<th class="th">Uom</th>
-												<th class="th">RequestedQuantity</th>
-												<th class="th">PoQuantity</th>
+												<th class="th th-requestedQuantity">RequestedQuantity</th>
+												<th class="th th-PoQuantity">PoQuantity</th>
 												<th class="th">Status</th>
 												<th class="th">Action</th>
 											</tr>
@@ -176,15 +202,15 @@ if (!empty($ReqPOType)) {
 													$materialdesc = isset($record->MaterialDescription) ? $record->MaterialDescription : "";
 													//echo $materialdesc;
 											?>
-													<tr id="<?php echo $index; ?>">
-														<td align="left"><?php echo $index; ?></td>
+													<tr  id="<?php echo $index; ?>">
+														<td align="center"><?php echo $index; ?></td>
 														<input type="hidden" name="<?php echo 'te' . $index ?>" id="<?php echo 'te' . $index ?>" value="<?php echo $record->MaterialCode; ?>" />
 														<input type="hidden" name="<?php echo 'te' . $index ?>" id="<?php echo 'tes' . $index ?>" value="<?php echo $record->Quantity; ?>" />
-														<td align="left"><?php echo $record->MaterialCode; ?></td>
+														<td align="center"><?php echo $record->MaterialCode; ?></td>
 														<td align="left"><?php echo $record->MaterialName; ?></td>
 														<td align="left"><?php echo $record->UOM; ?></td>
-														<td align="left"><?php echo $record->Quantity; ?></td>
-														<td align="left"><?php echo $record->POQTY; ?></td>
+														<td align="center"><?php echo $record->Quantity; ?></td>
+														<td align="center"><?php echo $record->POQTY; ?></td>
 														<td align="left"><?php echo $record->StatusName; ?></td>
 														<input type="hidden" name="<?php echo 'materialdesc' . $index ?>" id="<?php echo 'materialdesc' . $index ?>" value="<?php echo isset($record->MaterialDescription) ?  $record->MaterialDescription : ''; ?>" />
 														<td>
diff --git a/app/Views/importpo.php b/app/Views/importpo.php
index c8a79283..3e359e4d 100755
--- a/app/Views/importpo.php
+++ b/app/Views/importpo.php
@@ -12,11 +12,12 @@ $Terms = '';
 
 $t = '';
 if (!empty($staticspecialinstruction)) {
-    foreach ($staticspecialinstruction as $text)
-        $t = $text->ConfigValue;
+    $t=$staticspecialinstruction[0]->ConfigValue;
+
 }
 
 
+
 date_default_timezone_set('Asia/Kolkata');
 $date = date('d/m/Y h:i:s a', time());
 
@@ -92,8 +93,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
             setup: function(ed) {
                 
                 ed.on('init', function(evt) {
-                console.log('<?php echo $t; ?>');
-
                     ed.setContent('<?php echo $t; ?>');
                 });
             }
@@ -279,7 +278,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                             $ReqType = $SID->ReqType;
                                         endforeach;
                                     }
-                                    echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"');
+                                    echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo" required="true"');
 
                                     ?>
                                 </div>
@@ -682,31 +681,74 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                                                                     ?>
                                 </div>
                             </div>
+
+
+                          
+
+
+
+
                             <div class="form-row">
                                 <div class="form-group col-md-12">
-                                    <label>Special Instructions :</label> <?php
-                                                                            $data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
-                                                                            echo form_textarea($data);
-                                                                            ?>
+                                    <label>Special Instructions :</label>
+                                     <?php
+                                        
+                                        $data = array('name' => 'txtSpcialInstruction', 'value' => set_value(field: 'txtSpcialInstruction'),
+                                         'id' => 'txtSpcialInstruction',  'class' => 'form-control', 'rows' => '10', 'cols' => '40');
+                                        echo form_textarea(data: $data);
+                                        ?>
+                                </div>
+
+
+                            </div>
+
+
+
+
+                           
+                            <div class="form-row">
+                                <div class="form-group col-md-12">
+                                <label>
+                                   Select Purchase Order File
+                                </label>
+                                <br>
+                                  <input type="file" name="POFile" id="POFile"><br>
                                 </div>
                             </div>
-                            <div class="form-row" align="right" style="padding-right:10px">
+                            <br><br>
 
-                                <div class="form-group col-md-4 col-md-offset-8"><br />
-                                    <input type="file" name="POFile" id="POFile"><br>
-                                    <input type="hidden" name="txtPoRange" id="txtPoRange" />
-                                    <input type="hidden" name="isEdit" id="isEdit" value="0" />
-                                    <input type="hidden" name="txtStatus" id="txtStatus" />
-                                    <input type="hidden" name="txtRowCount" id="txtRowCount" />
-                                    <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
+
+
+
+                            <div class="form-row" >
+
+                             <div class="form-group col-md-4">
+                                <a class="btn btn-success Save" ID="Save" onclick="Save(0)"> 
+                                    <span class="bold">Save as Draft</span> 
+                                </a>
+                             </div>
+
+                             <div class="form-group col-md-4">
+                           
+                             </div>
+
+                                <div class="form-group col-md-4" align="right">
+                                   
+                                    <input type="hidden" name="txtPoRange" id="txtPoRange"/>
+                                    <input type="hidden" name="isEdit" id="isEdit" value="0"/>
+                                    <input type="hidden" name="txtStatus" id="txtStatus"/>
+                                    <input type="hidden" name="txtRowCount" id="txtRowCount"/>
+                                    <input type="hidden" name="txtDeletedRow" id="txtDeletedRow"/>
 
                                     <input type="hidden" name="Budget" id="Budget" />
-                                    <input type="reset" class="btn btn-reset" value="Reset" onclick="window.location.reload()">
-                                    <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-                                    <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+                                    <input type="reset" class="btn btn-success" value="Reset" onclick="window.location.reload()">
+                                   
+                                    <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">
+                                        <span class="bold">Submit</span>
+                                    </a>
 
                                 </div>
-                                <br />
+                                
                             </div>
                         </div> <!-- end card body-->
                     </div> <!-- end card -->