diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php
index e5f7ed4..f4233cc 100644
--- a/app/Controllers/Admin_controller.php
+++ b/app/Controllers/Admin_controller.php
@@ -11,6 +11,8 @@ use App\Models\Email_template_model;
 use App\Models\Variable_model;
 use App\Models\Rule_model;
 use App\Models\Cart_token_model;
+use App\Models\Zipcode_model;
+
 class Admin_controller extends BaseController
 {
 	public $session;
@@ -27,6 +29,7 @@ class Admin_controller extends BaseController
 		$this->VariableModel = new Variable_model();
 		$this->RuleModel = new Rule_model();
 		$this->Cart_token_model = new Cart_token_model();
+		$this->ZipcodeModel = new Zipcode_model();
 		helper(['form', 'url']);
 	}
     public function index()
@@ -81,12 +84,7 @@ class Admin_controller extends BaseController
 	{
 		
 		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user'));
-		$data['userList'] =  $this->UserModel->select('users.* , country.name as country_name , state.name as state_name ,city.name as city_name')
-											 ->join('country', 'users.country = country.id', 'left')
-											 ->join('state', 'users.state = state.id', 'left')
-											 ->join('city', 'users.city = city.id', 'left')
-											 ->where('users.id != ',session()->get('logged_user') )
-		                                     ->findAll();
+		$data['userList'] =  $this->UserModel->where('users.id != ',session()->get('logged_user') )->findAll();
 		echo view('layout/header',$userdata);
 		echo view('users_list',$data);
 		echo view('layout/footer');
@@ -110,17 +108,24 @@ class Admin_controller extends BaseController
 		}
 		
 		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user'));
-		$data['country']=$this->cModel->fetch_country();
-		$data['userList'] =  $this->UserModel->select('users.* , country.name as country_name , state.name as state_name ,city.name as city_name')
-											 ->join('country', 'users.country = country.id', 'left')
-											 ->join('state', 'users.state = state.id', 'left')
-											 ->join('city', 'users.city = city.id', 'left')
-											 ->where('md5(users.id)', $user_id )
-											 ->find();
+		$zip = $this->ZipcodeModel->findAll();
+		$output = '<option value="">Select Zipcode</option>';
+		foreach($zip as $row)
+		{
+		$output .= '<option value="'.$row['id'].'">'.$row['code'].'</option>';
+		}
+		$data['zipcode'] = $output;
+		$data['userList'] =  $this->UserModel ->select('users.* , zipcode.code as zipcode')
+											->join('zipcode', 'users.pincode = zipcode.id', 'left')
+											->where('md5(users.id)', $user_id )
+											->find();
+
+											
 		if ($check != null) {
 			$data['check'] = 'profile_edit';
+		}else{
+		$data['check'] = '';
 		}
-		$data['check'] = 'profile_edit';
 		//print_r($data);die();
 		echo view('layout/header',$userdata);
 		echo view('user_form',$data);
@@ -148,14 +153,24 @@ class Admin_controller extends BaseController
 					return redirect()->to(base_url()."users_list"); 
 				}
 			
-		}
+		}else{
 		
+
 		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user'));
-		$data['country']=$this->cModel->fetch_country();
+		$zip = $this->ZipcodeModel->findAll();
+		$output = '<option value="">Select Zipcode</option>';
+		foreach($zip as $row)
+		{
+		$output .= '<option value="'.$row['id'].'">'.$row['code'].'</option>';
+		}
+		$data['zipcode'] = $output;
 		$data['check']= null;
 		echo view('layout/header',$userdata);
 		echo view('user_form',$data);
 		echo view('layout/footer');
+		}
+		
+		
 		
 	}
 
