diff --git a/app/Controllers/Cart_controller.php b/app/Controllers/Cart_controller.php
index e98a12c..e7dfb23 100644
--- a/app/Controllers/Cart_controller.php
+++ b/app/Controllers/Cart_controller.php
@@ -79,8 +79,8 @@ class Cart_controller extends BaseController
             else 
             {
             $this->session->set('user_token',$token);
+            $this->session->set('token',$token);
             $data['token'] = $token;
-
             $data['primary_id'] = $this->request->getVar('id');
             $data['table_name'] = 'package_and_pricing';
             $data['count'] = 1;
diff --git a/app/Controllers/Sendmail_controller.php b/app/Controllers/Sendmail_controller.php
index 2d173fd..45abe92 100644
--- a/app/Controllers/Sendmail_controller.php
+++ b/app/Controllers/Sendmail_controller.php
@@ -22,6 +22,8 @@ use App\Models\Member_model;
 
 use App\Models\Transaction_model;
 
+use App\Models\Rule_model;
+
 
 
 class Sendmail_controller extends BaseController
@@ -54,6 +56,8 @@ class Sendmail_controller extends BaseController
 
         $this->TransactionModel = new Transaction_model();
 
+        $this->RuleModel = new Rule_model();
+
 		helper(['form', 'url']);
 
 	
@@ -303,17 +307,17 @@ class Sendmail_controller extends BaseController
 
           
 
-            $TransactionData = $this->TransactionModel->where('member_id', session()->get('logged_user'))->orderBy('created_at', 'DESC')->first();
+            // $TransactionData = $this->TransactionModel->where('member_id', session()->get('logged_user'))->orderBy('created_at', 'DESC')->first();
 
-            $Transaction_id = $TransactionData['transaction_id'];
+            // $Transaction_id = $TransactionData['transaction_id'];
 
-            $timestamp = strtotime($TransactionData['created_at']);
+            // $timestamp = strtotime($TransactionData['created_at']);
 
-            $Transaction_date  = date('l, F j, Y', $timestamp);
+            // $Transaction_date  = date('l, F j, Y', $timestamp);
 
-            $amount = json_decode($TransactionData['transaction'] , true)['payment']['amount_money']['amount'];
+            // $amount = json_decode($TransactionData['transaction'] , true)['payment']['amount_money']['amount'];
 
-            $payment_method = json_decode($TransactionData['transaction'] , true)['payment']['source_type'];
+            // $payment_method = json_decode($TransactionData['transaction'] , true)['payment']['source_type'];
 
 
 
@@ -325,17 +329,41 @@ class Sendmail_controller extends BaseController
 
             $email->setCC($temp_data[0]['to']);
 
-            if ($temp_data) {
+            $data['TransactionData'] = $this->TransactionModel->where('order_id', $code )->where('member_id', session()->get('logged_user'))->find();
+            $memberCredits = $this->creditsModel->where('order_id', $code )
+                                                ->where('member_id', session()->get('logged_user'))
+                                                ->select('package_name')
+                                                ->select('cost')
+                                                ->selectSum('credit_points', 'credit_points')
+                                                ->selectSum('cost', 'costSum')
+                                                ->selectCount('package_name', 'pack_count')
+                                                ->groupBy('package_name')->findAll();     
+            $Subtotal = 0;
+            foreach ($memberCredits as $key => $ele) {
+            $Subtotal = $Subtotal + $ele['costSum'];
+            }
+            $data['memberCredits'] =$memberCredits;
+            $data['order_id'] = $code;
+            $timestamp = strtotime($data['TransactionData'][0]['created_at']);
+            $data['formattedDate']  = date('l, F j, Y', $timestamp);
+            $data['Subtotal'] = $Subtotal;
+            $data['gst'] = $this->RuleModel->select('value')->where('rule_key', 3 )->get()->getRow()->value;
+            $data['pst'] = $this->RuleModel->select('value')->where('rule_key', 4 )->get()->getRow()->value;
+            $data['card_brand'] =  json_decode($data['TransactionData'][0]['transaction'] , true)['payment']['card_details']['card']['card_brand'];
+            $data['last_4'] =  json_decode($data['TransactionData'][0]['transaction'] , true)['payment']['card_details']['card']['last_4'];
+            $data['html'] = view('success_mail',$data);
 
-            $data['html'] = str_replace("%name%",session()->get('logged_user_name'),$temp_data[0]['html']);
+            // if ($temp_data) {
 
-            $data['html'] = str_replace("%id%",$Transaction_id,$temp_data[0]['html']);
+            // $data['html'] = str_replace("%name%",session()->get('logged_user_name'),$temp_data[0]['html']);
 
-            $data['html'] = str_replace("%method%",$payment_method,$temp_data[0]['html']);
+            // $data['html'] = str_replace("%id%",$Transaction_id,$temp_data[0]['html']);
 
-            $data['html'] = str_replace("%date%", $Transaction_date,$temp_data[0]['html']);
+            // $data['html'] = str_replace("%method%",$payment_method,$temp_data[0]['html']);
 
-            $data['html'] = str_replace("%amount%",$amount,$temp_data[0]['html']);
+            // $data['html'] = str_replace("%date%", $Transaction_date,$temp_data[0]['html']);
+
+            // $data['html'] = str_replace("%amount%",$amount,$temp_data[0]['html']);
 
             
 
@@ -343,7 +371,7 @@ class Sendmail_controller extends BaseController
 
             $message = view('verification_mail_temp',$data);
 
-            }
+            // }
 
             if ($temp_data[0]['is_active'] == 1)
 
diff --git a/app/Views/changepassword.php b/app/Views/changepassword.php
index 6964504..5311638 100644
--- a/app/Views/changepassword.php
+++ b/app/Views/changepassword.php
@@ -26,6 +26,8 @@
     position: absolute;
 }
 
