diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php
index af95a1c2..dd72cab6 100755
--- a/application/controllers/employeedetails.php
+++ b/application/controllers/employeedetails.php
@@ -395,7 +395,7 @@ echo "<script>alert('Record Not Saved!');</script>";
             
             $data['DepartmentList'] = $this->employeedetails_model->getDepartment();
 			$data['EmpDetails'] = $this->employeedetails_model->viewemployee($EmpID);
-			$this->global['pageTitle'] = 'Siddharth : View Employee';	
+			$this->global['pageTitle'] = 'Siddharth : Edit Employee';	
 			  
 			$this->loadViews("editEmployee", $this->global,  $data, NULL);
 			 
diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php
index ced6cb41..32f8d1d8 100755
--- a/application/controllers/supplier.php
+++ b/application/controllers/supplier.php
@@ -56,7 +56,7 @@ class supplier extends BaseController
             $data['payment'] = $this->supplier_model->getpayment();
             //$data['users'] = $this->purchaseorder_model->getusers();
             
-            $this->global['pageTitle'] = 'siddharth : AddNew Supplier';
+            $this->global['pageTitle'] = 'siddharth : Add New Supplier';
 
             $this->loadViews("addsupplier", $this->global,$data,  NULL);
         
diff --git a/application/views/addCostCenter.php b/application/views/addCostCenter.php
index 14bc59e3..057337fc 100755
--- a/application/views/addCostCenter.php
+++ b/application/views/addCostCenter.php
@@ -38,7 +38,7 @@ $(function() {
        display: none;
     }
 </style>
-<div class="content-wrapper">
+<div class="content-wrapper" style="min-height: 537px;">
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
@@ -47,7 +47,7 @@ $(function() {
     </section>    
     <section class="content">
 	<div style="text-align:right;">
-    <a href="<?php echo base_url() ?>costListing" class="btn btn-info" value="Back">Back</a>
+    <a href="<?php echo base_url() ?>costListing" class="btn btn-primary" value="Back">Back</a>
 	</div>
 	<br>    
         <div class="row">
@@ -66,7 +66,7 @@ $(function() {
                                 <div class="col-md-12"> 
                                 <div class="col-md-6">
                                     <div class="form-group">
-                                        <label for="CostName">Cost Center Code:</label><font color="Red">*</font>
+                                        <label for="CostName">Cost Center Code </label><font color="Red">*</font>
                                          
 										<div class="form-group">
 												<?php
@@ -80,7 +80,7 @@ $(function() {
                            
                                 <div class="col-md-6">
                                     <div class="form-group">
-                                        <label for="Description">Cost Center Name:</label><font color="Red">*</font>
+                                        <label for="Description">Cost Center Name </label><font color="Red">*</font>
                                        	<div class="form-group">
 												<?php
 										 $data = array('name' => 'CostName','value' => set_value('CostName'),'id'=>'CostName',  'class' => 'form-control' ,'required' => 'true','style'=>'text-transform:uppercase;','maxlength'=>'20');
@@ -117,8 +117,8 @@ $(function() {
 			</div> 
 			<div class="col-md-4"> 
 				<center>
-					<a style="color:white" href="javascript:void(0);" id="addPop"><button type="button" style="margin: 30px 0px 0px 15px;" class="btn btn-info">Add</button></a><br>
-					<a style="color:white" href="javascript:void(0);" id="removePop"><button type="button" style="margin: 10px 0px 0px 15px;" class="btn btn-info">Remove</button></a><br>
+					<a style="color:white" href="javascript:void(0);" id="addPop"><button type="button" style="margin: 30px 0px 0px 15px;" class="btn btn-primary">Add</button></a><br>
+					<a style="color:white" href="javascript:void(0);" id="removePop"><button type="button" style="margin: 10px 0px 0px 15px;" class="btn btn-primary">Remove</button></a><br>
 
 				</center>
 			</div>                                 
@@ -132,10 +132,9 @@ $(function() {
 										?>	 
 			</div> 
 			</div>
-			<div class="col-md-6" style=" padding-right: 31px;">
-			 
-                                    <div class="form-group">
-                                        <label for="CostName">Approved By:</label><font color="Red">*</font>
+			<div class="col-md-6">
+			  
+                                        <label for="CostName">Approved By </label><font color="Red">*</font>
                                          
 										<div class="form-group">
 										 <?php
@@ -157,7 +156,7 @@ $(function() {
 												
 										   
 									</div>
-                                    </div>
+                                   
                                 </div>
 								  </div> 
 			 
@@ -166,7 +165,7 @@ $(function() {
        <br>
 <div col="row">
   <div style="text-align:right">
-       <a data-toggle="modal" href="#addbudgetmodel" style="margin-right: 10px;" class="btn btn-info"><i class="fa fa-plus"></i>&nbsp;&nbsp;Add Budget</a>                                   
+       <a data-toggle="modal" href="#addbudgetmodel" style="margin-right: 10px;" class="btn btn-primary"><i class="fa fa-plus"></i>&nbsp;&nbsp;Add Budget</a>                                   
   
           
 		<!-- Modal -->
@@ -258,8 +257,8 @@ $(function() {
 					
 					<!-- Modal Footer -->
 					<div class="modal-footer">
-						<a class="btn btn-info font tempClick"  ID="tempClick"  style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
-						<a  class="btn btn-info" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">cancel</a>
+						<a class="btn btn-primary font tempClick"  ID="tempClick"  style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
+						<a  class="btn btn-primary" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">cancel</a>
 					</div>
 				</div>
 			</div>
@@ -367,8 +366,8 @@ $(function() {
 					</div>
 					<!-- Modal Footer -->
 					<div class="modal-footer">
-						<a class="btn btn-info font tempClickEdit"  ID="tempClickEdit"  style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit</span></a>
-						<a class="btn btn-info" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">cancel</a>
+						<a class="btn btn-primary font tempClickEdit"  ID="tempClickEdit"  style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit</span></a>
+						<a class="btn btn-primary" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">cancel</a>
 					</div>
 				</div>
 			</div>
@@ -381,9 +380,9 @@ $(function() {
 			   <div class="box-footer" style="text-align:right">
 			    <input type="hidden" name="txtSelectedDepartment" id="txtSelectedDepartment" />
 			   <input type="hidden" name="txtRowCount" id="txtRowCount" />
-                            <input type="submit" class="btn btn-info" value="Submit" />
-                           <!-- <input type="reset" class="btn btn-info"  value="Cancel" />-->
-                             <a href="<?php echo base_url() ?>costListing" class="btn btn-info" id="cancel"  value="Cancel">Cancel</a>
+                            <input type="submit" class="btn btn-primary" value="Submit" />
+                           <!-- <input type="reset" class="btn btn-primary"  value="Cancel" />-->
+                             <a href="<?php echo base_url() ?>costListing" class="btn btn-primary" id="cancel"  value="Cancel">Cancel</a>
                         </div>
                     
 					
diff --git a/application/views/addNew.php b/application/views/addNew.php
index 173ab00c..ae661cb7 100755
--- a/application/views/addNew.php
+++ b/application/views/addNew.php
@@ -1,8 +1,8 @@
-<div class="content-wrapper">
+<div class="content-wrapper" style="min-height: 537px;">
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-        <center>User Management</center>
+        <center>Siddharth Industries - Add New User</center>
         
       </h1>
 	  	  
@@ -10,9 +10,9 @@
     
     <section class="content">
     <div style="text-align:right;">
-    <a href="<?php echo base_url() ?>userListing" class="btn btn-info" value="Back"/>Back</a>
+    <a href="<?php echo base_url() ?>userListing" class="btn btn-primary" value="Back"/>Back</a>
 	</div>
-	<br/>
+		<br/>
         <div class="row">
             <!-- left column -->
             <div class="col-md-12">
@@ -21,9 +21,7 @@
                 
                 
                 <div class="box box-primary">
-                    <div class="box-header">
-                        <center><h3 class="box-title">Siddharth Industries - Add New User</h3></center>
-                    </div><!-- /.box-header -->
+                     <!-- /.box-header -->
                     <!-- form start -->
                     
                     <form role="form" id="addUser" action="<?php echo base_url() ?>addNewUser" method="post" role="form">
@@ -31,7 +29,7 @@
                             <div class="row">
 							<div class="col-md-3">                                
                                     <div class="form-group">
-                                        <label for="fname">Emp ID</label>
+                                        <label for="fname">Employee ID</label>
                                          <select class="form-control required select"  id="EmpList" name="EmpList">
                                             <option value="0">Select Emp ID</option>
 											
@@ -66,29 +64,30 @@
                                     </div>
                                     
                                 </div>
-								<div class="col-md-3">                                
+								<div class="col-md-2">                                
                                     <div class="form-group">
                                         <label for="fname">Last Name</label>
                                         <input type="text" class="form-control required" readonly id="LastName" name="LastName" maxlength="128">
                                     </div>
                                     
                                 </div>
-								 <div class="col-md-3">
+								 <div class="col-md-2">
                                     <div class="form-group">
                                         <label for="email">Designation</label>
                                         <input type="text" class="form-control required "  readonly id="Designation"  name="Designation" maxlength="128">
                                     </div>
+                                </div>
+								<div class="col-md-2">
+                                    <div class="form-group">
+                                        <label for="mobile">Department</label>
+                                        <input type="text" class="form-control required " readonly id="Department" name="Department" minlength="10"maxlength="10">
+                                    </div>
                                 </div>
 								 </div>
 								
 								 <div class="row">
                                
-								<div class="col-md-3">
-                                    <div class="form-group">
-                                        <label for="mobile">Department</label>
-                                        <input type="text" class="form-control required " readonly id="Department" name="Department" minlength="10"maxlength="10">
-                                    </div>
-                                </div>
+								
 								 <div class="col-md-3">
                                     <div class="form-group">
                                         <label for="email">Email address</label>
@@ -101,16 +100,7 @@
                                         <input type="text" class="form-control required digits" readonly id="ContactNo" name="ContactNo" minlength="10"maxlength="10">
                                     </div>
                                 </div>
-								
-								 
-								 </div>
-								<div class="row">
-                               
-								
-                            </div>
-							
-                            <div class="row">
-							 <div class="col-md-3">
+								<div class="col-md-2">
                                     <div class="form-group">
                                         <label for="role">Role</label>
                                         <select class="form-control required" id="role" name="role">
@@ -128,26 +118,33 @@
                                             ?>
                                         </select>
                                     </div>
-                                </div>    
-                                <div class="col-md-3">
+                                </div>   
+								  <div class="col-md-2">
                                     <div class="form-group">
                                         <label for="password">Password</label>
                                         <input type="password" class="form-control required" id="password" required  name="password" maxlength="10">
                                     </div>
                                 </div>
-                                <div class="col-md-3">
+                                <div class="col-md-2">
                                     <div class="form-group">
                                         <label for="cpassword">Confirm Password</label>
                                         <input type="password" class="form-control required equalTo"  required id="cpassword" name="cpassword" maxlength="10">
                                     </div>
                                 </div>
+								 </div>
+								 
+							
+                            <div class="row">
+							  
+                               
                             </div>
                            
                         </div><!-- /.box-body -->
     
                         <div class="box-footer" style="text-align:right">
-                            <input type="submit" class="btn btn-info" value="Submit" />
-                            <input type="reset" class="btn btn-info" value="Cancel" />
+						<input type="reset" class="btn btn-primary" value="Reset" />
+                            <input type="submit" class="btn btn-primary" value="Submit" />
+                            
                         </div>
                     </form>
                 </div>
diff --git a/application/views/addRawMaterial.php b/application/views/addRawMaterial.php
index 4ba711b3..00716c6e 100755
--- a/application/views/addRawMaterial.php
+++ b/application/views/addRawMaterial.php
@@ -24,7 +24,7 @@ function BlockSpecial(evt) {
     }
 
 </script>
-<div class="content-wrapper">
+<div class="content-wrapper" style="min-height: 537px;">
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
@@ -36,7 +36,7 @@ function BlockSpecial(evt) {
     
     <section class="content">
     <div style="text-align:right;">
-    <a href="<?php echo base_url() ?>rawmaterialdetails/rawmaterialListing" class="btn btn-info" value="Back"/>Back</a>
+    <a href="<?php echo base_url() ?>rawmaterialdetails/rawmaterialListing" class="btn btn-primary" value="Back"/>Back</a>
     </div>
     <br/>
         <div class="row">
@@ -52,14 +52,14 @@ function BlockSpecial(evt) {
                                <div class="col-md-12">
                                 <div class="col-md-3">
                                     <div class="form-group">
-                                        <span for="MaterialName">Material Name</span><font color="Red">*</font>
+                                        <label for="MaterialName">Material Name</label><font color="Red">*</font>
                                         <input type="text" class="form-control required " onkeypress="return BlockSpecial(event);" onchange="hello()" required id="MaterialName"  name="MaterialName" maxlength="255">
                                     </div>
                                 </div>
 
                                 <div class="col-md-3">  
                                     <div class="form-group">
-                                        <span for="MaterialType">Material Type</span><font color="Red">*</font>
+                                        <label for="MaterialType">Material Type</label><font color="Red">*</font>
                                         <select class="form-control select2" required  id="MaterialType" name="MaterialType">
                                             <option value="" required>Select Material Type</option>
                                             <?php
@@ -80,7 +80,7 @@ function BlockSpecial(evt) {
 
                                 <div class="col-md-3">
                                     <div class="form-group">
-                                        <span for="MaterialCategory">Material Category</span><font color="Red">*</font>
+                                        <label for="MaterialCategory">Material Category</label><font color="Red">*</font>
                                         <select class="form-control required select2" id="MaterialCategory" name="MaterialCategory" onchange="changeTextBox()">
                                             <option value="" requried>Select Material Category</option>
                                             <?php
@@ -100,7 +100,7 @@ function BlockSpecial(evt) {
 
                                 <div class="col-md-3">
                                     <div class="form-group">
-                                        <span for="UOM">Unit of Measurement</span><font color="Red">*</font>
+                                        <label for="UOM">Unit of Measurement</label><font color="Red">*</font>
                                         <select class="form-control required select2" id="UOM" name="UOM">
                                             <option value="" required>Select UOM</option>
                                             <?php
@@ -123,7 +123,7 @@ function BlockSpecial(evt) {
 
                                 <div class="col-md-3">
                                     <div class="form-group">
-                                        <span for="Assetcode">Asset Code</span>
+                                        <label for="Assetcode">Asset Code</label>
                                          <select class="form-control select2" id="Assetcode" name="Assetcode" disabled="true">
                                             <option value="0">Select Asset Code</option>
                                             <?php
@@ -143,7 +143,7 @@ function BlockSpecial(evt) {
                                
                                 <div class="col-md-3">
                                     <div class="form-group">
-                                        <span for="Costcenter">Cost Center Code</span>
+                                        <label for="Costcenter">Cost Center Code</label>
                                          <select class="form-control select2" id="Costcenter" name="Costcenter" disabled="true">
                                             <option value="0">Select Cost Center</option>
                                             <?php
@@ -162,13 +162,13 @@ function BlockSpecial(evt) {
                                 </div>
                                 <div class="col-md-3">
                                     <div class="form-group">
-                                        <span for="conversionfactor">Conversion Factor</span>
+                                        <label for="conversionfactor">Conversion Factor</label>
                                         <input type="text" class="form-control" id="conversionfactor"  name="conversionfactor" maxlength="255">
                                     </div>
                                 </div>
                                 <div class="col-md-3">
                                     <div class="form-group">
-                                        <span for="conversionfactorUOM">Conversion Factor UOM</span>
+                                        <label for="conversionfactorUOM">Conversion Factor UOM</label>
                                         <select class="form-control select2" id="conversionfactorUOM" name="conversionfactorUOM">
                                             <option value="0">Select Conversion Factor UOM</option>
                                             <?php
@@ -189,19 +189,19 @@ function BlockSpecial(evt) {
                                     <div class="col-md-12">
                                         <div class="col-md-3">
                                     <div class="form-group">
-                                        <span for="HSNcode">HSN code</span>
+                                        <label for="HSNcode">HSN code</label>
                                         <input type="text" class="form-control" id="HSNcode"  name="HSNcode" maxlength="255">
                                     </div>
                                 </div>
                             <div class="col-md-6">
                                         <div class="form-group">
-                                        <span for="remarks">Remarks</span>
+                                        <label for="remarks">Remarks</label>
                                          <input type="text" class="form-control" id="remarks"  name="remarks" maxlength="255">
                                         </div>
                                      </div>
                                       <div class="col-md-3">
                                     <div class="form-group">
-                                        <span for="Active">IsActive</span> <br>
+                                        <label for="Active">IsActive</label> <br>
                                          <input type="checkbox" id="isactive" name="isactive" > 
                                     </div>
                                 </div>
@@ -210,8 +210,9 @@ function BlockSpecial(evt) {
                         </div><!-- /.box-body -->
     
                         <div class="box-footer" style="text-align:right">
-                            <input type="submit" class="btn btn-info" onclick="validate();" value="Submit" />
-                            <input type="reset" class="btn btn-info" value="Cancel" />
+						 <input type="reset" class="btn btn-primary" value="Reset" />
+						<input type="submit" onclick="Validate();" value="Submit" class="btn btn-primary">
+						 
                         </div>
                     </form>
                 </div>
diff --git a/application/views/addasset.php b/application/views/addasset.php
index 261a2231..2f948059 100755
--- a/application/views/addasset.php
+++ b/application/views/addasset.php
@@ -63,7 +63,7 @@ $("#DeliveryDate").datepicker({
     
     <section class="content">
     <div style="text-align:right;">
-    <a href="<?php base_url() ?>assetListing" class="btn btn-info" value="Back"/>Back</a>
+    <a href="<?php base_url() ?>assetListing" class="btn btn-primary" value="Back"/>Back</a>
 	</div>
 	<br>
         <div class="row">
@@ -305,8 +305,8 @@ $("#DeliveryDate").datepicker({
 							</div><!-- /.box-body -->
 						
                         <div class="box-footer" style="text-align:right">
-                            <input type="submit" onclick="validate();"class="btn btn-info" value="Submit" />
-                            <input type="reset" class="btn btn-info" value="Reset" />
+                            <input type="submit" onclick="validate();"class="btn btn-primary" value="Submit" />
+                            <input type="reset" class="btn btn-primary" value="Reset" />
                         </div>
                    
                 </div>
diff --git a/application/views/addcost.php b/application/views/addcost.php
index 9cd17188..c7029a7c 100755
--- a/application/views/addcost.php
+++ b/application/views/addcost.php
@@ -1,4 +1,4 @@
-<div class="content-wrapper">
+<div class="content-wrapper" style="min-height: 537px;">
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
@@ -10,7 +10,7 @@
     
     <section class="content">
 	<div style="text-align:right;">
-    <a href="<?php echo base_url() ?>costListing" class="btn btn-info" value="Back"/>Back</a>
+    <a href="<?php echo base_url() ?>costListing" class="btn btn-primary" value="Back"/>Back</a>
 	</div>
 	<br>
     
@@ -57,8 +57,8 @@
                         </div><!-- /.box-body -->
     
                         <div class="box-footer" style="text-align:right">
-                            <input type="submit" class="btn btn-info" value="Submit" />
-                            <input type="reset" class="btn btn-info" value="Cancel" />
+                            <input type="submit" class="btn btn-primary" value="Submit" />
+                            <input type="reset" class="btn btn-primary" value="Cancel" />
                         </div>
                     </form>
                 </div>
diff --git a/application/views/addemployee.php b/application/views/addemployee.php
index 2ba937a7..cf153941 100755
--- a/application/views/addemployee.php
+++ b/application/views/addemployee.php
@@ -295,7 +295,7 @@ function onlyAlphabets(evt) {
     
     <section class="content">
 	<div style="text-align:right;">
-    <a href="<?php echo base_url() ?>employeeListing" class="btn btn-info" value="Back">Back</a>
+    <a href="<?php echo base_url() ?>employeeListing" class="btn btn-primary" value="Back">Back</a>
 	</div>
 	<br/>
         <div class="row">
@@ -313,7 +313,7 @@ function onlyAlphabets(evt) {
   <div class="row">
     <div class="col-md-10 col-md-offset-1">
       <form class="form-horizontal" role="form" >
-        <fieldset>
+         <div class="box-body">
 		 
           <!-- Form Name -->
           <legend>Personal Information</legend>
@@ -590,18 +590,14 @@ function onlyAlphabets(evt) {
 
           </div>
 		  
-		  		  
-		  <!-- Command -->
-
-          <div class="col-md-12 pad">
-            <div class="col-md-3 col-md-offset-9">
-              <div class="pull-right">
-               <input type="reset" id="reset" onclick="resetphoto();"  class="btn btn-info" value="Reset" />
+		  	</div>	  
+		 
+           <div class="box-footer" style="text-align:right">
+               <input type="reset" id="reset" onclick="resetphoto();"  class="btn btn-primary" value="Reset" />
                 <input type="submit" onclick="validate();"   class="btn btn-primary">
               </div>
-            </div>
-          </div>
-        </fieldset>
+             
+       
       </form>
     </div><!-- /.col-lg-12 -->
 </div><!-- /.row -->
diff --git a/application/views/addsupplier.php b/application/views/addsupplier.php
index 118d8463..5dbc40a1 100755
--- a/application/views/addsupplier.php
+++ b/application/views/addsupplier.php
@@ -217,9 +217,11 @@ $(function() {
  <style>
  legend{
  color:#00c0ef ! important;
- margin-left:-2%;
  } 
- 
+  .form-group
+ {
+	 padding-bottom:4%;
+   }
    .pad{
 	   padding-bottom:1%;
    }
@@ -260,8 +262,7 @@ $(function() {
     <div class="row">
     <div class="col-md-10 col-md-offset-1"><br/>
       <form class="form-horizontal" role="form" id="addsupplier" action="<?php echo base_url() ?>addNewsupplier" method="post" role="form">
-        <fieldset>
-		 
+           <div class="box-body">		 		 
           <!-- Form Name -->
           <legend>Supplier Information</legend> 
       		        
@@ -423,20 +424,12 @@ $(function() {
 					</select>
             </div>			
             </div>
-			 
-  
-	   
-
-          <div class="col-md-12">
-            <div class="col-md-3 col-md-offset-9">
-              <div class="pull-right">
+			 </div> 	   
+			<div class="box-footer" style="text-align:right">
                <input type="reset" id="reset"  class="btn btn-primary" value="Reset" />
                 <input type="submit" onclick="return Validate();" value="Submit" class="btn btn-primary">
-              
               </div>
-            </div>
-          </div>
-        </fieldset>
+         
       </form>
     </div><!-- /.col-lg-12 -->
 </div><!-- /.row -->
diff --git a/application/views/editEmployee.php b/application/views/editEmployee.php
index 5bdbe991..957f8d25 100755
--- a/application/views/editEmployee.php
+++ b/application/views/editEmployee.php
@@ -460,7 +460,7 @@ function ValidatePassport()
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-          <CENTER>Siddharth Industries Employee Profile</CENTER>
+          <CENTER>Siddharth Industries - Edit Employee details</CENTER>
          
       </h1>
 	  
@@ -468,7 +468,7 @@ function ValidatePassport()
     
     <section class="content">
 	<div style="text-align:right;">
-    <a href="<?php echo base_url() ?>employeeListing" class="btn btn-info" value="Back">Back</a>
+    <a href="<?php echo base_url() ?>employeeListing" class="btn btn-primary" value="Back">Back</a>
 	</div>
 	<br/>
         <div class="row">
@@ -486,7 +486,7 @@ function ValidatePassport()
   <div class="row">
     <div class="col-md-10 col-md-offset-1">
       <form class="form-horizontal" role="form" >
-        <fieldset>
+       <div class="box-body">
 		 
           <!-- Form Name -->
           <legend>Personal Information</legend>
@@ -757,8 +757,8 @@ function ValidatePassport()
             <div class="col-md-3"><span>Passport Number</span> 
                <input type="text" id="passportno"  maxlength="8" onchange="ValidatePassport();" name="passportno" placeholder="Passport Number" class="form-control" value="<?php echo $PassportNo ; ?>">
             </div>
-			<div class="col-md-3"><span>Valid Till</span>
-               <input  id="ValidTill" name="ValidTill"  maxlength="10"  placeholder="ValidTill" class="form-control" value="<?php echo $DOPassport ; ?>">
+			<div class="col-md-3"><span>Passport Expiry Date</span>
+               <input  id="ValidTill" name="ValidTill"  maxlength="10"  placeholder="Passport Expiry Date" class="form-control" value="<?php echo $DOPassport ; ?>">
             </div>
             </div>
              <div class="col-md-12 pad">
@@ -780,16 +780,13 @@ function ValidatePassport()
 		
 		  <!-- Command -->
 
-          <div class="form-group">
-            <div class="col-md-3 col-md-offset-9" style="padding: 10px;">
-              <div class="pull-right">
-              <input type="submit" onclick="Validate();"  class="btn btn-primary">
-			  <a href="<?php echo base_url() ?>employeeListing" class="btn btn-info" id="cancel"  value="Cancel">Cancel</a>
-              </div>
-            </div>
-          </div>
+          
 
-        </fieldset>
+        </div>
+		<div class="box-footer" style="text-align:right">
+                <input type="submit" onclick="validate();" value="Submit"  class="btn btn-primary">
+				<input type="reset" class="btn btn-primary" value="Cancel" />
+              </div>
       </form>
     </div><!-- /.col-lg-12 -->
 </div><!-- /.row -->
diff --git a/application/views/editOld.php b/application/views/editOld.php
index c11a3add..a1cdc53a 100755
--- a/application/views/editOld.php
+++ b/application/views/editOld.php
@@ -36,15 +36,13 @@ if(!empty($EmpList))
     }
 }
 
-
-
 ?>
 
-<div class="content-wrapper">
+<div class="content-wrapper" style="min-height: 537px;">
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-        <center>User Management</center>
+        <center>Siddharth Industries -  Edit User  </center>
         
       </h1>
 	  	  
@@ -52,7 +50,7 @@ if(!empty($EmpList))
     
     <section class="content">
     <div style="text-align:right;">
-    <a href="<?php echo base_url() ?>userListing" class="btn btn-info" value="Back">Back</a>
+    <a href="<?php echo base_url() ?>userListing" class="btn btn-primary" value="Back">Back</a>
 	</div>
 	<br/>
         <div class="row">
@@ -63,9 +61,7 @@ if(!empty($EmpList))
                 
                 
                 <div class="box box-primary">
-                    <div class="box-header">
-                        <center><h3 class="box-title">Edit User Details</h3></center>
-                    </div><!-- /.box-header -->
+                     
                     <!-- form start -->
                     
                     <form role="form" action="<?php echo base_url() ?>editUser" method="post" id="editUser" role="form">
@@ -85,29 +81,28 @@ if(!empty($EmpList))
                                     </div>
                                     
                                 </div>
-								<div class="col-md-3">                                
+								<div class="col-md-2">                                
                                     <div class="form-group">
                                         <label for="fname">Last Name</label>
                                         <input type="text" class="form-control required"  value="<?php echo $LastName ?>" readonly id="LastName" name="LastName" maxlength="128">
                                     </div>
                                     
                                 </div>
-								 <div class="col-md-3">
+								 <div class="col-md-2">
                                     <div class="form-group">
                                         <label for="email">Designation</label>
                                         <input type="text" class="form-control required "  value="<?php echo $Designation ?>"  readonly id="Designation"  name="Designation" maxlength="128">
                                     </div>
                                 </div>
-								 </div>
-								
-								 <div class="row">
-                               
-								<div class="col-md-3">
+								<div class="col-md-2">
                                     <div class="form-group">
                                         <label for="mobile">Department</label>
                                         <input type="text" class="form-control required" value="<?php echo $Department ?>" readonly id="Department" name="Department" minlength="10"maxlength="10">
                                     </div>
                                 </div>
+								 </div>
+								
+								 <div class="row">                               								
 								 <div class="col-md-3">
                                     <div class="form-group">
                                         <label for="email">Email address</label>
@@ -120,16 +115,7 @@ if(!empty($EmpList))
                                         <input type="text" class="form-control required digits" value="<?php echo $ContactNo ?>" readonly id="ContactNo" name="ContactNo" minlength="10"maxlength="10">
                                     </div>
                                 </div>
-								
-								 
-								 </div>
-								<div class="row">
-                               
-								
-                            </div>
-							
-                            <div class="row">
-							 <div class="col-md-3">
+								<div class="col-md-2">
                                     <div class="form-group">
                                         <label for="role">Role</label>
                                         <select class="form-control required" id="role" name="role">
@@ -148,25 +134,27 @@ if(!empty($EmpList))
                                         </select>
                                     </div>
                                 </div>    
-                                <div class="col-md-3">
+                                <div class="col-md-2">
                                     <div class="form-group">
                                         <label for="password">Password</label>
                                         <input type="password" class="form-control" id="password"  required  name="password" maxlength="10">
                                     </div>
                                 </div>
-                                <div class="col-md-3">
+                                <div class="col-md-2">
                                     <div class="form-group">
                                         <label for="cpassword">Confirm Password</label>
                                         <input type="password" class="form-control equalTo"   id="cpassword" name="cpassword" maxlength="10">
                                     </div>
                                 </div>
-                            </div>
+								 
+								 </div>
+							 
                            
                         </div><!-- /.box-body -->
     
                         <div class="box-footer" style="text-align:right">
-                            <input type="submit" class="btn btn-info" value="Submit" />
-                            <input type="reset" class="btn btn-info" value="Cancel" />
+                            <input type="submit" class="btn btn-primary" value="Submit" />
+                            <input type="reset" class="btn btn-primary" value="Cancel" />
                         </div>
                     </form>
             </div>
diff --git a/application/views/editOldRawmaterial.php b/application/views/editOldRawmaterial.php
index b8999019..b9cf3245 100755
--- a/application/views/editOldRawmaterial.php
+++ b/application/views/editOldRawmaterial.php
@@ -98,7 +98,7 @@ function changeTextBox() {
 }
 </script>
 
-<div class="content-wrapper">
+<div class="content-wrapper" style="min-height: 537px;">
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
@@ -109,20 +109,18 @@ function changeTextBox() {
     
     <section class="content">
     <div style="text-align:right;">
-    <a href="<?php echo base_url() ?>rawmaterialdetails/rawmaterialListing" class="btn btn-info" value="Back"/>Back</a>
+    <a href="<?php echo base_url() ?>rawmaterialdetails/rawmaterialListing" class="btn btn-primary" value="Back"/>Back</a>
     </div>
     <br/>
         <div class="row">
             <!-- left column -->
             <div class="col-md-12">
-              <!-- general form elements -->
-                
-                
-                
+              <!-- general form elements -->                   
                 <div class="box box-primary">
-                    <div class="box-header">
+                    <!--<div class="box-header">
                        <center> <h3 class="box-title"></h3></center>
-                    </div><!-- /.box-header -->
+                    </div> -->
+					<!-- /.box-header -->
                     <!-- form start -->
                     
                     <form role="form" action="<?php echo base_url() ?>rawmaterialdetails/editRawmaterial" method="post" id="editRawmaterial" role="form">
@@ -132,13 +130,13 @@ function changeTextBox() {
                                      
                                         <div class="col-md-3">
                                             <div class="form-group">
-                                                <span for="RMcode">RM code</span>
+                                                <label for="RMcode">RM code</label>
                                                 <input type="text" class="form-control" readonly id="RMcode"  name="RMcode" maxlength="255" value="<?php echo $RMCode;?>">        
                                             </div>
                                         </div>
                                         <div class="col-md-3">
                                             <div class="form-group">
-                                                <span for="MaterialName">Material Name</span><font color="Red">*</font>
+                                                <label for="MaterialName">Material Name</label><font color="Red">*</font>
                                                 <input type="text" class="form-control required " id="MaterialName"  name="MaterialName" maxlength="255" value="<?php echo $MaterialName;?>">
                                                 <input type="hidden" class="form-control required " id="MaterialCode"  value="<?php echo $MaterialCode;?>"name="MaterialCode" maxlength="255">
                                             </div>
@@ -147,7 +145,7 @@ function changeTextBox() {
                                     <div class="col-md-3" style="padding:0px;">
                                         <div class="col-md-6">
                                         <div class="form-group">
-                                            <span for="MaterialType">Material Type</span>
+                                            <label for="MaterialType">Material Type</label>
                                             <input type="text" class="form-control" readonly id="MaterialType"  name="MaterialType" value="<?php echo $MaterialType;?>">
                                             <!-- <select class="form-control select2" id="MaterialType" name="MaterialType" readonly="true">
 
@@ -170,7 +168,7 @@ function changeTextBox() {
 
                                          <div class="col-md-6">
                                             <div class="form-group">
-                                            <span for="MaterialCategory">Material Category</span>
+                                            <label for="MaterialCategory">Material Category</label>
                                             <input type="text" class="form-control" readonly id="MaterialCategory"  name="MaterialCategory" value="<?php echo $MaterialCategory;?>" onChange="changeTextBox();">
                                             <!-- <select class="form-control readonly select2" id="MaterialCategory" name="MaterialCategory" onChange="changeTextBox();">
                                                 <option value="<?php echo $MaterialCategory;?> "><?php echo $MaterialCategory;?></option>
@@ -193,7 +191,7 @@ function changeTextBox() {
                                      </div>
                                     <div class="col-md-3">
                                     <div class="form-group">
-                                        <span for="UOM">Unit of Measurement</span><font color="Red">*</font>
+                                        <label for="UOM">Unit of Measurement</label><font color="Red">*</font>
                                         <select class="form-control required select2" id="UOM" name="UOM">
                                             <option value="<?php echo $UOM;?>"><?php echo $UOM;?></option>
                                             <?php
@@ -218,7 +216,7 @@ function changeTextBox() {
                                 
                                 <div class="col-md-3">
                                     <div class="form-group">
-                                        <span for="assetcode">Asset Code</span>
+                                        <label for="assetcode">Asset Code</label>
                                         <select class="form-control select2" id="Assetcode" name="Assetcode" disabled="disabled">
                                             <option value="<?php echo $Assetcode;?>"><?php echo $Assetcode;?></option> 
                                            <?php
@@ -239,7 +237,7 @@ function changeTextBox() {
                                 </div>
                                 <div class="col-md-3">
                                     <div class="form-group">
-                                        <span for="costcenter">Cost Center Code</span>
+                                        <label for="costcenter">Cost Center Code</label>
                                         <select class="form-control select2" id="Costcenter" name="Costcenter" disabled="disabled">
                                             <option><?php echo $costcenter;?></option>
                                             <?php
@@ -258,13 +256,13 @@ function changeTextBox() {
                                 </div>
                                 <div class="col-md-3">
                                     <div class="form-group">
-                                        <span for="conversionfactor">Conversion Factor</span>
+                                        <label for="conversionfactor">Conversion Factor</label>
                                         <input type="text" class="form-control" id="conversionfactor"  name="conversionfactor" maxlength="255" value="<?php echo $conversionfactor;?>">
                                     </div>
                                 </div>
                                 <div class="col-md-3">
                                     <div class="form-group">
-                                        <span for="conversionfactorUOM">Conversion Factor UOM</span>
+                                        <label for="conversionfactorUOM">Conversion Factor UOM</label>
                                         <select class="form-control select2" id="conversionfactorUOM" name="conversionfactorUOM">
                                             <option value="<?php echo $conversionfactorUOM;?>"><?php echo $conversionfactorUOM;?></option>
                                             <?php
@@ -285,19 +283,19 @@ function changeTextBox() {
                             <div class="col-md-12">
                                  <div class="col-md-3">
                                     <div class="form-group">  
-                                        <span for="HSNcode">HSN code</span>
+                                        <label for="HSNcode">HSN code</label>
                                         <input type="text" class="form-control" id="HSNcode"  name="HSNcode" maxlength="255" value="<?php echo $HSNcode; ?>">
                                     </div>
                                 </div>  
                                     <div class="col-md-6">
                                      <div class="form-group">
-                                        <span for="remarks">Remarks</span>
+                                        <label for="remarks">Remarks</label>
                                         <input type="text" class="form-control" id="remarks"  name="remarks" maxlength="255" value="<?php echo $remarks;?>">
                                      </div>
                                 </div>
                                 <div class="col-md-3">
                                     <div class="form-group">
-                                        <span for="Active">IsActive</span>  <br/>
+                                        <label for="Active">IsActive</label>  <br/>
                                          <input type="checkbox" id="isactive" name="isactive" <?php echo $IsActive; ?>  > 
                                     </div>
                                 </div>  
@@ -308,8 +306,8 @@ function changeTextBox() {
                         </div><!-- /.box-body -->
     
                         <div class="box-footer" style="text-align:right">
-                            <input type="submit" class="btn btn-info" value="Submit" />
-                           <!-- <input type="reset" class="btn btn-default" value="Reset" />-->
+                            <input type="submit" class="btn btn-primary" value="Submit" />
+							 <input type="reset" class="btn btn-primary" value="Cancel" />                            
                         </div>
                     </form>
                 </div>
diff --git a/application/views/editOldasset.php b/application/views/editOldasset.php
index 099ce41d..74bdb5a4 100755
--- a/application/views/editOldasset.php
+++ b/application/views/editOldasset.php
@@ -145,7 +145,7 @@ $("#DeliveryDate").datepicker({
     
     <section class="content">
     <div style="text-align:right;">
-    <a href="<?php echo base_url()?>assetListing" class="btn btn-info"value="Back">Back</a>
+    <a href="<?php echo base_url()?>assetListing" class="btn btn-primary"value="Back">Back</a>
 	</div>
 	<br>
         <div class="row">
@@ -166,7 +166,7 @@ $("#DeliveryDate").datepicker({
 								<div class="col-md-3">                                
                                     <div class="form-group">
                                          <b>
-                                        <span for="Asset_Name">Asset Name</span>
+                                        <span for="Asset_Name">Asset Name</span><span style="color:red">*</span>
 										</b>
                                         <input type="text" class="form-control required" id="AssetName" name="AssetName" value="<?php echo $AssetName;?>" style="text-transform:uppercase;">
 										 <input type="hidden" name="AssetCode" id="AssetCode"  class="form-control" readonly  value="<?php echo $AssetCode;?>">   
@@ -176,7 +176,7 @@ $("#DeliveryDate").datepicker({
                                     <div class="col-md-3">                                
                                     <div class="form-group">
                                          <b>
-                                        <span for="Description">Asset Description</span></b>
+                                        <span for="Description">Asset Description</span><span style="color:red">*</span></b>
                                         <input type="text" class="form-control required" id="Description" name="Description"
 										value="<?php echo $Description; ?>">
                                   
@@ -186,7 +186,7 @@ $("#DeliveryDate").datepicker({
 									<div class="col-md-3">                                
                                     <div class="form-group">
                                          <b>
-                                        <span for="AssetOwner">Asset User</span></b>
+                                        <span for="AssetOwner">Asset User</span><span style="color:red">*</span></b>
                                           <input type="text" class="form-control required" id="User" name="User" value="<?php echo $User;?>">
                                     
                                     </div>
@@ -195,7 +195,7 @@ $("#DeliveryDate").datepicker({
 								<div class="col-md-3">                                
                                     <div class="form-group">
                                          <b>
-                                        <span for="Location">Asset Location</span></b>
+                                        <span for="Location">Asset Location</span><span style="color:red">*</span></b>
                                        <input type="text" class="form-control required" id="Location" name="Location"
 										value="<?php echo $Location;?>">
  
@@ -208,7 +208,7 @@ $("#DeliveryDate").datepicker({
 									<div class="col-md-3">
 										<div class="form-group">
 										<b>
-											<span for="PONO">Purchase Order Number</span></b>
+											<span for="PONO">Purchase Order Number</span><span style="color:red">*</span></b>
 											
 											<select class="form-control required select2"  id="PONO" name="PONO">
 												<option value="<?php echo $PONO;?>"><?php echo $PONO;?></option>
@@ -378,8 +378,8 @@ $("#DeliveryDate").datepicker({
 							</div><!-- /.box-body -->
     
                         <div class="box-footer" style="text-align:right">
-                            <input type="submit" class="btn btn-info" value="Submit" />
-                            <input type="reset" class="btn btn-info" value="Reset" />
+                            <input type="submit" class="btn btn-primary" value="Submit" />
+                            <input type="reset" class="btn btn-primary" value="Reset" />
                         </div>
                    
                 </div>
diff --git a/application/views/editOldcost.php b/application/views/editOldcost.php
index 97df7f4d..aed9e84d 100755
--- a/application/views/editOldcost.php
+++ b/application/views/editOldcost.php
@@ -106,11 +106,11 @@ $(function() {
        display: none;
     }
 </style>
-<div class="content-wrapper">
+<div class="content-wrapper" style="min-height: 537px;">
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-        <center>Siddharth Industries - Edit Cost List</center>
+        <center>Siddharth Industries - Edit Cost  Center</center>
         
       </h1>
 	  	  	 
@@ -118,7 +118,7 @@ $(function() {
     
     <section class="content">
 	<div style="text-align:right;">
-    <a href="<?php echo base_url() ?>costListing" class="btn btn-info" value="Back">Back</a>
+    <a href="<?php echo base_url() ?>costListing" class="btn btn-primary" value="Back">Back</a>
 	</div>
 	<br>
     
@@ -141,7 +141,7 @@ $(function() {
                                 <div class="col-md-12"> 
                                 <div class="col-md-3">
                                     <div class="form-group">
-                                        <label for="CostName">Cost Center Code:</label><font color="Red">*</font>
+                                        <label for="CostName">Cost Center Code </label><font color="Red">*</font>
                                          
 										<div class="form-group">
 												<?php
@@ -155,7 +155,7 @@ $(function() {
                            
                                 <div class="col-md-3">
                                     <div class="form-group">
-                                        <label for="Description">Cost Center Name:</label><font color="Red">*</font>
+                                        <label for="Description">Cost Center Name </label><font color="Red">*</font>
                                        	<div class="form-group">
 												<?php
 										 $data = array('name' => 'CostName','value' => set_value('CostName',$CostCenterName),'id'=>'CostName',  'class' => 'form-control' ,'required' => 'true','style'=>'text-transform:uppercase;','maxlength'=>'20');
@@ -164,8 +164,8 @@ $(function() {
 									</div>
                                     </div>
                                 </div>
-								<div class="col-md-3 > 
-                                        <label for="CostName">Budget Year:</label><font color="Red">*</font>
+								<div class="col-md-3 "> 
+                                        <label for="CostName">Budget Year </label><font color="Red">*</font>
                                          
 										<div class="form-group">
 										 <?php
@@ -186,8 +186,8 @@ $(function() {
 										   
 									
                                     </div> </div>	
-									<div class="col-md-3 > 
-                                        <label for="CostName">Approved By:</label><font color="Red">*</font>
+									<div class="col-md-3 "> 
+                                        <label for="CostName" >Approved By </label><font color="Red">*</font>
                                          
 										<div class="form-group">
 										 <?php
@@ -237,8 +237,8 @@ $(function() {
 			</div> 
 			<div class="col-md-4"> 
 				<center>
-					<a style="color:white" href="javascript:void(0);" id="addPop"><button type="button" style="margin: 30px 0px 0px 15px;" class="btn btn-info">Add</button></a><br>
-					<a style="color:white" href="javascript:void(0);" id="removePop"><button type="button" style="margin: 10px 0px 0px 15px;" class="btn btn-info">Remove</button></a><br>
+					<a style="color:white" href="javascript:void(0);" id="addPop"><button type="button" style="margin: 30px 0px 0px 15px;" class="btn btn-primary">Add</button></a><br>
+					<a style="color:white" href="javascript:void(0);" id="removePop"><button type="button" style="margin: 10px 0px 0px 15px;" class="btn btn-primary">Remove</button></a><br>
 
 				</center>
 			</div>                                 
@@ -274,7 +274,7 @@ $(function() {
 	  <div class="col-md-12">
   <div  style="text-align:right">
         
-       <a data-toggle="modal" href="#addbudgetmodel" class="btn btn-info"><i class="fa fa-plus"></i>&nbsp;&nbsp;Add Budget</a>       
+       <a data-toggle="modal" href="#addbudgetmodel" class="btn btn-primary"><i class="fa fa-plus"></i>&nbsp;&nbsp;Add Budget</a>       
   </div> 
           </div>   
 		<!-- Modal -->
@@ -365,8 +365,8 @@ $(function() {
 					
 					<!-- Modal Footer -->
 					<div class="modal-footer">
-						<a class="btn btn-info font tempClick"  ID="tempClick"  style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
-						<a  class="btn btn-info" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">cancel</a>
+						<a class="btn btn-primary font tempClick"  ID="tempClick"  style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
+						<a  class="btn btn-primary" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">cancel</a>
 					</div>
 				</div>
 			</div>
@@ -507,8 +507,8 @@ $(function() {
 					</div>
 					<!-- Modal Footer -->
 					<div class="modal-footer">
-						<a class="btn btn-info font tempClickEdit"  ID="tempClickEdit"  style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit</span></a>
-						<a class="btn btn-info" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">cancel</a>
+						<a class="btn btn-primary font tempClickEdit"  ID="tempClickEdit"  style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit</span></a>
+						<a class="btn btn-primary" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">cancel</a>
 					</div>
 				</div>
 			</div>
@@ -520,8 +520,8 @@ $(function() {
 	<div id="content"></div>
 			   <div class="box-footer" style="text-align:right">
 			    <input type="hidden" name="txtSelectedDepartment" id="txtSelectedDepartment" />			  
-                            <input type="submit" class="btn btn-info" value="Update" />
-                             <a href="<?php echo base_url() ?>costListing" class="btn btn-info" id="cancel"  value="Cancel">Cancel</a>
+                            <input type="submit" class="btn btn-primary" value="Update" />
+                             <a href="<?php echo base_url() ?>costListing" class="btn btn-primary" id="cancel"  value="Cancel">Cancel</a>
                         </div>
                     
 					
diff --git a/application/views/editOldemployee.php b/application/views/editOldemployee.php
index d265ae2b..90510d58 100755
--- a/application/views/editOldemployee.php
+++ b/application/views/editOldemployee.php
@@ -46,7 +46,7 @@ if(!empty($userRecords))
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-       <center>Employee details</center>
+       <center>Siddharth Industries - Edit Employee details</center>
        
 			  
       </h1>
@@ -55,7 +55,7 @@ if(!empty($userRecords))
     
     <section class="content">
     <div style="text-align:right;">
-    <a href="<?php echo base_url() ?>employeeListing" class="btn btn-info" value="Back"/>Back</a>
+    <a href="<?php echo base_url() ?>employeeListing" class="btn btn-primary" value="Back"/>Back</a>
 	</div>
 	<br/>
         <div class="row">
@@ -202,8 +202,8 @@ if(!empty($userRecords))
                         </div><!-- /.box-body -->
     
                         <div class="box-footer" style="text-align:right">
-                            <input type="submit" class="btn btn-info" value="Submit" />
-                            <input type="reset" class="btn btn-info" value="Cancel" />
+                            <input type="submit" class="btn btn-primary" value="Submit" />
+                            <input type="reset" class="btn btn-primary" value="Cancel" />
                         </div>
 						</div>
                     </form>
diff --git a/application/views/editSupplier.php b/application/views/editSupplier.php
index 012898c1..a07a6665 100755
--- a/application/views/editSupplier.php
+++ b/application/views/editSupplier.php
@@ -321,7 +321,7 @@ function onlyAlphabets(evt) {
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-       <center> Siddharth Industries - <?php echo  $SupplierID;  ?>   DETAILS</center>
+       <center> Siddharth Industries - Edit <?php echo  $SupplierID;  ?>   DETAILS</center>
        
       </h1>
 	  	  
@@ -346,7 +346,7 @@ function onlyAlphabets(evt) {
     <div class="row">
     <div class="col-md-10 col-md-offset-1" ><br/>
       <form class="form-horizontal" role="form" id="UpdateSupplier" action="<?php echo base_url() ?>editsupplier" method="post" role="form">
-        <fieldset>
+        <div class="box-body">
 		 
           <!-- Form Name -->
           <legend>Supplier Information</legend> 
@@ -505,16 +505,12 @@ function onlyAlphabets(evt) {
 							}
 							?>
 					</select>
-            </div>
-		  <div class="form-group">
-            <div class="col-md-3 col-md-offset-9">
-              <div class="pull-right">
-               <input type="reset" id="reset"  class="btn btn-primary" value="Reset" />
+            </div>	        
+        </div>
+		<div class="box-footer" style="text-align:right">
                 <input type="submit" onclick="validate();" value="Submit"  class="btn btn-primary">
+				<input type="reset" class="btn btn-primary" value="Cancel" />
               </div>
-            </div>
-          </div>
-        </fieldset>
       </form>
     </div><!-- /.col-lg-12 -->
 </div><!-- /.row -->
diff --git a/application/views/rawmaterialListing.php b/application/views/rawmaterialListing.php
index 3dbb3f67..c0f6f30f 100755
--- a/application/views/rawmaterialListing.php
+++ b/application/views/rawmaterialListing.php
@@ -1,9 +1,4 @@
-  <script>
- (function(l,q){var e=function(b,c){b.extend(!0,c.defaults,{dom:"<'row'<'col-sm-9'l><'col-sm-3'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-8'i><'col-sm-4'p>>",renderer:"bootstrap"});b.extend(c.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm"});c.ext.renderer.pageButton.bootstrap=function(g,e,r,s,i,m){var t=new c.Api(g),u=g.oClasses,j=g.oLanguage.oPaginate,d,f,n=0,p=function(c,e){var k,h,o,a,l=function(a){a.preventDefault();
-b(a.currentTarget).hasClass("disabled")||t.page(a.data.action).draw(!1)};k=0;for(h=e.length;k<h;k++)if(a=e[k],b.isArray(a))p(c,a);else{f=d="";switch(a){case "ellipsis":d="&hellip;";f="disabled";break;case "first":d=j.sFirst;f=a+(0<i?"":" disabled");break;case "previous":d=j.sPrevious;f=a+(0<i?"":" disabled");break;case "next":d=j.sNext;f=a+(i<m-1?"":" disabled");break;case "last":d=j.sLast;f=a+(i<m-1?"":" disabled");break;default:d=a+1,f=i===a?"active":""}d&&(o=b("<li>",{"class":u.sPageButton+" "+
-f,id:0===r&&"string"===typeof a?g.sTableId+"_"+a:null}).append(b("<a>",{href:"#","aria-controls":g.sTableId,"data-dt-idx":n,tabindex:g.iTabIndex}).html(d)).appendTo(c),g.oApi._fnBindAction(o,{action:a},l),n++)}},h;try{h=b(q.activeElement).data("dt-idx")}catch(l){}p(b(e).empty().html('<ul class="pagination"/>').children("ul"),s);h&&b(e).find("[data-dt-idx="+h+"]").focus()};c.TableTools&&(b.extend(!0,c.TableTools.classes,{container:"DTTT btn-group",buttons:{normal:"btn btn-default",disabled:"disabled"},
-collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:"disabled"}},print:{info:"DTTT_print_info"},select:{row:"active"}}),b.extend(!0,c.TableTools.DEFAULTS.oTags,{collection:{container:"ul",button:"li",liner:"a"}}))};"function"===typeof define&&define.amd?define(["jquery","datatables"],e):"object"===typeof exports?e(require("jquery"),require("datatables")):jQuery&&e(jQuery,jQuery.fn.dataTable)})(window,document);
- </script>
+ 
 <div class="content-wrapper">
     
     <section class="content-header">
diff --git a/application/views/supplierListing.php b/application/views/supplierListing.php
index 8462017e..73cafa7f 100755
--- a/application/views/supplierListing.php
+++ b/application/views/supplierListing.php
@@ -1,9 +1,4 @@
- <script>
- (function(l,q){var e=function(b,c){b.extend(!0,c.defaults,{dom:"<'row'<'col-sm-9'l><'col-sm-3'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-8'i><'col-sm-4'p>>",renderer:"bootstrap"});b.extend(c.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm"});c.ext.renderer.pageButton.bootstrap=function(g,e,r,s,i,m){var t=new c.Api(g),u=g.oClasses,j=g.oLanguage.oPaginate,d,f,n=0,p=function(c,e){var k,h,o,a,l=function(a){a.preventDefault();
-b(a.currentTarget).hasClass("disabled")||t.page(a.data.action).draw(!1)};k=0;for(h=e.length;k<h;k++)if(a=e[k],b.isArray(a))p(c,a);else{f=d="";switch(a){case "ellipsis":d="&hellip;";f="disabled";break;case "first":d=j.sFirst;f=a+(0<i?"":" disabled");break;case "previous":d=j.sPrevious;f=a+(0<i?"":" disabled");break;case "next":d=j.sNext;f=a+(i<m-1?"":" disabled");break;case "last":d=j.sLast;f=a+(i<m-1?"":" disabled");break;default:d=a+1,f=i===a?"active":""}d&&(o=b("<li>",{"class":u.sPageButton+" "+
-f,id:0===r&&"string"===typeof a?g.sTableId+"_"+a:null}).append(b("<a>",{href:"#","aria-controls":g.sTableId,"data-dt-idx":n,tabindex:g.iTabIndex}).html(d)).appendTo(c),g.oApi._fnBindAction(o,{action:a},l),n++)}},h;try{h=b(q.activeElement).data("dt-idx")}catch(l){}p(b(e).empty().html('<ul class="pagination"/>').children("ul"),s);h&&b(e).find("[data-dt-idx="+h+"]").focus()};c.TableTools&&(b.extend(!0,c.TableTools.classes,{container:"DTTT btn-group",buttons:{normal:"btn btn-default",disabled:"disabled"},
-collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:"disabled"}},print:{info:"DTTT_print_info"},select:{row:"active"}}),b.extend(!0,c.TableTools.DEFAULTS.oTags,{collection:{container:"ul",button:"li",liner:"a"}}))};"function"===typeof define&&define.amd?define(["jquery","datatables"],e):"object"===typeof exports?e(require("jquery"),require("datatables")):jQuery&&e(jQuery,jQuery.fn.dataTable)})(window,document);
- </script>
+ 
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
@@ -16,8 +11,8 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
         <div class="row">
             <div class="col-xs-12 text-right">
                 <div class="form-group">
-                    <a class="btn btn-info" href="<?php echo base_url(); ?>addsupplier">Add New Supplier</a>
-					<a class="btn btn-info" href="<?php echo base_url(); ?>supplier/export_supplierdetails">Export supplier details <i class="fa fa-download"aira-hidden="true"></i></a>
+                    <a class="btn btn-Primary" href="<?php echo base_url(); ?>addsupplier">Add New Supplier</a>
+					<a class="btn btn-Primary" href="<?php echo base_url(); ?>supplier/export_supplierdetails">Export supplier details <i class="fa fa-download"aira-hidden="true"></i></a>
                 </div>
             </div>
         </div>
diff --git a/application/views/users.php b/application/views/users.php
index 78b16d97..79d14faa 100755
--- a/application/views/users.php
+++ b/application/views/users.php
@@ -12,7 +12,7 @@
         <div class="row">
             <div class="col-xs-12 text-right">
                 <div class="form-group">
-                    <a class="btn btn-primary" href="<?php echo base_url(); ?>addNew">Add New</a>
+                    <a class="btn btn-primary" href="<?php echo base_url(); ?>addNew">Add New User</a>
                 </div>
             </div>
         </div>