@@ -176,10 +191,8 @@ class Admin_controller extends BaseController
 	{
 		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user'));
 		
-		$data['userList'] =  $this->UserModel->select('users.* , country.name as country_name')
-											 ->join('country', 'users.country = country.id', 'left')
-											 ->join('state', 'users.state = state.id', 'left')
-											 ->join('city', 'users.city = city.id', 'left')
+		$data['userList'] =  $this->UserModel->select('users.* , zipcode.code as zipcode')
+		                                      ->join('zipcode', 'users.pincode = zipcode.id', 'left')
 											 ->where('md5(users.id)', $user_id )
 											 ->find();
 		
diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php
index 13b623d..85a4336 100644
--- a/app/Controllers/Member_controller.php
+++ b/app/Controllers/Member_controller.php
@@ -164,12 +164,10 @@ class Member_controller extends BaseController
 
 		$id = session()->get('logged_user');
 		$userdata['userdata']=$this->dModel->getLoggedInUserData($id);
-		$data['Membersdata'] =  $this->MemberModel->select('member.* , country.name as country_name , state.name as state_name ,city.name as city_name')
-												  ->join('country', 'member.country = country.id', 'left')
-											      ->join('state', 'member.state = state.id', 'left')
-												  ->join('city', 'member.city = city.id', 'left')
-												  ->where('member.id != ',session()->get('logged_user') )
-												  ->findAll();
+		$data['Membersdata'] =  $this->MemberModel->findAll();
+												
+												
+												  
 		echo view('layout/header',$userdata);
 		echo view('members_list',$data);
 		echo view('layout/footer');
@@ -208,13 +206,18 @@ class Member_controller extends BaseController
 
 		$logged_user_id = session()->get('logged_user');
 		$userdata['userdata']=$this->dModel->getLoggedInUserData($logged_user_id);
-		$data['country']=$this->cModel->fetch_country();
-		$data['Memberdata'] =  $this->MemberModel->select('member.* , country.name as country_name , state.name as state_name ,city.name as city_name')
-												->join('country', 'member.country = country.id', 'left')
-												->join('state', 'member.state = state.id', 'left')
-												->join('city', 'member.city = city.id', 'left')
+		$zip = $this->ZipcodeModel->findAll();
+		$output = '<option value="">Select Zipcode</option>';
+		foreach($zip as $row)
+		{
+		$output .= '<option value="'.$row['id'].'">'.$row['code'].'</option>';
+		}
+		$data['zipcode'] = $output;
+		$data['Memberdata'] =  $this->MemberModel->select('member.* , zipcode.code as zipcode')
+												->join('zipcode', 'member.pincode = zipcode.id', 'left')
 												->where('md5(member.id)', $member_id )
 												->find();
+											
 		echo view('layout/header',$userdata);
 		echo view('member_form',$data);
 		echo view('layout/footer');
@@ -243,7 +246,13 @@ class Member_controller extends BaseController
 		}
 		
 		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user'));
-		$data['country']=$this->cModel->fetch_country();
+		$zip = $this->ZipcodeModel->findAll();
+		$output = '<option value="">Select Zipcode</option>';
+		foreach($zip as $row)
+		{
+		$output .= '<option value="'.$row['id'].'">'.$row['code'].'</option>';
+		}
+		$data['zipcode'] = $output;
 		echo view('layout/header',$userdata);
 		echo view('member_form',$data);
 		echo view('layout/footer');
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 6e32ea3..d580b1a 100644
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -40,6 +40,10 @@
         <link href="<?= base_url()."/public"; ?>/assets/libs/@fullcalendar/bootstrap/main.min.css" rel="stylesheet" type="text/css" />
         <link href="<?= base_url()."/public"; ?>/assets/libs/@fullcalendar/timegrid/main.min.css" rel="stylesheet" type="text/css" />
         <link href="<?= base_url()."/public"; ?>/assets/libs/@fullcalendar/list/main.min.css" rel="stylesheet" type="text/css" />
+
+        <script src="<?= base_url()."/public"; ?>/assets/member_js/ajax.js"></script>
+        <input id="url" value="<?= base_url() ?>" type="hidden">
+
 <script>
  
 
diff --git a/app/Views/member_form.php b/app/Views/member_form.php
index 7c5ab61..00be610 100644
--- a/app/Views/member_form.php
+++ b/app/Views/member_form.php
@@ -15,7 +15,7 @@
                         </div>     
                         <!-- end page title --> 
 
-                     
+                 
 
 
                         <div class="row">
@@ -77,40 +77,31 @@
                                             </div>
                                             </div>
                                             <div class="form-group row">
-                                                <label for="inputEmail3" class="col-4 col-form-label">Country<span class="text-danger"></span></label>
+                                                <label for="inputEmail3" class="col-4 col-form-label">Zip code<span class="text-danger"></span></label>
                                                 <div class="col-7">
-                                                <!-- <input type="text"  class="form-control"  name="country" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['country'];} ?>" placeholder="Country"> -->
-                                                <select id="selectize-select"   class="form-control country" name="country" id="country">
-                                                <?php if(isset($Memberdata)){ ?> <option value="<?= $Memberdata[0]['country']; ?>"> <?= $Memberdata[0]['country_name']; ?> </option>   <?php } ?>
-                                                <?=  $country; ?>  
+                                                <select    class="form-control country" name="pincode" id="pincode">
+                                                <?php if(isset($Memberdata)){ ?> <option value="<?= $Memberdata[0]['pincode']; ?>"> <?= $Memberdata[0]['zipcode']; ?> </option>   <?php } ?>
+                                                <?=  $zipcode; ?>  
                                                 </select>
                                                 </div>
                                             </div>