+
+
 </style>
 </head>
 <body class="forgetpassword">
@@ -58,13 +60,25 @@
                     <div class="col-12 mb-4 show-password">
                         <label for="toggle-password">Password</label>
                         <span toggle="#hori-pass1" id="toggle-password"  class="fa fa-fw fa-eye field-icon toggle-password"></span>
-                        <input type="password" id="hori-pass1" class="form-control"
+                       <!--  <input type="password" id="hori-pass1" class="form-control"
                         pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,}" 
                         title="Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters" 
-                        placeholder="Enter password" name="password" required>
-                        <!-- <span id="pass-err" style="font-size:14px;line-height:25px;"></span> -->
-                        <span style="font-size:14px;line-height:25px;color:red;">Must contain at least one number and one uppercase and one special character like !@#$%^&*() and lowercase letter, and at least 8 or more characters</span>
+                        placeholder="Enter password" name="password" required> -->
                         
+                        <input type="password" id="hori-pass1" name="password" class="form-control" placeholder="Password">
+                        <div class="aro-pswd_info">
+				<div id="pswd_info">
+					<h4>Password requirements</h4>
+					<ul>
+						<li id="letter" class="invalid">At least <strong>one letter</strong></li>
+						<li id="capital" class="invalid">At least <strong>one capital letter</strong></li>
+						<li id="number" class="invalid">At least <strong>one number</strong></li>
+						<li id="length" class="invalid">Be at least <strong>8 characters</strong></li>
+						<li id="space" class="invalid">use any one<strong> [~,!,@,#,$,%,^,&,*,-,=,.,;,']</strong></li>
+					</ul>
+				</div>
+			</div>
+
                     </div>
                     <div class="col-12 mb-4 show-password">
                         <label for="toggle-password1">Confirm Password</label>
@@ -78,7 +92,56 @@
     </div>    
 </section>    
 <?php include 'member_layout/footer.php' ?>
-</body>
+
+<script>
+$(document).ready(function(){
+	
+	$('#hori-pass1').keyup(function() {
+		var pswd = $(this).val();
+		
+		//validate the length
+		if ( pswd.length < 8 ) {
+			$('#length').removeClass('valid').addClass('invalid');
+		} else {
+			$('#length').removeClass('invalid').addClass('valid');
+		}
+		
+		//validate letter
+		if ( pswd.match(/[A-z]/) ) {
+			$('#letter').removeClass('invalid').addClass('valid');
+		} else {
+			$('#letter').removeClass('valid').addClass('invalid');
+		}
+
+		//validate capital letter
+		if ( pswd.match(/[A-Z]/) ) {
+			$('#capital').removeClass('invalid').addClass('valid');
+		} else {
+			$('#capital').removeClass('valid').addClass('invalid');
+		}
+
+		//validate number
+		if ( pswd.match(/\d/) ) {
+			$('#number').removeClass('invalid').addClass('valid');
+		} else {
+			$('#number').removeClass('valid').addClass('invalid');
+		}
+		
+		//validate space
+		if ( pswd.match(/[^a-zA-Z0-9\-\/]/) ) {
+			$('#space').removeClass('invalid').addClass('valid');
+		} else {
+			$('#space').removeClass('valid').addClass('invalid');
+		}
+		
+	}).focus(function() {
+		$('#pswd_info').show();
+	}).blur(function() {
+		$('#pswd_info').hide();
+	});
+	
+});
+</script>    
 <script>
     $("#toggle-password").click(function() {
     $(this).toggleClass("fa-eye fa-eye-slash");
@@ -119,4 +182,5 @@
 
  <!-- Validation init js-->
  <script src="<?= base_url()."/public"; ?>/assets/js/pages/form-validation.init.js"></script>
+ </body>
 </html>
\ No newline at end of file
diff --git a/app/Views/member_layout/header.php b/app/Views/member_layout/header.php
index 70ee0ea..78f4b6e 100644
--- a/app/Views/member_layout/header.php
+++ b/app/Views/member_layout/header.php
@@ -10,7 +10,7 @@
                 <div class="row d-flex align-items-baseline">                        
                     <div class="col-lg-5 header1">
                         <ul>
-                            <li><a href="https://golfevolutionkelowna.ca/">Home</a></li>
+                            <li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>">Home</a></li>
                             <li><a href="<?php 
                             if (isset($token)) 
                             {
@@ -19,11 +19,11 @@
                                     if(!session()->has('token'))
                                     echo base_url('membership');
                                     else 
-                                    echo base_url('/membership/').session()->get('token'); 
+                                    echo base_url('/membership/').md5(session()->get('token')); 
                                 } 
                                 else if(session()->has('token'))
                                 {
-                                    echo base_url('/membership/').session()->get('token'); 
+                                    echo base_url('/membership/').md5(session()->get('token')); 
                                 }
                                 else
                                 {
@@ -35,7 +35,7 @@
                             {
                                 if(session()->has('token'))
                                 {
-                                    echo base_url('/membership/').session()->get('token'); 
+                                    echo base_url('/membership/').md5(session()->get('token')); 
                                 }
                                 else
                                 {
@@ -44,22 +44,22 @@
                             } 
                             
                             ?>">Pre-Sales Offer</a></li>
+                            <li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>/about-us/">About Us</a></li>
                         </ul>
                     </div>
 
                     <div class="col-lg-2 text-center">
                         <div>
-                            <a href="https://golfevolutionkelowna.ca" class="custom-logo-link" rel="home"><img src="<?= base_url()."/public"; ?>/assets/member_images/GolfEvolution-Logo-Colour.png" alt="" width="120" height="89"></a>
+                            <a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>" class="custom-logo-link" rel="home"><img src="<?= base_url()."/public"; ?>/assets/member_images/GolfEvolution-Logo-Colour.png" alt="" width="120" height="89"></a>
                         </div>         
                     </div>  
                     <div class="col-lg-5 header2">
-                        <ul>
-                            <li><a href="https://golfevolutionkelowna.ca/about-us/">About Us</a></li>
+                        <ul>                            
                             <li><a href="<?php if(session()->has('logged_user')) { echo base_url()."member_home";  }else{ echo base_url();  } ?>" 
                             class="nav-button"><img src="<?= base_url()."/public"; ?>/assets/member_images/button-logo.png" width="20" height="20">
                             <?php if(session()->has('logged_user')) { echo session()->get('logged_user_name');  }else{ ?>MEMBER ACCESS<?php  } ?></a></li>
                             <li><a href="<?php if(session()->has('logged_user')) { echo base_url()."view_cart/".md5(session()->get('logged_user'))."";  }else{ echo base_url()."view_cart/".md5(session()->get('user_token'))."";  } ?>" 
-                            class="cart-menu" title="View Cart"><img src="<?= base_url()."/public"; ?>/assets/member_images/header-cart-icon.png" width="28" height="25"/></a></li>
+                            class="cart-menu" title="View Cart"><img src="<?= base_url()."/public"; ?>/assets/member_images/header-cart-icon.png" width="22" height="22"/>My Cart</a></li>
 
                         </ul>
                     </div>          
@@ -76,7 +76,7 @@
         <div class="row">
             <div class="col-lg-12">
                 <div class="nav-main">                    
-                    <a href="https://golfevolutionkelowna.ca" rel="home"><img src="<?= base_url()."/public"; ?>/assets/member_images/GolfEvolution-Logo-Colour.png" alt="" width="100" height="74"></a>
+                    <a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>" rel="home"><img src="<?= base_url()."/public"; ?>/assets/member_images/GolfEvolution-Logo-Colour.png" alt="" width="100" height="74"></a>
                     <button class="button-menu"><i class="fa fa-bars"></i></button>
                 </div>
             </div>
@@ -90,7 +90,7 @@
         <div class="row">
             <div class="col-lg-12">
                 <ul>
-                    <li><a href="https://golfevolutionkelowna.ca/">Home <?= session()->get('token') ?></a></li>
+                    <li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>">Home <?= session()->get('token') ?></a></li>
                     <li><a href="<?php  if (isset($token)) 
                             {
                                 if ($token == '')
@@ -121,8 +121,8 @@
                                     echo base_url('membership'); 
                                 }
                             } ?>">Pre-Sales Offer</a></li>
-                    <li><a href="https://golfevolutionkelowna.ca/about-us/">About Us</a></li>
-                    <li><a href="https://golfevolutionkelowna.ca/contact-us/">Contact Us</a> </li>                    
+                    <li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>/about-us/">About Us <?php echo $_SERVER['SERVER_NAME']; ?></a></li>
+                    <li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>/contact-us/">Contact Us</a> </li>                    
                 </ul>        
             </div>
         </div>
diff --git a/app/Views/memberaccess.php b/app/Views/memberaccess.php
index e599c24..7fd7052 100644
--- a/app/Views/memberaccess.php
+++ b/app/Views/memberaccess.php
@@ -105,15 +105,15 @@
                     </tr>
                     <?php for( $i = count($credit_data) - 1; $i >= 0 ; $i--) { ?>
                        <tr>
-                       <td><?php $date = new DateTime($credit_data[$i]['created_at']);    echo $date->format('M d , Y');  ?></td>
+                       <td><?php $date = new DateTime($credit_data[$i]['created_at']);    echo $date->format('M-d-Y');  ?></td>
                        <td>
                        <?php 
-                       if($credit_data[$i]['expiring_date'] <  date('M d , Y', time())) 
+                       if($credit_data[$i]['expiring_date'] <  date('m-d-Y', time())) 
                        echo '<p>Credit Expiry</p>';
                        else
                        echo '<p>'.$credit_data[$i]['package_name'].'</p>';
                        ?>
-                        <p class="mb-0">Expiry Date : <?php $date = new DateTime($credit_data[$i]['expiring_date']);    echo $date->format('M d , Y'); ?></p>
+                        <p class="mb-0">Expiry Date : <?php $date = new DateTime($credit_data[$i]['expiring_date']);    echo $date->format('M-d-Y'); ?></p>
                         <p>Order Id : <?php echo $credit_data[$i]['order_id'] ?></p></td>
                        <?php 
                        if($credit_data[$i]['running_balance'] > 0) 
@@ -135,7 +135,7 @@
                             <div>Credits: <span><?= $no_of_credits ?></span></div>
                             </div>
                             <div class="col-lg-4">
-                            <div>Expiry Date: <span><?php $date = new DateTime($expiring_date);    echo $date->format('M d , Y'); ?></span></div>
+                            <div>Expiry Date: <span><?php $date = new DateTime($expiring_date);    echo $date->format('M-d-Y'); ?></span></div>
                             </div>
 
                 </div>
@@ -158,14 +158,14 @@
                     <?php foreach ($TransactionData as $key => $value) { ?>
                                       <tr id="<?= $key."_table-grey" ?>">
                                           <td>#<?= $value['order_id'] ?></td>
-                                          <td><?php $date = new DateTime($value['created_at']);    echo $date->format('M d , Y'); ?></td>
+                                          <td><?php $date = new DateTime($value['created_at']);    echo $date->format('M-d-Y'); ?></td>
                                           <td>$<?= json_decode($value['transaction'] , true)['payment']['amount_money']['amount']; ?></td>
                                           <td></td>
                                           <td class="down-icon" id="<?= $key."_table-grey" ?>"><div class="order-down"><i id="<?= $key."_table-grey_down-icon" ?>" class="fa fa-caret-down" aria-hidden="true"></i></div></td>
                                       </tr>
                                       <!-- <tr class="table-grey <?= $key."_table-grey" ?>">
                                           <td><?= $value['order_id'] ?></td>
-                                          <td><?php $date = new DateTime($value['created_at']);    echo $date->format('M d , Y'); ?></td>
+                                          <td><?php $date = new DateTime($value['created_at']);    echo $date->format('M-d-Y'); ?></td>
                                           <td>$<?= json_decode($value['transaction'] , true)['payment']['amount_money']['amount']; ?></td>
                                           <td><img src="<?= base_url()."/public/"; ?>assets/member_images/table-order-icon-white.png" alt=""> - </td>
                                           <td></td>
@@ -180,7 +180,7 @@
                                           <?php foreach ($value['credit_data'] as $credit_datakey => $credit_data_value) { ?>
                                             <tr class="table-grey <?= $key."_table-grey" ?>">
                                             <td><?= $credit_data_value['package_name'] ?></td>
-                                            <td><p>Pack Cost : $<?= $credit_data_value['cost'] ?></p><p>Pack Credits : <?= $credit_data_value['credit_points'] ?> Nos</p><p>Pack Expiry : <?php $date = new DateTime($credit_data_value['expiring_date']);    echo $date->format('M d , Y');  ?></p></td>
+                                            <td><p>Pack Cost : $<?= $credit_data_value['cost'] ?></p><p>Pack Credits : <?= $credit_data_value['credit_points'] ?> Nos</p><p>Pack Expiry : <?php $date = new DateTime($credit_data_value['expiring_date']);    echo $date->format('M-d-Y');  ?></p></td>
                                             <td><?= $credit_data_value['pack_count'] ?></td>
                                             <td><span>$</span><?= $credit_data_value['costSum'] ?></td>
                                             <td></td>
@@ -259,9 +259,10 @@
                 <div class="col-6 col-lg-6">
                     <label>Select your gender</label>
                     <div class="row mt-1">
-                        <div class="col-3 col-lg-3"><input type="radio" name="gender" value="male"  id="gender" <?php if($profile[0]['gender'] == 'male') { echo 'checked';} ?>><label for="male">Male</label></div>
-                        <div class="col-4 col-lg-4"><input type="radio" name="gender" value="female" id="gender"  <?php if($profile[0]['gender'] == 'female') { echo 'checked';} ?>><label for="female">Female<label> </div>
-                        <div class="col-5 col-lg-5"><input type="radio" name="gender" value="non-binary" id="gender"  <?php if($profile[0]['gender'] == 'non-binary') { echo 'checked';} ?>><label for="non-binary">Non-binary</label></div>
+                        <div class="col-6 col-lg-5"><input type="radio" name="gender" value="male"  id="gender" <?php if($profile[0]['gender'] == 'male') { echo 'checked';} ?>><label for="male">Male</label></div>
+                        <div class="col-6 col-lg-7"><input type="radio" name="gender" value="female" id="gender"  <?php if($profile[0]['gender'] == 'female') { echo 'checked';} ?>><label for="female">Female<label> </div>
+                        <div class="col-6 col-lg-5"><input type="radio" name="gender" value="non-binary" id="gender"  <?php if($profile[0]['gender'] == 'non-binary') { echo 'checked';} ?>><label for="non-binary">Non-binary</label></div>
+                        <div class="col-6 col-lg-7"><input type="radio" name="gender" value="non-binary" id="gender"  <?php if($profile[0]['gender'] == 'non-binary') { echo 'checked';} ?>><label for="non-binary">Prefer not to say</label></div>
                     </div>
                 </div>
                 <div class="col-4 col-lg-4 mb-3">
@@ -317,7 +318,7 @@
                         <span style="display:none;" id="error_op"></span>
                     </div>
                     <div class="col-6 col-lg-6"></div>
-                    <div class="col-6 col-lg-6 mb-3">
+                    <div class="col-6 col-lg-6 mb-3 show-password1">
                         <label for="new_password">New Password</label><br>
                         <span toggle="#new_password" id="toggle-password1"  class="fa fa-fw fa-eye field-icon toggle-password"></span>  
                         <input type="password" name="password" id="new_password" 
@@ -325,7 +326,16 @@
                         title="Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters" 
                         required>
                         <span id="error_np"></span>
-                        
+                        <div id="pswd_info">
+                            <h4>Password requirements</h4>
+                            <ul>
+                                <li id="letter" class="invalid">At least <strong>one letter</strong></li>
+                                <li id="capital" class="invalid">At least <strong>one capital letter</strong></li>
+                                <li id="number" class="invalid">At least <strong>one number</strong></li>
+                                <li id="length" class="invalid">Be at least <strong>8 characters</strong></li>
+                                <li id="space" class="invalid">use any one<strong> [~,!,@,#,$,%,^,&,*,-,=,.,;,']</strong></li>
+                            </ul>
+				        </div>                        
                     </div>
                     <div class="col-6 col-lg-6"></div>
                     <div class="col-6 col-lg-6 mb-3">
@@ -336,7 +346,7 @@
                     <div class="col-6 col-lg-6"></div>
 
                     <div class="col-6 col-lg-6">
-                    <div id="pass-btn" type="submit" class="custom-btn">update</div>
+                    <div id="pass-btn" type="submit" class="custom-btn">Update</div>
                         <!-- <div class="success-message" style="display:none;">Successfully Saved</div> -->
                     </div>
                     <div class="col-6 col-lg-6"></div>
@@ -356,7 +366,56 @@
                             $('.js-example-basic-single').select2();
                         });
                     </script>
-<?php include 'member_layout/footer.php' ?>  
+<?php include 'member_layout/footer.php' ?> 
+<script>
+$(document).ready(function(){
+	
+	$('#new_password').keyup(function() {
+		var pswd = $(this).val();
+		
+		//validate the length
+		if ( pswd.length < 8 ) {
+			$('#length').removeClass('valid').addClass('invalid');
+		} else {
+			$('#length').removeClass('invalid').addClass('valid');
+		}
+		
+		//validate letter
+		if ( pswd.match(/[A-z]/) ) {
+			$('#letter').removeClass('invalid').addClass('valid');
+		} else {
+			$('#letter').removeClass('valid').addClass('invalid');
+		}
+
+		//validate capital letter
+		if ( pswd.match(/[A-Z]/) ) {
+			$('#capital').removeClass('invalid').addClass('valid');
+		} else {
+			$('#capital').removeClass('valid').addClass('invalid');
+		}
+
+		//validate number
+		if ( pswd.match(/\d/) ) {
+			$('#number').removeClass('invalid').addClass('valid');
+		} else {
+			$('#number').removeClass('valid').addClass('invalid');
+		}
+		
+		//validate space
+		if ( pswd.match(/[^a-zA-Z0-9\-\/]/) ) {
+			$('#space').removeClass('invalid').addClass('valid');
+		} else {
+			$('#space').removeClass('valid').addClass('invalid');
+		}
+		
+	}).focus(function() {
+		$('#pswd_info').show();
+	}).blur(function() {
+		$('#pswd_info').hide();
+	});
+	
+});
+</script>   
 <script>
     function openCity(evt, cityName) {
   // Declare all variables
diff --git a/app/Views/membership.php b/app/Views/membership.php
index 7deb504..8cf45ef 100644
--- a/app/Views/membership.php
+++ b/app/Views/membership.php
@@ -116,9 +116,13 @@
 
         <div class="col-lg-6">
 
-            <h3 class="mb-3 heading-font">Get Credit Packs on <br/>Pre-Sales Offer</h3>
+            <h3 class="mb-3 heading-font">Credit Pack Pre Opening Offer</h3>
 
-            <p>It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.</p>
+            <p>Get more yards out of your dollar.  Purchase any of our Evo Packs before we open and receive an additional 20% worth of credits.  Your Golf Evolution Credits are our currency and you can use them for all bookings whether it is a lesson, a practice session or a game of golf with your buddies.</p>
+
+            <h5 class="credit-table-heading">How to Redeem your credits?</h5>
+            <p class="mb-4">Each Golf Evolution Credit has a Value of $30, you can redeem it to book Golf Sim play and practice, Golf coaching and Fitting sessions as per the price list mentioned below. </p>
+            <figure class="credit-table"><table><thead><tr><th>Product</th><th>Cost</th><th>Credits</th></tr></thead><tbody><tr><td>1 hr Practice / Play</td><td>$60.00</td><td>2</td></tr><tr><td>1/2 hr Practice / Play</td><td>$30.00</td><td>1</td></tr><tr><td>1 hr individual coaching</td><td>$150.00</td><td>5</td></tr><tr><td>1/2 hr individual coaching</td><td>$90.00</td><td>3</td></tr><tr><td>Single fitting (driver, irons or woods)</td><td>$120.00</td><td>4</td></tr><tr><td>2 hr full bag fitting (Driver, woods, irons, wedges)</td><td>$210.00</td><td>7</td></tr></tbody></table></figure>
 
         </div>
 
@@ -204,33 +208,18 @@
 
             <h3 class="mb-3 heading-font">How it Works</h3>
 
-            <p class="mb-5">It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.</p>
+            
 
             <div class="row work-section">
 
-                <div class="col-12 mb-4">
-
-                    <h5>Lorem Ipsum</h5>
-
-                    <p>It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.</p>
-
-                </div> 
-
-                <div class="col-12 mb-4">
-
-                    <h5>Lorem Ipsum</h5>
-
-                    <p>It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.</p>
-
-                </div>
-
-                <div class="col-12 mb-4">
-
-                    <h5>Lorem Ipsum</h5>
-
-                    <p>It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.</p>
-
-                </div>   
+            <ul>
+                <li>Purchase your credits<br/>(The more your purchase the cheaper it gets)</li>
+                <li>Credits are added to your account</li>
+                <li>Select what you want to do, play practice or take a lesson (Each option has a credit value associated to it).</li>
+                <li>Find the time and the date that suits you.</li>
+                <li>Add it to your cart</li>
+                <li>Proceed to checkout and use your credits to confirm the booking.</li>
+            </ul>  
 
             </div>
 
@@ -268,7 +257,7 @@
 
             <div class="col-lg-3">
 
-                <a href="#" class="contact-btn">Contact Us</a>
+                <a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>/contact-us/" class="contact-btn">Contact Us</a>
 
             </div> 
 
diff --git a/app/Views/myaccount.php b/app/Views/myaccount.php
index 835bc10..0ae18dc 100644
--- a/app/Views/myaccount.php
+++ b/app/Views/myaccount.php
@@ -58,7 +58,7 @@
 
                 {
 
-                    $('#already_err').html("An account with this email id already exist, please use signin to login or forgot password to reset password");
+                    $('#already_err').html("An account with this mail id already exist, please use sign in to login or forgot password to reset password");
 
                     $("#email").val('');
 
@@ -115,7 +115,7 @@
 
                         <label for="username">First Name</label>
 
-                        <input type="text" class="form-control" required parsley-type="text" name="name" placeholder="Firstname" id="username"/> 
+                        <input type="text" class="form-control" required parsley-type="text" name="name" placeholder="First Name" id="username"/> 
 
                     </div>
 
@@ -123,7 +123,7 @@
 
                         <label for="username">Last Name</label>
 
-                        <input type="text" class="form-control" required parsley-type="text" name="last_name" placeholder="Lastname" id="lastname"/> 
+                        <input type="text" class="form-control" required parsley-type="text" name="last_name" placeholder="Last Name" id="lastname"/> 
 
                     </div>
 
@@ -140,7 +140,7 @@
 
                         <label for="mobile">Mobile Number</label>
 
-                        <input type="tel" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\.*?)\..*/g, '$1');" class="form-control" data-parsley-type="number" name="mobile" placeholder="Enter your mobile number" id="mobile"/> 
+                        <input type="tel" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*?)\..*/g, '$1').replace(/^0[^.]/, '0');" class="form-control" data-parsley-type="number" name="mobile" placeholder="Enter your mobile number" id="mobile"/> 
 
                     </div>
 
@@ -228,7 +228,7 @@
 
                     <h1>Welcome Back!</h1>
 
-                    <p>If you already have an account click signin to access member area</p>
+                    <p>If you already have an account click sign in into access member area</p>
 
                     <button class="login-btn" id="signIn">Sign In</button>
 
@@ -238,7 +238,7 @@
 
                     <h1>Hello, Golfer!</h1>
 
-                    <p>If you dont't have a Golf evo account click signup to create an account</p>
+                    <p>If you dont't have a Golf evo account click sign up to create an account</p>
 
                     <button class="login-btn" id="signUp">Sign Up</button>