diff --git a/.gitignore b/.gitignore
index d2d320a4..20d1c153 100755
--- a/.gitignore
+++ b/.gitignore
@@ -86,6 +86,8 @@ writable/**/*.sqlite
 
 php_errors.log
 
+public/uploads/*
+# !public/uploads/index.html
 
 #-------------------------
 # Composer
diff --git a/app/Config/Autoload.php b/app/Config/Autoload.php
index e9ee6613..e311db51 100644
--- a/app/Config/Autoload.php
+++ b/app/Config/Autoload.php
@@ -45,6 +45,7 @@ class Autoload extends AutoloadConfig
     public $psr4 = [
         APP_NAMESPACE => APPPATH, // For custom app namespace
         'Config'      => APPPATH . 'Config',
+        'App\Libraries' => APPPATH . 'Libraries', 
     ];
 
     /**
diff --git a/app/Config/Constants.php b/app/Config/Constants.php
index 47b92f83..bae5eb9e 100644
--- a/app/Config/Constants.php
+++ b/app/Config/Constants.php
@@ -92,3 +92,13 @@ define('EVENT_PRIORITY_NORMAL', 100);
  * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_HIGH instead.
  */
 define('EVENT_PRIORITY_HIGH', 10);
+
+/**
+ * Dummy Constants For Api Integration.
+ */
+define('WPBOOK_DETAILS', 'https://reqres.in/api/users?page=2');
+define('WPBOOK_DETAILS_GET_PARAMETER', 'https://reqres.in/api/users?page=2');
+define('WPBOOK_DETAILS_GET_STRAIGHTFORWARD', 'https://reqres.in/api/users');
+define('WPBOOK_DETAILS_GET_SEGMENT', 'https://reqres.in/api/users/2');
+define('WPBOOK_DETAILS_POST', 'https://reqres.in/api/users');
+define('WPBOOK_DETAILS_PUT',  'https://reqres.in/api/users/707');
diff --git a/app/Config/Logger.php b/app/Config/Logger.php
index 568c5da6..ae803360 100644
--- a/app/Config/Logger.php
+++ b/app/Config/Logger.php
@@ -115,7 +115,7 @@ class Logger extends BaseConfig
              * By default, logs are written to WRITEPATH . 'logs/'
              * Specify a different destination here, if desired.
              */