+
                                             <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">State<span class="text-danger"></span></label>
                                                 <div class="col-7">
-                                                <!-- <input type="text"  class="form-control"  name="state" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['state'];} ?>" placeholder="State"> -->
-                                                <select id="selectize-select"   class="form-control state" name="state" id="state"> 
-                                                <?php if(isset($Memberdata)){ ?> <option value="<?= $Memberdata[0]['state']; ?>"> <?= $Memberdata[0]['state_name']; ?> </option>   <?php } ?>
-                                                </select>
+                                                <input type="text"  class="form-control" id="state"  name="state" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['state'];} ?>" placeholder="State">
+                                               
                                                 </div>
                                             </div>
                                         
                                              <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">City<span class="text-danger"></span></label>
                                                 <div class="col-7">
-                                                <!-- <input type="text"  class="form-control"  name="city" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['city'];} ?>" placeholder="City"> -->
-                                                <select id="selectize-select"   class="form-control city" name="city" id="city">
-                                                <?php if(isset($Memberdata)){ ?> <option value="<?= $Memberdata[0]['city']; ?>"> <?= $Memberdata[0]['city_name']; ?> </option>   <?php } ?>
-                                                </select>
-                                                </div>
-                                            </div>
-                                            <div class="form-group row">
-                                                <label for="inputEmail3" class="col-4 col-form-label">Zip code<span class="text-danger"></span></label>
-                                                <div class="col-7">
-                                                <input type="text"   class="form-control"  name="pincode" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['pincode'];} ?>" placeholder="Zip Code">
+                                                <input type="text"  class="form-control" id="city" name="city" value="<?php if(isset($Memberdata)){echo $Memberdata[0]['city'];} ?>" placeholder="City">
+                                               
                                                 </div>
                                             </div>
+                                          
                                            
 
                                            
diff --git a/app/Views/members_list.php b/app/Views/members_list.php
index 43d0bd1..0e3910e 100644
--- a/app/Views/members_list.php
+++ b/app/Views/members_list.php
@@ -36,7 +36,6 @@
                                                     <th>Name</th>
                                                     <th>Mobile</th>
                                                     <th>Email</th>
-                                                    <!-- <th>Address</th> -->
                                                     <th>Status</th>
                                                     <th>Action</th>
                                                 </tr>
@@ -50,7 +49,6 @@
                                                         <td><?php echo $row['name'];?></td>
                                                         <td><?php echo $row['mobile'];?></td>
                                                         <td><?php echo $row['email'];?></td>