-            'path' => '',
+            'path' => WRITEPATH . 'logs/',
         ],
 
         /*
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 6aaa781f..2dd7720b 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -60,12 +60,6 @@ $routes->get("new_bussiness/(:any)", "Business::new_bussiness/$1");
 $routes->post("insert_business/", "Business::insert_business");
 $routes->get("delete_business/(:any)", "Business::delete_business/$1");
 
-
-
-$routes->get("subscribers_list/", "Home::subscribers_list");
-$routes->get("add_subscribers/", "Home::add_subscribers");
-$routes->get("edit_subscribers/", "Home::edit_subscribers");
-
 #custome routes
 $routes->get("customer_list/", "Customer::index");
 $routes->get("new_customer/(:any)", "Customer::new_customer/$1");
@@ -75,6 +69,9 @@ $routes->get("delete_customer/(:any)", "Customer::delete_customer/$1");
 $routes->get("scheme_list/", "Scheme::index");
 $routes->get("new_scheme/(:any)", "Scheme::new_scheme/$1");
 $routes->post("insert_scheme/", "Scheme::insert_scheme");
+
+# Api integration
+$routes->get("apiintegration", "Home::apiintegration");
 /*
  * --------------------------------------------------------------------
  * Additional Routing
diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php
index 81174cc5..743c7294 100644
--- a/app/Controllers/BaseController.php
+++ b/app/Controllers/BaseController.php
@@ -59,8 +59,8 @@ abstract class BaseController extends Controller
     public function render_page($viewpage, $data){
             helper('session');
         
-            $session_uid = get_logged_user_id('user_id');
-            $session_uname = get_logged_name('user_name');
+            $session_uid = get_logged_user_id();
+            $session_uname = get_logged_name();
             if(!is_session_active()) {
                 $route = base_url()."login";
                 return redirect()->route($route);
@@ -81,7 +81,7 @@ abstract class BaseController extends Controller
             echo view('template/topbar.php', $data);
             echo view($viewpage, $data);
             echo view('template/footer.php', $data);
-            
+
         // $header = view('template/header.php', $data);
         // $topbar = view('template/topbar.php', $data);
         // $content = view($viewpage, $data);
diff --git a/app/Controllers/Books.php b/app/Controllers/Books.php
index 5cffec7f..f5ef9fb7 100755
--- a/app/Controllers/Books.php
+++ b/app/Controllers/Books.php
@@ -10,8 +10,8 @@ class Books extends BaseController
     {
         helper('session');
        if (is_session_active()) {   
-        $session_role = get_user_role('user_role');
-        $session_bid = get_business_id('business_id');
+        $session_role = get_user_role();
+        $session_bid = get_business_id();
 
         $where = ['books.isactive' => 1];
         if (!empty($session_role) && $session_role !== "sadmin") {
diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php
index 3373fde0..653315f3 100644
--- a/app/Controllers/Home.php
+++ b/app/Controllers/Home.php
@@ -11,4 +11,28 @@ class Home extends BaseController
             $this->render_page('dashboard', $data);
         
     }
+
+    ## ApiIntegration. Dummy
+    public function apiintegration() {
+        helper('apiIntegration');
+		
+		// GET - list of books
+		$response_1 = perform_http_request('GET', WPBOOK_DETAILS,false);
+		$data['books'] = $response_1;		
+		$response_2 = perform_http_request('GET', WPBOOK_DETAILS_GET_STRAIGHTFORWARD,false);
+        $data['books_ps'] = $response_2;		
+		$response_3 = perform_http_request('GET', WPBOOK_DETAILS_GET_SEGMENT,false);
+        $data['book'] = $response_3;		
+		//POST - create new book
+		$request_data = json_encode(array("name" => "Soumitra", "job" => "Blog Author", "avatar" => "https://roytuts.com/about/"));
+		$response_4 = perform_http_request('POST', WPBOOK_DETAILS_POST, $request_data);
+		$data['new_book'] = $response_4;
+		//PUT - update book
+		$request_data = json_encode(array("name" => "Soumitra", "job" => "Roy Tutorials Author", "avatar" => "https://roytuts.com/about/"));
+		$response_5 = perform_http_request('PUT', WPBOOK_DETAILS_PUT, $request_data);
+		$data['update_book'] = $response_5;
+		//View
+        // print_r($data);
+        return view('api_list', $data);
+    }
 }
diff --git a/app/Controllers/Settings.php b/app/Controllers/Settings.php
index 794cc99c..e34dd252 100755
--- a/app/Controllers/Settings.php
+++ b/app/Controllers/Settings.php
@@ -9,8 +9,8 @@ class Settings extends BaseController
     public function index()
     {
         helper('session');
-        $session_role = get_user_role('user_role');
-        $session_bid = get_business_id('business_id');
+        $session_role = get_user_role();
+        $session_bid = get_business_id();
 
         $where = ['settings.isactive' => 1];
         if (!empty($session_role) && $session_role !== "sadmin") {
@@ -47,7 +47,7 @@ class Settings extends BaseController
     public function sitesetting_synchronization()
     {
         helper('session');
-        $session_bid = get_business_id('business_id');
+        $session_bid = get_business_id();
         $session_uid = get_logged_user_id();
 
         $model = new SettingsModel();
diff --git a/app/Helpers/apiIntegration_helper.php b/app/Helpers/apiIntegration_helper.php
new file mode 100644
index 00000000..3c3e2a09
--- /dev/null
+++ b/app/Helpers/apiIntegration_helper.php
@@ -0,0 +1,36 @@
+<?php 
+
+function perform_http_request($method, $url, $data = false) {
+    $curl = curl_init();			
+
+    // $headers = array('Content-Type: application/json');
+	// curl_setopt( $curl,CURLOPT_HTTPHEADER, $headers );
+	
+    switch ($method) {
+        case "POST":
+            curl_setopt($curl, CURLOPT_POST, true);
+            if ($data) {
+                curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
+			}
+            break;
+        case "PUT":
+            curl_setopt($curl, CURLOPT_PUT, 1);
+            break;
+        default:
+            if ($data) {
+                // print_r($data);die();
+                $url = sprintf("%s?%s", $url, http_build_query((array)$data));
+			}
+    }
+
+    curl_setopt($curl, CURLOPT_URL, $url);
+    curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); //If SSL Certificate Not Available, for example, I am calling from http://localhost URL
+    // curl_setopt( $ch,CURLOPT_SSL_VERIFYPEER, true );
+    $result = curl_exec($curl);
+    curl_close($curl);
+    // print_r(json_decode($result));
+    return $result;
+}
+
+?>
\ No newline at end of file
diff --git a/app/Views/api_list.php b/app/Views/api_list.php
new file mode 100644
index 00000000..c183b4fd
--- /dev/null
+++ b/app/Views/api_list.php
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="en">
+<body>
+	<h1>Dummy API Integration</h1>
+	
+	<h3>GET - List Of Books</h3>
+	<?php
+		echo $books;
+	?>
+	
+	<h3>GET - Single Book</h3>
+	<?php
+		echo $book;
+	?>
+	
+	<h3>POST - Create New Book</h3>
+	<?php
+		echo $new_book;
+	?>
+	
+	<h3>PUT - Update Book</h3>
+	<?php
+		echo $update_book;
+	?>
+</body>
+</html>
diff --git a/app/Views/auth_logout.php b/app/Views/auth_logout.php
new file mode 100755
index 00000000..3938b9af
--- /dev/null
+++ b/app/Views/auth_logout.php
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <title>Logout | Minton - Responsive Admin Dashboard Template</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta content="A fully featured admin theme which can be used to build CRM, CMS, etc." name="description" />
+        <meta content="Coderthemes" name="author" />
+        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+        <!-- App favicon -->
+        <link rel="shortcut icon" href="../assets/images/favicon.ico">
+
+		<!-- App css -->
+		<link href="../assets/css/bootstrap.min.css" rel="stylesheet" type="text/css" id="bs-default-stylesheet" />
+		<link href="../assets/css/app.min.css" rel="stylesheet" type="text/css" id="app-default-stylesheet" />
+
+		<link href="../assets/css/bootstrap-dark.min.css" rel="stylesheet" type="text/css" id="bs-dark-stylesheet" />
+		<link href="../assets/css/app-dark.min.css" rel="stylesheet" type="text/css" id="app-dark-stylesheet" />
+
+		<!-- icons -->
+		<link href="../assets/css/icons.min.css" rel="stylesheet" type="text/css" />
+
+    </head>
+
+    <body class="loading">
+
+        <div class="account-pages mt-5 mb-5">
+            <div class="container">
+                <div class="row justify-content-center">
+                    <div class="col-md-8 col-lg-6 col-xl-5">
+                        <div class="card">
+
+                            <div class="card-body p-4">
+                                
+                                <div class="text-center w-75 m-auto">
+                                    <div class="auth-logo">
+                                        <a href="index.html" class="logo logo-dark text-center">
+                                            <span class="logo-lg">
+                                                <img src="../assets/images/logo-dark.png" alt="" height="22">
+                                            </span>
+                                        </a>
+                    
+                                        <a href="index.html" class="logo logo-light text-center">
+                                            <span class="logo-lg">
+                                                <img src="../assets/images/logo-light.png" alt="" height="22">
+                                            </span>
+                                        </a>
+                                    </div>
+                                </div>
+
+                                <div class="text-center">
+                                    <div class="mt-4">
+                                        <div class="logout-checkmark">
+                                            <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 161.2 161.2" enable-background="new 0 0 161.2 161.2" xml:space="preserve">
+                                            <path class="logout-path" fill="none" stroke="#d1dee4" stroke-miterlimit="10" d="M425.9,52.1L425.9,52.1c-2.2-2.6-6-2.6-8.3-0.1l-42.7,46.2l-14.3-16.4
+                                                c-2.3-2.7-6.2-2.7-8.6-0.1c-1.9,2.1-2,5.6-0.1,7.7l17.6,20.3c0.2,0.3,0.4,0.6,0.6,0.9c1.8,2,4.4,2.5,6.6,1.4c0.7-0.3,1.4-0.8,2-1.5
+                                                c0.3-0.3,0.5-0.6,0.7-0.9l46.3-50.1C427.7,57.5,427.7,54.2,425.9,52.1z"></path>
+                                            <circle class="logout-path" fill="none" stroke="#1abc9c" stroke-width="4" stroke-miterlimit="10" cx="80.6" cy="80.6" r="62.1"></circle>
+                                            <polyline class="logout-path" fill="none" stroke="#1abc9c" stroke-width="6" stroke-linecap="round" stroke-miterlimit="10" points="113,52.8
+                                                74.1,108.4 48.2,86.4 "></polyline>
+
+                                            <circle class="logout-spin" fill="none" stroke="#d1dee4" stroke-width="4" stroke-miterlimit="10" stroke-dasharray="12.2175,12.2175" cx="80.6" cy="80.6" r="73.9"></circle>
+
+                                        </svg>
+
+                                    </div>
+                                    </div>
+
+                                    <h3>See you again !</h3>
+
+                                    <p class="text-muted"> You are now successfully sign out. </p>
+                                </div>
+
+
+                            </div> <!-- end card-body -->
+                        </div>
+                        <!-- end card -->
+
+                        <div class="row mt-3">
+                            <div class="col-12 text-center">
+                                <p class="text-muted">Back to <a href="authenticate" class="text-primary font-weight-medium ml-1">Sign In</a></p>
+                            </div> <!-- end col -->
+                        </div>
+                        <!-- end row -->
+
+                    </div> <!-- end col -->
+                </div>
+                <!-- end row -->
+            </div>
+            <!-- end container -->
+        </div>
+        <!-- end page -->
+
+        <footer class="footer footer-alt">
+            <script>document.write(new Date().getFullYear())</script> &copy; Minton theme by <a href="" class="text-dark">Coderthemes</a> 
+        </footer>
+
+        <!-- Vendor js -->
+        <script src="../assets/js/vendor.min.js"></script>
+
+        <!-- App js -->
+        <script src="../assets/js/app.min.js"></script>
+        
+    </body>
+</html>
\ No newline at end of file
diff --git a/app/Views/auth_signup.php b/app/Views/auth_signup.php
new file mode 100755
index 00000000..74b12fa1
--- /dev/null
+++ b/app/Views/auth_signup.php
@@ -0,0 +1,188 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <title>Auth Pages | Create Account | Sign In 2 | Minton - Responsive Admin Dashboard Template</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta content="A fully featured admin theme which can be used to build CRM, CMS, etc." name="description" />
+        <meta content="Coderthemes" name="author" />
+        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+        <!-- App favicon -->
+        <link rel="shortcut icon" href="./assets/images/favicon.ico">
+
+		<!-- App css -->
+		<link href="./assets/css/bootstrap.min.css" rel="stylesheet" type="text/css" id="bs-default-stylesheet" />
+		<link href="./assets/css/app.min.css" rel="stylesheet" type="text/css" id="app-default-stylesheet" />
+
+		<link href="./assets/css/bootstrap-dark.min.css" rel="stylesheet" type="text/css" id="bs-dark-stylesheet" />
+		<link href="./assets/css/app-dark.min.css" rel="stylesheet" type="text/css" id="app-dark-stylesheet" />
+
+		<!-- icons -->
+		<link href="./assets/css/icons.min.css" rel="stylesheet" type="text/css" />
+
+    </head>
+
+    <body class="loading auth-fluid-pages pb-0">
+
+        <div class="auth-fluid">
+            <!-- Auth fluid right content -->
+            <div class="auth-fluid-right">
+                <div class="auth-user-testimonial">
+                    <h3 class="mb-3 text-white">Very elegant & impressive!</h3>
+                    <p class="lead font-weight-normal"><i class="mdi mdi-format-quote-open"></i> I've been using this theme for a while and I must say that whenever I am looking for a design - I refer to this theme for specifics & implementation. With wide arrays of components, designs, charts - I would highly recommend this theme for anyone using it for dashboard or project management usage.. <i class="mdi mdi-format-quote-close"></i>
+                    </p>
+                    <h5 class="text-white">
+                        - Admin User
+                    </h5>
+                </div> <!-- end auth-user-testimonial-->
+            </div>
+            <!-- end Auth fluid right content -->
+
+            <!--Auth fluid left content -->
+            <div class="auth-fluid-form-box">
+                <div class="align-items-center d-flex h-100">
+                    <div class="card-body">
+
+                        <!-- Logo -->
+                        <div class="auth-brand text-center text-lg-left">
+                            <div class="auth-logo">
+                                <a href="index.html" class="logo logo-dark text-center">
+                                    <span class="logo-lg">
+                                        <img src="./assets/images/logo-dark.png" alt="" height="22">
+                                    </span>
+                                </a>
+            
+                                <a href="index.html" class="logo logo-light text-center">
+                                    <span class="logo-lg">
+                                        <img src="./assets/images/logo-light.png" alt="" height="22">
+                                    </span>
+                                </a>
+                            </div>
+                        </div>
+
+                        <ul class="nav nav-tabs nav-bordered">
+                            <li class="nav-item">
+                                <a href="#tab-login" data-toggle="tab" aria-expanded="false" class="nav-link active">
+                                    Log In
+                                </a>
+                            </li>
+                            <li class="nav-item">
+                                <a href="#tab-signup" data-toggle="tab" aria-expanded="true" class="nav-link">
+                                    Sign Up
+                                </a>
+                            </li>
+                        </ul>
+                        <div class="tab-content">
+                            <div class="tab-pane show active" id="tab-login">
+                                <p class="text-muted mb-3">Enter your email address and password to access admin panel.</p>
+
+                                <!-- form -->
+                                <form action="#">
+                                    <div class="form-group">
+                                        <label for="emailaddress">Email address</label>
+                                        <input class="form-control" type="email" id="emailaddress" required="" placeholder="Enter your email">
+                                    </div>
+                                    <div class="form-group">
+                                        <a href="auth-recoverpw-2.html" class="text-muted float-right"><small>Forgot your password?</small></a>
+                                        <label for="password">Password</label>
+                                        <input class="form-control" type="password" required="" id="password" placeholder="Enter your password">
+                                    </div>
+                                    <div class="form-group mb-3">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="checkbox-signin">
+                                            <label class="custom-control-label" for="checkbox-signin">Remember me</label>
+                                        </div>
+                                    </div>
+                                    <div class="form-group mb-0 text-center">
+                                        <button class="btn btn-primary btn-block" type="submit">Log In </button>
+                                    </div>
+                                    <!-- social-->
+                                    <div class="text-center mt-4">
+                                        <h5 class="mt-3 text-muted">Sign in with</h5>
+                                        <ul class="social-list list-inline mt-3">
+                                            <li class="list-inline-item">
+                                                <a href="javascript: void(0);" class="social-list-item border-purple text-purple"><i class="mdi mdi-facebook"></i></a>
+                                            </li>
+                                            <li class="list-inline-item">
+                                                <a href="javascript: void(0);" class="social-list-item border-danger text-danger"><i class="mdi mdi-google"></i></a>
+                                            </li>
+                                            <li class="list-inline-item">
+                                                <a href="javascript: void(0);" class="social-list-item border-info text-info"><i class="mdi mdi-twitter"></i></a>
+                                            </li>
+                                            <li class="list-inline-item">
+                                                <a href="javascript: void(0);" class="social-list-item border-secondary text-secondary"><i class="mdi mdi-github"></i></a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </form>
+                                <!-- end form-->
+                            </div>
+                            <div class="tab-pane" id="tab-signup">
+                                <p class="text-muted mb-3">Don't have an account? Create your own account, it takes less than a minute</p>
+
+                                <!-- form -->
+                                <form action="#">
+                                    <div class="form-group">
+                                        <label for="fullname">Full Name</label>
+                                        <input class="form-control" type="text" id="fullname" placeholder="Enter your name" required>
+                                    </div>
+                                    <div class="form-group">
+                                        <label for="emailaddress">Email address</label>
+                                        <input class="form-control" type="email" id="emailaddress" required placeholder="Enter your email">
+                                    </div>
+                                    <div class="form-group">
+                                        <label for="password">Password</label>
+                                        <input class="form-control" type="password" required id="password" placeholder="Enter your password">
+                                    </div>
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="checkbox-signup">
+                                            <label class="custom-control-label" for="checkbox-signup">I accept <a href="javascript: void(0);" class="text-dark">Terms and Conditions</a></label>
+                                        </div>
+                                    </div>
+                                    <div class="form-group mb-0 text-center">
+                                        <button class="btn btn-primary waves-effect waves-light btn-block" type="submit"> Sign Up </button>
+                                    </div>
+                                    <!-- social-->
+                                    <div class="text-center mt-4">
+                                        <h5 class="mt-3 text-muted">Sign Up using</h5>
+                                        <ul class="social-list list-inline mt-3 mb-0">
+                                            <li class="list-inline-item">
+                                                <a href="javascript: void(0);" class="social-list-item border-purple text-purple"><i class="mdi mdi-facebook"></i></a>
+                                            </li>
+                                            <li class="list-inline-item">
+                                                <a href="javascript: void(0);" class="social-list-item border-danger text-danger"><i class="mdi mdi-google"></i></a>
+                                            </li>
+                                            <li class="list-inline-item">
+                                                <a href="javascript: void(0);" class="social-list-item border-info text-info"><i class="mdi mdi-twitter"></i></a>
+                                            </li>
+                                            <li class="list-inline-item">
+                                                <a href="javascript: void(0);" class="social-list-item border-secondary text-secondary"><i class="mdi mdi-github"></i></a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </form>
+                                <!-- end form-->
+                            </div>
+                        </div>
+
+                        <!-- Footer-->
+                        <footer class="footer footer-alt">
+                            <p class="text-muted"><script>document.write(new Date().getFullYear())</script> &copy; Minton theme by <a href="javascript: void(0);" class="text-dark">Coderthemes</a> </p>
+                        </footer>
+
+                    </div> <!-- end .card-body -->
+                </div> <!-- end .align-items-center.d-flex.h-100-->
+            </div>
+            <!-- end auth-fluid-form-box-->
+        </div>
+        <!-- end auth-fluid-->
+
+        <!-- Vendor js -->
+        <script src="./assets/js/vendor.min.js"></script>
+
+        <!-- App js -->
+        <script src="./assets/js/app.min.js"></script>
+        
+    </body>
+</html>
\ No newline at end of file
diff --git a/app/Views/book_list.php b/app/Views/book_list.php
index 52213954..2ba4871a 100644
--- a/app/Views/book_list.php
+++ b/app/Views/book_list.php
@@ -4,6 +4,7 @@
             <div class="card-body">
                 <div class="float-right">
                     <a href="<?= base_url()."book_page/0"; ?>" class="btn btn-primary waves-effect"> <span> <i class="mdi mdi-book-plus"></i></span> Add New </a>
+                    <a href="<?= base_url()."apiintegration"; ?>" class="btn btn-primary waves-effect"> <span> <i class="mdi mdi-gesture-swipe-down"></i></span> Api integration </a>
                 </div>
                 <br>
                 <h4 class="header-title mb-3"><?= $page_name; ?></h4>
diff --git a/app/Views/user_form.php b/app/Views/user_form.php
index 97214ea5..5ba8b552 100644
--- a/app/Views/user_form.php
+++ b/app/Views/user_form.php
@@ -38,6 +38,7 @@
                         </div>
                         <div class="form-row">
                             <div class="form-group col-md-4">
+<<<<<<< HEAD
                                 <label for="first_name" class="col-form-label">First Name<span
                                         class="text-danger">*</span></label>
                                 <input type="text" class="form-control" id="first_name" name="first_name"
@@ -183,9 +184,120 @@
                                 </a>
                                 <!-- <button id="cancelButton" type="button" class="btn btn-secondary waves-effect">Cancel</button> -->
                             </div>
+=======
+                                <label for="first_name" class="col-form-label">First Name<span class="text-danger">*</span></label>
+                                <input type="text" class="form-control" id="first_name" name="first_name" placeholder="First Name" value="<?= isset($details['first_name']) ? $details['first_name'] : '' ?>" required />
+                                <div class="invalid-feedback"> Please provide. </div>
+                            </div>
+                            <div class="form-group col-md-4">
+                                <label for="last_name" class="col-form-label">Last Name<span class="text-danger">*</span></label>
+                                <input type="text" class="form-control" id="last_name" name="last_name" placeholder="Last Name" value="<?= isset($details['last_name']) ? $details['last_name'] : '' ?>" required />
+                                <div class="invalid-feedback"> Please provide. </div>
+                            </div>
+                            <div class="form-group col-md-4">
+                                <label for="date_of_birth" class="col-form-label">Date Of Birth<span class="text-danger">*</span></label>
+                                <input type="date" class="form-control" id="date_of_birth" name="date_of_birth" placeholder="Date Of birth (format : DD/MM/YYYY)" required data-toggle="input-mask" data-mask-format="00/00/0000" value="<?= isset($details['date_of_birth']) ? $details['date_of_birth'] : '' ?>" />
+                                <div class="invalid-feedback"> Please provide. </div>
+                            </div>
+                        </div>
+                        <div class="form-row">
+                            <div class="form-group col-md-4">
+                                <label for="mobile_no" class="col-form-label">Mobile Number<span class="text-danger">*</span></label>
+                                <input type="number" class="form-control" id="mobile_no" name="mobile_no" placeholder="Mobile Number (Enter only numbers)" required data-parsley-type="number" value="<?= isset($details['mobile_no']) ? $details['mobile_no'] : '' ?>" />
+                                <div class="invalid-feedback"> Please provide. </div>
+                            </div>
+                            <div class="form-group col-md-4">
+                                <label for="gender" class="col-form-label">Gender</label>
+                                <input type="text" class="form-control" id="gender" name="gender" placeholder="Gender" value="<?= isset($details['gender']) ? $details['gender'] : '' ?>" />
+                            </div>
+                            <div class="form-group col-md-4">
+                                <label for="role" class="col-form-label">Role<span class="text-danger">*</span></label>
+                                <input type="text" class="form-control" id="role" name="role" placeholder="Role" required value="<?= isset($details['role']) ? $details['role'] : '' ?>" />
+                                <div class="invalid-feedback"> Please provide. </div>
+                            </div>
+                        </div>
+                        <div class="form-row">
+                            <?php if (!empty($details['profile_picture'])) { ?>
+                                <div class="form-group col-md-12">
+                                    <label for="profile_picture" class="col-form-label">Current Business Logo</label>
+                                    <img src="<?= base_url('public/uploads/' . $details['profile_picture']) ?>" alt="Business Logo" class="preview-image" />
+                                </div>
+                            <?php } ?>
+                        </div>
+                        <div class="form-row">
+                            <div class="form-group col-md-12">
+                                <label for="profile_picture" class="col-form-label">Profile Picture<span class="text-danger">*</span></label>
+                                <!-- <input type="text" class="form-control" id="profile_picture" name="profile_picture" placeholder="Profile picture Name" readonly value="<?= isset($details['profile_picture']) ? $details['profile_picture'] : '' ?>" /> -->
+                                <input type="file" name="profile_picture" placeholder="hidden Field for profile picture" readonly value="<?= isset($details['profile_picture']) ? $details['profile_picture'] : '' ?>" />
+
+                            </div>
+                        </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-12">
+                                    <label for="address" class="col-form-label">Address<span class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="address" name="address" placeholder="Address (eg : 1234 Main St)" required value="<?= isset($details['address']) ? $details['address'] : '' ?>" />
+                                    <div class="invalid-feedback"> Please provide. </div>
+                                </div>
+                            </div>
+                            <div class="form-row">
+                                <div class="form-group col-md-6">
+                                    <label for="city" class="col-form-label">City<span class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="city" name="city" placeholder="City" required value="<?= isset($details['city']) ? $details['city'] : '' ?>" />
+                                    <div class="invalid-feedback"> Please provide. </div>
+                                </div>
+                                <div class="form-group col-md-4">
+                                    <label for="state" class="col-form-label">State<span class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="state" name="state" placeholder="State" required value="<?= isset($details['state']) ? $details['state'] : '' ?>" />
+                                    <div class="invalid-feedback"> Please provide. </div>
+                                </div>
+                                <div class="form-group col-md-2">
+                                    <label for="postal_code" class="col-form-label">Postal Code<span class="text-danger">*</span></label>
+                                    <input type="text" class="form-control" id="postal_code" name="postal_code" placeholder="Postal Code (PIN)" required value="<?= isset($details['postal_code']) ? $details['postal_code'] : '' ?>" />
+                                    <div class="invalid-feedback"> Please provide. </div>
+                                </div>
+                            </div>
+                            <?php if ($loggedin_person_role === 'sadmin') {  ?>
+                                <div class="form-row">
+                                    <div class="form-group col-md-6">
+                                        <label for="business_id" class="col-form-label">Buiness<span class="text-danger">*</span></label>
+                                        <select id="business_id" name="business_id" class="form-control">
+                                            <option value=null>Choose your Buiness</option>
+                                            <?php foreach ($business_details as $value) { ?>
+                                                <option value="<?php echo $value['business_id']; ?>" <?php if (isset($details['business_id']) && ($details['business_id'] === $value['business_id'])) echo "selected"; ?>><?php echo $value['title']; ?></option>
+                                            <?php } ?>
+                                        </select>
+                                    </div>
+                                </div>
+                            <?php } else {  ?>
+                                <input type="hidden" id="business_id" name="business_id" placeholder="hidden for business id" value="<?= isset($details['business_id']) ? $details['business_id'] : '' ?>" />
+                            <?php } ?>
+                            <input type="hidden" id="user_id" name="user_id" placeholder="hidden for user id" value="<?= isset($details['user_id']) ? $details['user_id'] : '' ?>" />
+                            <?php if (!empty($details)) { ?>
+                                <div class="form-group text-right m-b-0 checkbox checkbox-purple">
+                                    <input type="checkbox" id="isactive" name="isactive" class="form-control" <?= isset($details) && $details['isactive'] == 1 ? 'checked' : '' ?>>
+                                    <label for="isactive"> Is Active</label>
+                                </div>
+                                <br>
+                            <?php } ?>
+                            <div class="form-group text-right m-b-0">
+                                <button class="btn btn-success waves-effect waves-light mr-1" type="submit">
+                                    Submit
+                                </button>
+                                <button type="reset" class="btn btn-primary waves-effect mr-1">
+                                    Reset
+                                </button>
+                                <a href="<?= base_url() . "user_list"; ?>" class="btn btn-secondary waves-effect">Cancel </a>
+                                <!-- <button id="cancelButton" type="button" class="btn btn-secondary waves-effect">Cancel</button> -->
+                            </div>
+>>>>>>> ee8a2ba619d361191bbd1f7670242697a47ecea7
                         </div>
                 </form>
             </div> <!-- end card-body-->
         </div> <!-- end card-->
     </div> <!-- end col-->
+<<<<<<< HEAD
 </div><!-- end row -->
+=======
+</div>
+<!-- end row -->
+>>>>>>> ee8a2ba619d361191bbd1f7670242697a47ecea7
diff --git a/public/uploads/1693203788_5939497d95031acba789.png b/public/uploads/1693203788_5939497d95031acba789.png
deleted file mode 100644
index 804bcfd5..00000000
Binary files a/public/uploads/1693203788_5939497d95031acba789.png and /dev/null differ
diff --git a/public/uploads/1693204048_927cac1f0d5a7277dbe0.png b/public/uploads/1693204048_927cac1f0d5a7277dbe0.png
deleted file mode 100644
index 32a11680..00000000
Binary files a/public/uploads/1693204048_927cac1f0d5a7277dbe0.png and /dev/null differ
diff --git a/public/uploads/1693204080_cfd45864443e51f665c9.png b/public/uploads/1693204080_cfd45864443e51f665c9.png
deleted file mode 100644
index 804bcfd5..00000000
Binary files a/public/uploads/1693204080_cfd45864443e51f665c9.png and /dev/null differ
diff --git a/public/uploads/1693215642_9587976d52c1854d0419.png b/public/uploads/1693215642_9587976d52c1854d0419.png
deleted file mode 100644
index be3745d8..00000000
Binary files a/public/uploads/1693215642_9587976d52c1854d0419.png and /dev/null differ
diff --git a/public/uploads/2023-05-19 (1).png b/public/uploads/2023-05-19 (1).png
deleted file mode 100644
index 51eb9327..00000000
Binary files a/public/uploads/2023-05-19 (1).png and /dev/null differ
diff --git a/public/uploads/2023-05-19 (1)_1.png b/public/uploads/2023-05-19 (1)_1.png
deleted file mode 100644
index 51eb9327..00000000
Binary files a/public/uploads/2023-05-19 (1)_1.png and /dev/null differ
diff --git a/public/uploads/2023-05-19 (1)_2.png b/public/uploads/2023-05-19 (1)_2.png
deleted file mode 100644
index 51eb9327..00000000
Binary files a/public/uploads/2023-05-19 (1)_2.png and /dev/null differ
diff --git a/public/uploads/2023-05-19 (1)_3.png b/public/uploads/2023-05-19 (1)_3.png
deleted file mode 100644
index 51eb9327..00000000
Binary files a/public/uploads/2023-05-19 (1)_3.png and /dev/null differ
diff --git a/public/uploads/2023-05-19 (1)_4.png b/public/uploads/2023-05-19 (1)_4.png
deleted file mode 100644
index 51eb9327..00000000
Binary files a/public/uploads/2023-05-19 (1)_4.png and /dev/null differ
diff --git a/public/uploads/2023-06-17.png b/public/uploads/2023-06-17.png
deleted file mode 100644
index 32a11680..00000000
Binary files a/public/uploads/2023-06-17.png and /dev/null differ
diff --git a/public/uploads/2023-06-17_1.png b/public/uploads/2023-06-17_1.png
deleted file mode 100644
index 32a11680..00000000
Binary files a/public/uploads/2023-06-17_1.png and /dev/null differ
diff --git a/public/uploads/2023-06-17_10.png b/public/uploads/2023-06-17_10.png
deleted file mode 100644
index 32a11680..00000000
Binary files a/public/uploads/2023-06-17_10.png and /dev/null differ
diff --git a/public/uploads/2023-06-17_11.png b/public/uploads/2023-06-17_11.png
deleted file mode 100644
index 32a11680..00000000
Binary files a/public/uploads/2023-06-17_11.png and /dev/null differ
diff --git a/public/uploads/2023-06-17_12.png b/public/uploads/2023-06-17_12.png
deleted file mode 100644
index 32a11680..00000000
Binary files a/public/uploads/2023-06-17_12.png and /dev/null differ
diff --git a/public/uploads/2023-06-17_13.png b/public/uploads/2023-06-17_13.png
deleted file mode 100644
index 32a11680..00000000
Binary files a/public/uploads/2023-06-17_13.png and /dev/null differ
diff --git a/public/uploads/2023-06-17_2.png b/public/uploads/2023-06-17_2.png
deleted file mode 100644
index 32a11680..00000000
Binary files a/public/uploads/2023-06-17_2.png and /dev/null differ
diff --git a/public/uploads/2023-06-17_3.png b/public/uploads/2023-06-17_3.png
deleted file mode 100644
index 32a11680..00000000
Binary files a/public/uploads/2023-06-17_3.png and /dev/null differ
diff --git a/public/uploads/2023-06-17_4.png b/public/uploads/2023-06-17_4.png
deleted file mode 100644
index 32a11680..00000000
Binary files a/public/uploads/2023-06-17_4.png and /dev/null differ
diff --git a/public/uploads/2023-06-17_5.png b/public/uploads/2023-06-17_5.png
deleted file mode 100644
index 32a11680..00000000
Binary files a/public/uploads/2023-06-17_5.png and /dev/null differ
diff --git a/public/uploads/2023-06-17_6.png b/public/uploads/2023-06-17_6.png
deleted file mode 100644
index 32a11680..00000000
Binary files a/public/uploads/2023-06-17_6.png and /dev/null differ
diff --git a/public/uploads/2023-06-17_7.png b/public/uploads/2023-06-17_7.png
deleted file mode 100644
index 32a11680..00000000
Binary files a/public/uploads/2023-06-17_7.png and /dev/null differ
diff --git a/public/uploads/2023-06-17_8.png b/public/uploads/2023-06-17_8.png
deleted file mode 100644
index 32a11680..00000000
Binary files a/public/uploads/2023-06-17_8.png and /dev/null differ
diff --git a/public/uploads/2023-06-17_9.png b/public/uploads/2023-06-17_9.png
deleted file mode 100644
index 32a11680..00000000
Binary files a/public/uploads/2023-06-17_9.png and /dev/null differ
diff --git a/public/uploads/2023-07-01.png b/public/uploads/2023-07-01.png
deleted file mode 100644
index 2537bc08..00000000
Binary files a/public/uploads/2023-07-01.png and /dev/null differ
diff --git a/public/uploads/2023-07-01_1.png b/public/uploads/2023-07-01_1.png
deleted file mode 100644
index 2537bc08..00000000
Binary files a/public/uploads/2023-07-01_1.png and /dev/null differ
diff --git a/public/uploads/2023-07-01_2.png b/public/uploads/2023-07-01_2.png
deleted file mode 100644
index 2537bc08..00000000
Binary files a/public/uploads/2023-07-01_2.png and /dev/null differ
diff --git a/public/uploads/2023-07-01_3.png b/public/uploads/2023-07-01_3.png
deleted file mode 100644
index 2537bc08..00000000
Binary files a/public/uploads/2023-07-01_3.png and /dev/null differ
diff --git a/public/uploads/2023-07-01_4.png b/public/uploads/2023-07-01_4.png
deleted file mode 100644
index 2537bc08..00000000
Binary files a/public/uploads/2023-07-01_4.png and /dev/null differ
diff --git a/public/uploads/Screenshot 2023-07-19 170426.png b/public/uploads/Screenshot 2023-07-19 170426.png
deleted file mode 100644
index 2b1ed5ff..00000000
Binary files a/public/uploads/Screenshot 2023-07-19 170426.png and /dev/null differ
diff --git a/public/uploads/Screenshot 2023-07-19 170426_1.png b/public/uploads/Screenshot 2023-07-19 170426_1.png
deleted file mode 100644
index 2b1ed5ff..00000000
Binary files a/public/uploads/Screenshot 2023-07-19 170426_1.png and /dev/null differ
diff --git a/public/uploads/Screenshot 2023-07-19 170426_2.png b/public/uploads/Screenshot 2023-07-19 170426_2.png
deleted file mode 100644
index 2b1ed5ff..00000000
Binary files a/public/uploads/Screenshot 2023-07-19 170426_2.png and /dev/null differ
diff --git a/public/uploads/Screenshot 2023-07-19 170426_3.png b/public/uploads/Screenshot 2023-07-19 170426_3.png
deleted file mode 100644
index 2b1ed5ff..00000000
Binary files a/public/uploads/Screenshot 2023-07-19 170426_3.png and /dev/null differ
diff --git a/public/uploads/Screenshot 2023-07-19 170426_4.png b/public/uploads/Screenshot 2023-07-19 170426_4.png
deleted file mode 100644
index 2b1ed5ff..00000000
Binary files a/public/uploads/Screenshot 2023-07-19 170426_4.png and /dev/null differ
diff --git a/public/uploads/Screenshot 2023-07-19 170426_5.png b/public/uploads/Screenshot 2023-07-19 170426_5.png
deleted file mode 100644
index 2b1ed5ff..00000000
Binary files a/public/uploads/Screenshot 2023-07-19 170426_5.png and /dev/null differ
diff --git a/public/uploads/Screenshot 2023-07-20 170514.png b/public/uploads/Screenshot 2023-07-20 170514.png
deleted file mode 100644
index d79a0464..00000000
Binary files a/public/uploads/Screenshot 2023-07-20 170514.png and /dev/null differ
diff --git a/public/uploads/Screenshot 2023-07-21 100328.png b/public/uploads/Screenshot 2023-07-21 100328.png
deleted file mode 100644
index 44a42fb3..00000000
Binary files a/public/uploads/Screenshot 2023-07-21 100328.png and /dev/null differ
diff --git a/public/uploads/Screenshot 2023-07-21 115438.png b/public/uploads/Screenshot 2023-07-21 115438.png
deleted file mode 100644
index 98663831..00000000
Binary files a/public/uploads/Screenshot 2023-07-21 115438.png and /dev/null differ
diff --git a/public/uploads/Screenshot 2023-07-21 115438_1.png b/public/uploads/Screenshot 2023-07-21 115438_1.png
deleted file mode 100644
index 98663831..00000000
Binary files a/public/uploads/Screenshot 2023-07-21 115438_1.png and /dev/null differ
diff --git a/public/uploads/Screenshot 2023-08-03 152103.png b/public/uploads/Screenshot 2023-08-03 152103.png
deleted file mode 100644
index 017d2d61..00000000
Binary files a/public/uploads/Screenshot 2023-08-03 152103.png and /dev/null differ
diff --git a/public/uploads/Screenshot 2023-08-18 125558.png b/public/uploads/Screenshot 2023-08-18 125558.png
deleted file mode 100644
index a82f8baa..00000000
Binary files a/public/uploads/Screenshot 2023-08-18 125558.png and /dev/null differ
diff --git a/public/uploads/Screenshot 2023-08-18 125558_1.png b/public/uploads/Screenshot 2023-08-18 125558_1.png
deleted file mode 100644
index a82f8baa..00000000
Binary files a/public/uploads/Screenshot 2023-08-18 125558_1.png and /dev/null differ
diff --git a/public/uploads/Screenshot 2023-08-28 143009.png b/public/uploads/Screenshot 2023-08-28 143009.png
deleted file mode 100644
index fa93c3c9..00000000
Binary files a/public/uploads/Screenshot 2023-08-28 143009.png and /dev/null differ
diff --git a/public/uploads/Screenshot 2023-08-28 143009_1.png b/public/uploads/Screenshot 2023-08-28 143009_1.png
deleted file mode 100644
index fa93c3c9..00000000
Binary files a/public/uploads/Screenshot 2023-08-28 143009_1.png and /dev/null differ
diff --git a/writable/uploads/20230821/index.html b/writable/uploads/20230821/index.html
deleted file mode 100644
index e69de29b..00000000