-                                                        <!-- <td><?php echo $row['address'].",".$row['city_name'].",".$row['state_name'].",".$row['country_name']." - ".$row['pincode'].",";?></td> -->
                                                         <td><?php if($row['is_active'] == 1){ echo "Active"; }else{ echo "Deactive"; }?></td>
                                                         <td><a href="<?= base_url() ?>member_edit/<?php echo md5($row['id']);?>"><i class="mdi mdi-lead-pencil"  style="font-size:18px;"></i></a>
                                                         <?php if ($row['is_active'] == 1) { ?>
diff --git a/app/Views/profile.php b/app/Views/profile.php
index 154d03d..a8fe298 100644
--- a/app/Views/profile.php
+++ b/app/Views/profile.php
@@ -125,8 +125,7 @@ body {
                                       <?php if($userList[0]['address']) { echo $userList[0]['address']; echo ' ,'; } ?>
                                       <?php if($userList[0]['city']) { echo $userList[0]['city']; echo ' ,'; }?>
                                       <?php if($userList[0]['state']) { echo $userList[0]['state']; echo ' ,'; }?>
-                                      <?php if($userList[0]['country_name']) { echo $userList[0]['country_name']; }?>
-                                      <?php if($userList[0]['pincode']) { echo '- '; echo $userList[0]['pincode'];  }?>
+                                      <?php if($userList[0]['zipcode']) { echo '- '; echo $userList[0]['zipcode'];  }?>
                                 </tr>
                             </tbody>
                         </table>
diff --git a/app/Views/user_form.php b/app/Views/user_form.php
index 43cb338..ef63c3d 100644
--- a/app/Views/user_form.php
+++ b/app/Views/user_form.php
@@ -108,39 +108,30 @@
                                                     <input type="text"   class="form-control"  name="address" value="<?php if(isset($userList)){echo $userList[0]['address'];} ?>" placeholder="Address">
                                             </div>
                                             </div>
-                                            <div class="form-group row">
-                                                <label for="inputEmail3" class="col-4 col-form-label">Country<span class="text-danger"></span></label>
-                                                <div class="col-7">
-                                                <input type="text"   class="form-control"  name="country" value="<?php if(isset($userList)){echo $userList[0]['country'];} ?>" placeholder="Country">
-
-                                                <!-- <select id="selectize-select"   class="form-control country" name="country" id="country">
-                                                <?php if(isset($userList)){ ?> <option value="<?= $userList[0]['country']; ?>"> <?= $userList[0]['country_name']; ?> </option>   <?php } ?>
-                                                <?=  $country; ?>  
-                                                </select> -->
-                                                </div>
-                                            </div>
-                                            <div class="form-group row">
-                                                <label for="inputEmail3" class="col-4 col-form-label">State<span class="text-danger"></span></label>
-                                                <div class="col-7">
-                                                <input type="text"   class="form-control"  name="state" value="<?php if(isset($userList)){echo $userList[0]['state'];} ?>" placeholder="State">
-                                                <!-- <select id="selectize-select"   class="form-control state" name="state" id="state"> 
-                                                <?php if(isset($userList)){ ?> <option value="<?= $userList[0]['state']; ?>"> <?= $userList[0]['state_name']; ?> </option>   <?php } ?>
-                                                </select> -->
-                                                </div>
-                                            </div>
-                                             <div class="form-group row">
-                                                <label for="inputEmail3" class="col-4 col-form-label">City<span class="text-danger"></span></label>
-                                                <div class="col-7">
-                                                <input type="text"   class="form-control"  name="city" value="<?php if(isset($userList)){echo $userList[0]['city'];} ?>" placeholder="City">
-                                                <!-- <select id="selectize-select"   class="form-control city" name="city" id="city">
-                                                <?php if(isset($userList)){ ?> <option value="<?= $userList[0]['city']; ?>"> <?= $userList[0]['city_name']; ?> </option>   <?php } ?>
-                                                </select> -->
-                                                </div>
-                                            </div>
+                                          
                                             <div class="form-group row">
                                                 <label for="inputEmail3" class="col-4 col-form-label">Zip code<span class="text-danger"></span></label>
                                                 <div class="col-7">
-                                                <input type="text"   class="form-control"  name="pincode" value="<?php if(isset($userList)){echo $userList[0]['pincode'];} ?>" placeholder="Zip Code">
+                                                <select    class="form-control country" name="pincode" id="pincode">
+                                                <?php if(isset($userList)){ ?> <option value="<?= $userList[0]['pincode']; ?>"> <?= $userList[0]['zipcode']; ?> </option>   <?php } ?>
+                                                <?=  $zipcode; ?>  
+                                                </select>
+                                                </div>
+                                            </div>
+
+                                            <div class="form-group row">
+                                                <label for="inputEmail3" class="col-4 col-form-label">State<span class="text-danger"></span></label>
+                                                <div class="col-7">
+                                                <input type="text"  class="form-control" id="state"  name="state" value="<?php if(isset($userList)){echo $userList[0]['state'];} ?>" placeholder="State">
+                                               
+                                                </div>
+                                            </div>
+                                        
+                                             <div class="form-group row">
+                                                <label for="inputEmail3" class="col-4 col-form-label">City<span class="text-danger"></span></label>
+                                                <div class="col-7">
+                                                <input type="text"  class="form-control" id="city" name="city" value="<?php if(isset($userList)){echo $userList[0]['city'];} ?>" placeholder="City">
+                                               
                                                 </div>
                                             </div>
                                             
diff --git a/app/Views/users_list.php b/app/Views/users_list.php
index 579c83f..3fe54d9 100644
--- a/app/Views/users_list.php
+++ b/app/Views/users_list.php
@@ -37,7 +37,6 @@
                                                     <th>Mobile</th>
                                                     <th>Email</th>
                                                     <th>Role</th>
-                                                    <!-- <th>Address</th> -->
                                                     <th>Status</th>
                                                     <th>Action</th>
                                                 </tr>
@@ -52,7 +51,7 @@
                                                         <td><?php echo $row['mobile'];?></td>
                                                         <td><?php echo $row['email'];?></td>
                                                         <td><?php echo $row['role'];?></td>
-                                                        <!-- <td><?php echo $row['address'].",".$row['city_name'].",".$row['state_name'].",".$row['country_name']." - ".$row['pincode'].",";?></td> -->
+                                                     
                                                         <td><?php if($row['is_active'] == 1){ echo "Active"; }else{ echo "Deactive"; }?></td>
                                                         <td><a href="<?= base_url() ?>user_edit/<?php echo md5($row['id']);?>"><i class="mdi mdi-lead-pencil"  style="font-size:18px;"></i></a>
                                                         <?php if ($row['is_active'] == 1) { ?>