From 6af4f303d5068d943a4208ba280d1b232a067555 Mon Sep 17 00:00:00 2001
From: amalk <amal.techware@gmail.com>
Date: Tue, 16 Apr 2019 10:47:04 +0530
Subject: [PATCH] Amal 16-04-2019|10:46

---
 application/config/database.php              |   2 +-
 application/controllers/Handlerequest.php    |  27 +++++++++++----------------
 application/models/Handle_model.php          |  75 ++++++++++++++++++++++++---------------------------------------------------
 application/models/Validation_model.php      |  14 --------------
 application/views/Brand/create.php           | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------
 application/views/Brand/list.php             | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------
 application/views/Category/create.php        | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------
 application/views/Category/list.php          | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------
 application/views/Settings/viewSettings.php  | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------
 application/views/Shopper/create.php         | 216 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------
 application/views/Subcategory/create.php     | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------
 application/views/Subcategory/list.php       | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------
 application/views/customer/create.php        | 251 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------
 application/views/customer/list.php          | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------
 application/views/dashboard/dashboard.php    | 225 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 application/views/template/footer_script.php |   1 +
 application/views/template/header_script.php |   2 ++
 assets/css/style.css                         | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
 assets/images/favicon.png                    | Bin 8184 -> 0 bytes
 assets/images/logo.png                       | Bin 16282 -> 0 bytes
 assets/images/logo2.png                      | Bin 8184 -> 0 bytes
 assets/js/custom-script.js                   |   3 +++
 assets/uploads/post_117303.jpg               | Bin 97872 -> 0 bytes
 assets/uploads/post_152628.jpg               | Bin 97872 -> 0 bytes
 assets/uploads/post_284202.jpg               | Bin 97872 -> 0 bytes
 assets/uploads/post_358788.jpg               | Bin 97872 -> 0 bytes
 assets/uploads/post_386237.jpg               | Bin 97872 -> 0 bytes
 assets/uploads/post_436884.jpg               | Bin 61718 -> 0 bytes
 assets/uploads/post_443283.jpg               | Bin 61718 -> 0 bytes
 assets/uploads/post_453763.jpg               | Bin 97872 -> 0 bytes
 assets/uploads/post_456510.jpg               | Bin 66554 -> 0 bytes
 assets/uploads/post_566324.jpg               | Bin 66554 -> 0 bytes
 assets/uploads/post_634025.jpg               | Bin 66554 -> 0 bytes
 assets/uploads/post_656415.jpg               | Bin 66554 -> 0 bytes
 assets/uploads/post_710502.jpg               | Bin 61718 -> 0 bytes
 assets/uploads/post_756280.jpg               | Bin 97872 -> 0 bytes
 assets/uploads/post_762515.jpg               | Bin 66554 -> 0 bytes
 assets/uploads/post_786712.jpg               | Bin 61718 -> 0 bytes
 assets/uploads/post_867305.jpg               | Bin 61718 -> 0 bytes
 assets/uploads/post_899909.jpg               | Bin 66554 -> 0 bytes
 assets/uploads/post_908814.jpg               | Bin 66554 -> 0 bytes
 assets/uploads/post_963824.jpg               | Bin 61718 -> 0 bytes
 assets/uploads/post_991947.jpg               | Bin 61718 -> 0 bytes
 uploads/services/1555391456_Access_Logo.png  | Bin 0 -> 21311 bytes
 44 files changed, 1205 insertions(+), 1127 deletions(-)
 delete mode 100644 assets/uploads/post_117303.jpg
 delete mode 100644 assets/uploads/post_152628.jpg
 delete mode 100644 assets/uploads/post_284202.jpg
 delete mode 100644 assets/uploads/post_358788.jpg
 delete mode 100644 assets/uploads/post_386237.jpg
 delete mode 100644 assets/uploads/post_436884.jpg
 delete mode 100644 assets/uploads/post_443283.jpg
 delete mode 100644 assets/uploads/post_453763.jpg
 delete mode 100644 assets/uploads/post_456510.jpg
 delete mode 100644 assets/uploads/post_566324.jpg
 delete mode 100644 assets/uploads/post_634025.jpg
 delete mode 100644 assets/uploads/post_656415.jpg
 delete mode 100644 assets/uploads/post_710502.jpg
 delete mode 100644 assets/uploads/post_756280.jpg
 delete mode 100644 assets/uploads/post_762515.jpg
 delete mode 100644 assets/uploads/post_786712.jpg
 delete mode 100644 assets/uploads/post_867305.jpg
 delete mode 100644 assets/uploads/post_899909.jpg
 delete mode 100644 assets/uploads/post_908814.jpg
 delete mode 100644 assets/uploads/post_963824.jpg
 delete mode 100644 assets/uploads/post_991947.jpg
 create mode 100644 uploads/services/1555391456_Access_Logo.png

diff --git a/application/config/database.php b/application/config/database.php
index 51dafbc..67cf9d1 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -78,7 +78,7 @@ $db['default'] = array(
 	'hostname' => 'localhost',
 	'username' => 'root',
 	'password' => '',
-	'database' => 'adarsh_access',
+	'database' => 'access',
 	'dbdriver' => 'mysqli',
 	'dbprefix' => '',
 	'pconnect' => FALSE,
diff --git a/application/controllers/Handlerequest.php b/application/controllers/Handlerequest.php
index 0497e2a..11a4147 100644
--- a/application/controllers/Handlerequest.php
+++ b/application/controllers/Handlerequest.php
@@ -54,23 +54,18 @@ class Handlerequest extends CI_Controller {
 		if($this->validate_headers() == true){
 			if(isset($_POST)) {
 				$data = $_POST;
-				$res = $this->validation_model->check('wishPost', $data);
-				if($res['state'] == 1) {
-					$this->errorResponse($res['response']['code'], $res['response']['message']);
-				} else {
-					if(isset($_FILES['media'])){
-						$images = $this->handle_model->image_upload($_FILES);
-						$data = $_POST;
-						$data = $this->handle_model->wish_post($data, $images);
-						if($data['status'] == 1){
-							$data = $this->encrypted(json_encode($data['data']));
-							$this->response($data);
-						} else {
-							$this->errorResponse($data['code'],$data['message']);
-						}
+				if(isset($_FILES)){
+					$images = $this->handle_model->image_upload($_FILES);
+					$data = $_POST;
+					$data = $this->handle_model->wish_post($data, $images);
+					if($data['status'] == 1){
+						$data = $this->encrypted(json_encode($data['data']));
+						$this->response($data);
 					} else {
-						$this->errorResponse('023','Wish media is missing');
+						$this->errorResponse($data['code'],$data['message']);
 					}
+				} else {
+					$this->errorResponse('023','Wish media is missing');
 				}				
 			} else {
 				$this->errorResponse('002','Invalid request');
@@ -81,7 +76,7 @@ class Handlerequest extends CI_Controller {
 	}
 
 	public function validate_headers() {
-		if(isset($this->headers['x-api-key']) &&  $this->headers['x-api-key'] == $this->secret_key) {
+		if($this->headers['x-api-key'] == $this->secret_key) {
 			return true;
 		} else {
 			return false;
diff --git a/application/models/Handle_model.php b/application/models/Handle_model.php
index c330e5f..20ab9a2 100644
--- a/application/models/Handle_model.php
+++ b/application/models/Handle_model.php
@@ -13,8 +13,6 @@ class Handle_model extends CI_Model {
 			$response = $query->row();
 			if($response->user_type == 1) {
 				$data = $this->db->where('id',$response->user_id)->get('customer')->row();
-				$data->sessionId = $this->generate_session($data->id, $data->user_type);
-				unset($data->id);
 				$res = array('status'=>1,'message'=>"Login successfully done",'data'=>$data);
 			} else if($response->user_type == 2) {
 				$data = $this->db->where('id',$response->user_id)->get('shopper')->row();
@@ -28,13 +26,6 @@ class Handle_model extends CI_Model {
 		return $res;
 	}
 
-	function generate_session($user_id, $type) {
-		$str=rand(); 
-		$session_id = md5($str); 
-		$this->db->insert('user_auth', array('user_id'=>$user_id, 'type'=>$type, 'session_id'=>$session_id));
-		return $session_id;
-	}
-
 	function registration($data) {
 		$dup = $this->db->query("SELECT customer.email_id, customer.phone_no FROM `users` LEFT JOIN customer ON users.user_type = customer.user_type WHERE (users.username = '".$data['email_id']."' OR customer.phone_no = '".$data['phone_no']."') GROUP BY customer.id");
 		if($dup->num_rows() > 0) {
@@ -68,8 +59,6 @@ class Handle_model extends CI_Model {
 				$insert_id = $this->db->insert_id();
 				$this->db->where('user_id',$insert_id)->where('user_type',1)->update('users',array('password'=>md5($data['pin']), 'status'=>1));
 				$user = $this->db->where('id', $insert_id)->get('customer')->row();
-				$data->sessionId = $this->generate_session($data->id, $data->user_type);
-				unset($data->id);
 				$res = array('status'=>1, 'message'=>'Registration Successfully', 'data'=>$user);
 			} else {
 				$res = array('status'=>0,'message'=>'Something Went Wrong! Registration Failed','code'=>'012');
@@ -164,47 +153,31 @@ class Handle_model extends CI_Model {
 	}
 
 	function wish_post($data, $images) {
-		$sessionId = $this->session_retrive($data['sessionId']);
-		if($sessionId == 0){
-			$res = array('status'=>0,'message'=>'Invalid session Id','code'=>'032');
-		} else {
-			$wish = array(
-				'cust_id'=>$sessionId,
-				'cat_id'=>$data['cat_id'],
-				'sub_cat_id'=>$data['sub_cat_id'],
-				'description'=>$data['description'],
-				'prod_name'=>$data['prod_name'],
-				'post_date'=>date('Y-m-d')
-			);
-			$rs = $this->db->insert('wish', $wish);
-			if($rs) {
-				$insert_id = $this->db->insert_id();
-				$data_image = array();
-				foreach($images as $image) {
-					$image_array = array(
-						'wish_id'=>$insert_id,
-						'url'=>$image
-					);
-					array_push($data_image,$image_array);
-				}
-				$this->db->insert_batch('wish_media', $data_image);
-				$res = array('status'=>1, 'message'=>'Wish posted successfully', 'data'=>array('wish_id'=>$insert_id));
-			} else {
-				$res = array('status'=>0,'message'=>'Something Went Wrong! Wish post Failed','code'=>'012');
+		$wish = array(
+			'cust_id'=>$data['cust_id'],
+			'cat_id'=>$data['cat_id'],
+			'sub_cat_id'=>$data['sub_cat_id'],
+			'description'=>$data['description'],
+			'prod_name'=>$data['prod_name'],
+			'post_date'=>date('Y-m-d')
+		);
+		$rs = $this->db->insert('wish', $wish);
+		if($rs) {
+			$insert_id = $this->db->insert_id();
+			$data_image = array();
+			foreach($images as $image) {
+				$image_array = array(
+					'wish_id'=>$insert_id,
+					'url'=>$image
+				);
+				array_push($data_image,$image_array);
 			}
-		}
-		
-		return $res;
-	}
-
-	function session_retrive($sessionId) {
-		$response = $this->db->where('session_id',$sessionId)->get('user_auth');
-		if($response->num_rows() > 0) {
-			$row = $response->row();
-			return $row->user_id;
+			$this->db->insert_batch('wish_media', $data_image);
+			$res = array('status'=>1, 'message'=>'Wish posted successfully', 'data'=>array('wish_id'=>$insert_id));
 		} else {
-			return 0;
+			$res = array('status'=>0,'message'=>'Something Went Wrong! Wish post Failed','code'=>'012');
 		}
+		return $res;
 	}
 
 	function wish_list($data) {
@@ -222,8 +195,8 @@ class Handle_model extends CI_Model {
 			$state = 1;
 		}
 
-		if(isset($data['sub_cat_id'])) {
-			$this->db->where('wish.sub_cat_id',$data['sub_cat_id']);
+		if(isset($data['cat_id'])) {
+			$this->db->where('wish.cat_id',$data['cat_id']);
 			$state = 1;
 		}
 
diff --git a/application/models/Validation_model.php b/application/models/Validation_model.php
index 4045187..2866bd2 100644
--- a/application/models/Validation_model.php
+++ b/application/models/Validation_model.php
@@ -39,20 +39,6 @@ class Validation_model extends CI_Model {
 			'sub_categories'=>array(),
 			'get_country'=>array(),
 			'wish_list'=>array(),
-			'wishPost'=>array(
-					'sessionId'=>array('required'=>array('code'=>'027', 'message'=>'session id is null or empty')
-										),
-							'cat_id'=>array('required'=>array('code'=>'028', 'message'=>'Category id is missing')
-								        ),
-							'sub_cat_id'=>array('required'=>array('code'=>'029', 'message'=>'Sub category id is missing')
-									),
-							'prod_name'=>array('event_id'=>array('required'=>array('code'=>'030', 'message'=>'Product name is missing')
-										)
-									),
-							'description'=>array('event_id'=>array('required'=>array('code'=>'031', 'message'=>'Product description is missing')
-									)
-								)
-			),
 			'forgot'=> array('email_id'=>array('required'=>array('code'=>'ER02', 'message'=>'Email id is null or empty'),
 											  'email'=>array('code'=>'ER03', 'message'=>'Invalid Email id')
 										)
diff --git a/application/views/Brand/create.php b/application/views/Brand/create.php
index c830757..3c1a6f9 100644
--- a/application/views/Brand/create.php
+++ b/application/views/Brand/create.php
@@ -1,19 +1,6 @@
-<style type="text/css">
-    
-    .catagory_image_div{
-        width: 60px;
-        height:60px;
-        border-radius: 50%;
-        background: #a8a8a8;
-    }
-    .catagory_image_div img{
-        width: 100%;
-        height:100%;
-        border-radius: 50%;
-        object-fit: cover;
-        object-position: center;
-    }
-</style>
+
+<!-- PAGE-INDEX-STARTS -->
+
 <div class="breadcrumbs">
     <div class="breadcrumbs-inner">
         <div class="row m-0">
@@ -28,8 +15,7 @@
                 <div class="page-header float-right">
                     <div class="page-title">
                         <ol class="breadcrumb text-right">
-                            <li><a href="<?= base_url() ?>">Dashboard
-</a></li>
+                            <li><a href="<?= base_url() ?>">Dashboard</a></li>
                             <li><a ><?= $menu ?></a></li>
                             <li class="active"><?= $smenu ?></li>
                         </ol>
@@ -39,83 +25,76 @@
         </div>
     </div>
 </div>
+
+<!-- PAGE-INDEX-ENDS -->
+
+<!-- PAGE-CONTENT-STARTS -->
+
 <div class="content">
    <div class="animated fadeIn">
       <div class="row">
          <div class="col-lg-12">
             <?php 
-        $url = (!isset($brand_id)||empty($brand_id))
-                  ?'Brand/create_brand':'Brand/edit_brand/'.$brand_id;
-
-        if($this->session->flashdata('message')) { 
-          $flashdata = $this->session->flashdata('message'); ?>
-          <div class="alert alert-<?= $flashdata['class'] ?>">
-            <button class="close" data-dismiss="alert" type="button">×</button>
-            <?= $flashdata['message'] ?>
-          </div>
-        <?php } ?>
-        <form role="form" action="<?= base_url($url) ?>" method="post" 
-              class="validate" data-parsley-validate="" enctype="multipart/form-data">
-            <div class="card">
-                          <div class="card-header">
-                            <strong><?= $pDescription ?></strong>
+            $url = (!isset($brand_id)||empty($brand_id))
+            ?'Brand/create_brand':'Brand/edit_brand/'.$brand_id;
+            if($this->session->flashdata('message')) { 
+            $flashdata = $this->session->flashdata('message'); ?>
+            <div class="alert alert-<?= $flashdata['class'] ?>">
+              <button class="close" data-dismiss="alert" type="button">×</button>
+              <?= $flashdata['message'] ?>
+            </div>
+            <?php } ?>
+            <form role="form" action="<?= base_url($url) ?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
+              <div class="card">
+                  <div class="card-header">
+                    <strong><?= $pDescription ?></strong>
+                  </div>
+                  <div class="card-body card-block">
+                    <div class="form-group">
+                      <div class="row">
+                        <div class="col-md-6">
+                          <label for="nf-email" class=" form-control-label">Brand Name</label>
+                          <input type="text" id="nf-brand" name="brand_name" placeholder="Enter Brand Name" class="form-control required" value="<?= (isset($brandData->brand_name))?$brandData->brand_name:'' ?>" >
+                        </div>
+                        <div class="col-md-6">
+                            <label for="nf-email" class=" form-control-label">Brand Name (Arabic)</label>
+                            <input type="text" id="nf-brand" name="brand_name_arab" placeholder="Enter Brand Name In Arabic" class="form-control required" value="<?= (isset($brandData->brand_name_arab))?$brandData->brand_name_arab:'' ?>" >
                         </div>
-                        <div class="card-body card-block">
-                            
-                                <div class="form-group">
-                                  <div class="row">
-                                    <div class="col-md-6">
-                                      <label for="nf-email" class=" form-control-label">Brand Name</label>
-                                  <input type="text" id="nf-brand" name="brand_name" placeholder="Enter Brand Name" class="form-control required" value="<?= (isset($brandData->brand_name))?$brandData->brand_name:'' ?>" >
-                                    </div>
-                                    <div class="col-md-6">
-                                      <label for="nf-email" class=" form-control-label">Brand Name (Arabic)</label>
-                                  <input type="text" id="nf-brand" name="brand_name_arab" placeholder="Enter Brand Name In Arabic" class="form-control required" value="<?= (isset($brandData->brand_name_arab))?$brandData->brand_name_arab:'' ?>" >
-                                    </div>
-                                  </div>
-                                  <br>
-                                  <div class="row">
-                                    <div class="col-md-12">
-                                        <label for="nf-password" class=" form-control-label">Category Image</label>
-                                    </div>
-                                </div>
-                               <div class="row">
-                                    <div class="col-md-12">
-                                      <div class="col-md-12" style="padding-bottom:10px;">
-                    <div class="col-md-3">
-                      <img id="image_id_1" src="<?= (isset($brandData->brand_image))?base_url($brandData->brand_image):'' ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="75" width="75" />
+                      </div>
                     </div>
-                    <div class="col-md-12" style="padding-top: 25px;">
-                      <input name="brand" type="file" accept="image/*" onchange="setImg(this,'image_id_1');" class="form-control"/>
+                    <div class="form-group">
+                      <div class="row">
+                        <div class="col-md-12">
+                          <label for="nf-password" class=" form-control-label">Category Image</label>
+                        </div>
+                      </div>
                     </div>
-                                      </div>
-                                    </div>
-                                </div>
-                               
-                           
-                                
-                                    </div>
-                     
-                                 
-                                  
-                              </div>
-                              <button type="submit" class="btn btn-primary btn-sm">
-                                <i class="fa fa-dot-circle-o"></i> Submit
-                            </button>
-                               </div>
-                                </div>
-
-                                
-                                
-                        
-                            
-                            </form>
-                          
-                        
+                    <div class="form-group">
+                      <div class="row">
+                        <div class="col-md-12">
+                            <img id="image_id_1" src="<?= (isset($brandData->brand_image))?base_url($brandData->brand_image):'' ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="75" width="75" />
+                              <input name="brand" type="file" accept="image/*" onchange="setImg(this,'image_id_1');" class="form-control"/>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="form-group">
+                      <div class="row">
+                        <div class="col-md-12">
+                          <button type="submit" class="btn btn-primary">
+                            <i class="fa fa-dot-circle-o"></i> Submit
+                          </button>
+                        </div>
                     </div>
-         </div>
+                  </div>  
+                </div> 
+              </div>
+          </form>
       </div>
-   </div>
+    </div>
+  </div>
 </div>
+
+<!-- PAGE-CONTENT-ENDS -->
+
         
         
\ No newline at end of file
diff --git a/application/views/Brand/list.php b/application/views/Brand/list.php
index e201187..1d51ba3 100644
--- a/application/views/Brand/list.php
+++ b/application/views/Brand/list.php
@@ -1,37 +1,20 @@
 
 
-
-<style type="text/css">
-    
-    .catagory_image_div{
-        width: 50px;
-        height:50px;
-        border-radius: 50%;
-        background: #a8a8a8;
-    }
-    .catagory_image_div img{
-        width: 100%;
-        height:100%;
-        border-radius: 50%;
-        object-fit: cover;
-        object-position: center;
-    }
-</style>
-
+<!-- PAGE-INDEX-STARTS -->
 
 <div class="breadcrumbs">
     <div class="breadcrumbs-inner">
         <?php
-if($this->session->flashdata('message')) {
-  $message = $this->session->flashdata('message');
-  ?>
-<div class="alert alert-<?php echo $message['class']; ?>">
-<button class="close" data-dismiss="alert" type="button">×</button>
-<?php echo $message['message']; ?>
-</div>
-<?php
-}
-?>
+        if($this->session->flashdata('message')) {
+        $message = $this->session->flashdata('message');
+        ?>
+        <div class="alert alert-<?php echo $message['class']; ?>">
+            <button class="close" data-dismiss="alert" type="button">×</button>
+            <?php echo $message['message']; ?>
+        </div>
+        <?php
+        }
+        ?>
         <div class="row m-0">
             <div class="col-sm-4">
                 <div class="page-header float-left">
@@ -44,8 +27,7 @@ if($this->session->flashdata('message')) {
                 <div class="page-header float-right">
                     <div class="page-title">
                         <ol class="breadcrumb text-right">
-                             <li><a href="<?= base_url() ?>">Dashboard
-</a></li>
+                            <li><a href="<?= base_url() ?>">Dashboard</a></li>
                             <li><a ><?= $menu ?></a></li>
                            <!--  <li class="active"><?= $smenu ?></li> -->
                         </ol>
@@ -55,69 +37,67 @@ if($this->session->flashdata('message')) {
         </div>
     </div>
 </div>
-<div class="content">
-            <div class="animated fadeIn">
-                <div class="row">
-
-                    <div class="col-md-12">
-                        <div class="card">
-                            <div class="card-header">
-                                <strong class="card-title"><?= $pDescription ?></strong>
-                            </div>
-                            <div class="card-body">
-                                <table id="bootstrap-data-table" class="table table-striped table-bordered">
-                                    <thead>
-                                        <tr>
-                                            <th>No</th>
-                                            <th>Name</th>
-                                            <th>Name Arabic</th>
-                                            <th>Image</th>
-                                            <th>Action</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                       <?php
-                if(!empty($brandData)){
-                  foreach($brandData as $key =>  $brand) { ?> 
-                                        <tr>
-                                            <td><?php echo $key+1;?></td>
-                                            <td><?= $brand->brand_name ?></td>
-                                            <td><?= $brand->brand_name_arab ?></td>
-                                            <td>
-                                            <div class="catagory_image_div">
-                               <img src="<?php echo base_url(); ?><?= $brand->brand_image ?> "  />                     
 
-                                                </div>
-                                            </td>
-                                            <td><a class="btn btn-info btn-sm" href="<?= base_url('Brand/edit/'.encode_param($brand->id))?>">
-                                     <i class="glyphicon glyphicon-edit icon-white"></i>
-                                               Edit
-                                                 </a>
-                                          <a class="btn btn-sm btn-danger" 
-href="<?= base_url('Brand/delete/'.encode_param($brand->id))?>"
+<!-- PAGE-INDEX-ENDS -->
 
+<!-- PAGE-CONTENT-STARTS -->
 
-onClick="return doconfirm()">
-<i class="fa fa-fw fa-trash"></i>Delete
-</a>
-                                         </td>
-                                        </tr>
-                                       <?php }} ?> 
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
+<div class="content">
+    <div class="animated fadeIn">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card">
+                    <div class="card-header">
+                        <strong class="card-title"><?= $pDescription ?></strong>
+                    </div>
+                    <div class="card-body">
+                        <table id="bootstrap-data-table" class="table table-striped table-bordered">
+                            <thead>
+                                <tr>
+                                    <th>No</th>
+                                    <th>Name</th>
+                                    <th>Name Arabic</th>
+                                    <th>Image</th>
+                                    <th>Action</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php
+                                if(!empty($brandData)){
+                                foreach($brandData as $key =>  $brand) { ?> 
+                                <tr>
+                                    <td><?php echo $key+1;?></td>
+                                    <td><?= $brand->brand_name ?></td>
+                                    <td><?= $brand->brand_name_arab ?></td>
+                                    <td>
+                                        <img class="avatar_rounded" src="<?php echo base_url(); ?><?= $brand->brand_image ?> "  />             
+                                    </td>
+                                    <td>
+                                        <a class="btn btn-info btn-sm" href="<?= base_url('Brand/edit/'.encode_param($brand->id))?>">
+                                            <i class="fa fa-fw fa-pencil"></i>
+                                               Edit
+                                        </a>
+                                        <a class="btn btn-danger btn-sm" href="<?= base_url('Brand/delete/'.encode_param($brand->id))?>"
+                                            onClick="return doconfirm()">
+                                            <i class="fa fa-fw fa-trash"></i>Delete
+                                        </a>
+                                    </td>
+                                </tr>
+                                <?php }} ?> 
+                            </tbody>
+                        </table>
                     </div>
-
-
                 </div>
-            </div><!-- .animated -->
-        </div><!-- .content -->
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- PAGE-CONTENT-ENDS -->
         
-        <script type="text/javascript">
-            
-function doconfirm(){
-action = confirm("Are you sure to delete permanently?");
-if(action != true) return false;
-}
-        </script>
\ No newline at end of file
+    <script type="text/javascript">     
+        function doconfirm(){
+        action = confirm("Are you sure to delete permanently?");
+        if(action != true) return false;
+        }
+    </script>
\ No newline at end of file
diff --git a/application/views/Category/create.php b/application/views/Category/create.php
index d04daea..6588bd0 100644
--- a/application/views/Category/create.php
+++ b/application/views/Category/create.php
@@ -1,19 +1,6 @@
-<style type="text/css">
-    .catagory_image_div {
-        width: 60px;
-        height: 60px;
-        border-radius: 50%;
-        background: #a8a8a8;
-    }
-    
-    .catagory_image_div img {
-        width: 100%;
-        height: 100%;
-        border-radius: 50%;
-        object-fit: cover;
-        object-position: center;
-    }
-</style>
+
+<!-- PAGE-INDEX-STARTS -->
+
 <div class="breadcrumbs">
     <div class="breadcrumbs-inner">
         <div class="row m-0">
@@ -28,13 +15,8 @@
                 <div class="page-header float-right">
                     <div class="page-title">
                         <ol class="breadcrumb text-right">
-                            <li><a href="<?= base_url() ?>">Dashboard
-</a></li>
-                            <li>
-                                <a>
-                                    <?= $menu ?>
-                                </a>
-                            </li>
+                            <li><a href="<?= base_url() ?>">Dashboard</a></li>
+                            <li><a><?= $menu ?></a></li>
                             <li class="active">
                                 <?= $smenu ?>
                             </li>
@@ -46,76 +28,72 @@
     </div>
 </div>
 
+<!-- PAGE-INDEX-ENDS -->
 
-
+<!-- PAGE-CONTENT-STARTS -->
 
 <div class="content">
     <div class="animated fadeIn">
         <div class="row">
             <div class="col-lg-12">
                 <?php 
-        $url = (!isset($category_id)||empty($category_id))
-                  ?'Category/create_category':'Category/edit_category/'.$category_id;
-
-        if($this->session->flashdata('message')) { 
-          $flashdata = $this->session->flashdata('message'); ?>
-                    <div class="alert alert-<?= $flashdata['class'] ?>">
-                        <button class="close" data-dismiss="alert" type="button">×</button>
-                        <?= $flashdata['message'] ?>
-                    </div>
-                    <?php } ?>
-                      <form role="form" action="<?= base_url($url) ?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
-                        <div class="card">
-                            <div class="card-header">
-                                <strong><?= $pDescription ?></strong>
-                            </div>
-                           
-                            <div class="card-body card-block">
-                                    <div class="form-group">
-                                        <div class="row">
-                                            <div class="col-md-6">
-                                                <label for="nf-email" class=" form-control-label">Category Name</label>
+                $url = (!isset($category_id)||empty($category_id))
+                ?'Category/create_category':'Category/edit_category/'.$category_id;
+                if($this->session->flashdata('message')) { 
+                $flashdata = $this->session->flashdata('message'); ?>
+                <div class="alert alert-<?= $flashdata['class'] ?>">
+                    <button class="close" data-dismiss="alert" type="button">×</button>
+                    <?= $flashdata['message'] ?>
+                </div>
+                <?php } ?>
+                <form role="form" action="<?= base_url($url) ?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
+                    <div class="card">
+                        <div class="card-header">
+                            <strong><?= $pDescription ?></strong>
+                        </div>
+                        <div class="card-body card-block">
+                            <div class="form-group">
+                                <div class="row">
+                                    <div class="col-md-6">
+                                        <label for="nf-email" class=" form-control-label">Category Name</label>
                                         <input type="text" id="nf-brand" name="cat_name" placeholder="Enter Brand Name" class="form-control required" value="<?= (isset($categoryData->cat_name))?$categoryData->cat_name:'' ?>">
-                                            </div>
-                                            <div class="col-md-6">
-                                                <label for="nf-email" class=" form-control-label">Category Name (Arabic)</label>
+                                    </div>
+                                    <div class="col-md-6">
+                                        <label for="nf-email" class=" form-control-label">Category Name (Arabic)</label>
                                         <input type="text" id="nf-brand" name="cat_name_arab" placeholder="Enter Brand Name" class="form-control required" value="<?= (isset($categoryData->cat_name_arab))?$categoryData->cat_name_arab:'' ?>">
-                                            </div>
-                                        </div>
-                                        <br>
-                                        <div class="row">
-                                <div class="col-md-12">
-                                    <label for="nf-password" class=" form-control-label">Category Image</label>
+                                    </div>
                                 </div>
                             </div>
-
-                         
-                                <br>
+                            <div class="form-group">
                                 <div class="row">
                                     <div class="col-md-12">
-                                      <div class="col-md-12" style="padding-bottom:10px;">
-                    <div class="col-md-3">
-                      <img id="image_id_1" src="<?= (isset($categoryData->profile_photo))?base_url($categoryData->profile_photo):'' ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="75" width="75" />
-                    </div>
-                    <div class="col-md-12" style="padding-top: 25px;">
-                      <input name="category" type="file" accept="image/*" onchange="setImg(this,'image_id_1');" class="form-control"/>
-                    </div>
-                                      </div>
+                                        <label for="nf-password" class=" form-control-label">Category Image</label>
                                     </div>
                                 </div>
-                               
-                           
-                                
+                            </div>
+                            <div class="form-group">
+                                <div class="row">
+                                    <div class="col-md-12">
+                                      <img id="image_id_1" src="<?= (isset($categoryData->profile_photo))?base_url($categoryData->profile_photo):'' ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="75" width="75" />
+                                      <input name="category" type="file" accept="image/*" onchange="setImg(this,'image_id_1');" class="form-control"/>
                                     </div>
-                                    <button type="submit" class="btn btn-primary">
-                                <i class="fa fa-dot-circle-o"></i> Submit
-                            </button>
+                                </div>
                             </div>
-                        </div>
-                         </form>
-
-                        
-            </div>
+                            <div class="form-group">
+                                <div class="row">
+                                    <div class="col-md-12">
+                                        <button type="submit" class="btn btn-primary">
+                                            <i class="fa fa-dot-circle-o"></i> Submit
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>       
+                    </div>
+                </form>
+            </div>        
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+
+<!-- PAGE-CONTENT-ENDS -->
\ No newline at end of file
diff --git a/application/views/Category/list.php b/application/views/Category/list.php
index 18209ca..11cebb9 100644
--- a/application/views/Category/list.php
+++ b/application/views/Category/list.php
@@ -1,37 +1,19 @@
 
-
-
-<style type="text/css">
-    
-    .catagory_image_div{
-        width: 50px;
-        height:50px;
-        border-radius: 50%;
-        background: #a8a8a8;
-    }
-    .catagory_image_div img{
-        width: 100%;
-        height:100%;
-        border-radius: 50%;
-        object-fit: cover;
-        object-position: center;
-    }
-</style>
-
+<!-- PAGE-INDEX-STARTS -->
 
 <div class="breadcrumbs">
     <div class="breadcrumbs-inner">
         <?php
-if($this->session->flashdata('message')) {
-  $message = $this->session->flashdata('message');
-  ?>
-<div class="alert alert-<?php echo $message['class']; ?>">
-<button class="close" data-dismiss="alert" type="button">×</button>
-<?php echo $message['message']; ?>
-</div>
-<?php
-}
-?>
+        if($this->session->flashdata('message')) {
+        $message = $this->session->flashdata('message');
+         ?>
+        <div class="alert alert-<?php echo $message['class']; ?>">
+            <button class="close" data-dismiss="alert" type="button">×</button>
+            <?php echo $message['message']; ?>
+        </div>
+        <?php
+        }
+        ?>
         <div class="row m-0">
             <div class="col-sm-4">
                 <div class="page-header float-left">
@@ -44,10 +26,8 @@ if($this->session->flashdata('message')) {
                 <div class="page-header float-right">
                     <div class="page-title">
                         <ol class="breadcrumb text-right">
-                             <li><a href="<?= base_url() ?>">Dashboard
-</a></li>
+                             <li><a href="<?= base_url() ?>">Dashboard</a></li>
                             <li><a ><?= $menu ?></a></li>
-                            <!-- <li class="active"><?= $smenu ?></li> -->
                         </ol>
                     </div>
                 </div>
@@ -55,70 +35,68 @@ if($this->session->flashdata('message')) {
         </div>
     </div>
 </div>
-<div class="content">
-            <div class="animated fadeIn">
-                <div class="row">
 
-                    <div class="col-md-12">
-                        <div class="card">
-                            <div class="card-header">
-                                <strong class="card-title"><?= $pDescription ?></strong>
-                            </div>
-                            <div class="card-body">
-                                <table id="bootstrap-data-table" class="table table-striped table-bordered">
-                                    <thead>
-                                        <tr>
-                                            <th>No</th>
-                                            <th>Name</th>
-                                            <th>Name Arabic</th>
-                                            <th>Image</th>
-                                            <th>Action</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                       <?php
-                if(!empty($categoryData)){
-                  foreach($categoryData as $key =>  $category) { ?> 
-                                        <tr>
-                                            <td><?php echo $key+1;?></td>
-                                            <td><?= $category->cat_name ?></td>
-                                            <td><?= $category->cat_name_arab ?></td>
-                                        
-                                            <td>
-                                            <div class="catagory_image_div">
-                               <img src="<?php echo base_url(); ?><?= $category->cat_image ?> "  />                     
-
-                                                </div>
-                                            </td>
-                                            <td><a class="btn btn-info btn-sm" href="<?= base_url('Category/edit/'.encode_param($category->id))?>">
-                                     <i class="glyphicon glyphicon-edit icon-white"></i>
-                                               Edit
-                                                 </a>
-                                          <a class="btn btn-sm btn-danger" 
-href="<?= base_url('Category/delete/'.encode_param($category->id))?>"
+<!-- PAGE-INDEX-ENDS -->
 
+<!-- PAGE-CONTENT-STARTS -->
 
-onClick="return doconfirm()">
-<i class="fa fa-fw fa-trash"></i>Delete
-</a>
+<div class="content">
+    <div class="animated fadeIn">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card">
+                    <div class="card-header">
+                        <strong class="card-title"><?= $pDescription ?></strong>
+                    </div>
+                    <div class="card-body">
+                        <table id="bootstrap-data-table" class="table table-striped table-bordered">
+                            <thead>
+                                <tr>
+                                    <th>No</th>
+                                    <th>Name</th>
+                                    <th>Name Arabic</th>
+                                    <th>Image</th>
+                                    <th>Action</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php
+                                if(!empty($categoryData)){
+                                foreach($categoryData as $key =>  $category) { ?> 
+                                    <tr>
+                                        <td><?php echo $key+1;?></td>
+                                        <td><?= $category->cat_name ?></td>
+                                        <td><?= $category->cat_name_arab ?></td>
+                                        <td>
+                                            <div class="catagory_image_div ">
+                                                <img class="avatar_rounded" src="<?php echo base_url(); ?><?= $category->cat_image ?> "  />                     
+                                            </div>
+                                        </td>
+                                        <td>
+                                            <a class="btn btn-info btn-sm" href="<?= base_url('Category/edit/'.encode_param($category->id))?>">
+                                                 <i class="fa fa-fw fa-pencil"></i>
+                                               Edit
+                                            </a>
+                                            <a class="btn btn-sm btn-danger" href="<?= base_url('Category/delete/'.encode_param($category->id))?>" onClick="return doconfirm()">
+                                                <i class="fa fa-fw fa-trash"></i>Delete
+                                            </a>
                                          </td>
-                                        </tr>
-                                       <?php }} ?> 
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
+                                    </tr>
+                                    <?php }} ?> 
+                            </tbody>
+                        </table>
                     </div>
-
-
                 </div>
-            </div><!-- .animated -->
-        </div><!-- .content -->
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- PAGE-CONTENT-ENDS -->
         
-        <script type="text/javascript">
-            
-function doconfirm(){
-action = confirm("Are you sure to delete permanently?");
-if(action != true) return false;
-}
-        </script>
\ No newline at end of file
+<script type="text/javascript">       
+    function doconfirm(){
+    action = confirm("Are you sure to delete permanently?");
+    if(action != true) return false;
+    }
+</script>
\ No newline at end of file
diff --git a/application/views/Settings/viewSettings.php b/application/views/Settings/viewSettings.php
index 23ee848..7280db9 100644
--- a/application/views/Settings/viewSettings.php
+++ b/application/views/Settings/viewSettings.php
@@ -1,19 +1,6 @@
-<style type="text/css">
-    
-    .catagory_image_div{
-        width: 60px;
-        height:60px;
-        border-radius: 50%;
-        background: #a8a8a8;
-    }
-    .catagory_image_div img{
-        width: 100%;
-        height:100%;
-        border-radius: 50%;
-        object-fit: cover;
-        object-position: center;
-    }
-</style>
+
+<!-- PAGE-INDEX-STARTS -->
+
 <div class="breadcrumbs">
     <div class="breadcrumbs-inner">
         <div class="row m-0">
@@ -28,8 +15,7 @@
                 <div class="page-header float-right">
                     <div class="page-title">
                         <ol class="breadcrumb text-right">
-                            <li><a href="<?= base_url() ?>">Dashboard
-</a></li>
+                            <li><a href="<?= base_url() ?>">Dashboard</a></li>
                             <li><a ><?= $menu ?></a></li>
                             <li class="active"><?= $smenu ?></li>
                         </ol>
@@ -39,100 +25,108 @@
         </div>
     </div>
 </div>
+
+<!-- PAGE-INDEX-ENDS -->
+
+<!-- PAGE-CONTENT-STARTS -->
+
 <div class="content">
    <div class="animated fadeIn">
       <div class="row">
          <div class="col-lg-12">
             <?php 
-        $url = (!isset($subcat_id)||empty($subcat_id))
-                  ?'Sub_category/create_Subcategory':'Sub_category/edit_Subcategory/'.$subcat_id;
-
-        if($this->session->flashdata('message')) { 
-          $flashdata = $this->session->flashdata('message'); ?>
-          <div class="alert alert-<?= $flashdata['class'] ?>">
-            <button class="close" data-dismiss="alert" type="button">×</button>
-            <?= $flashdata['message'] ?>
+            $url = (!isset($subcat_id)||empty($subcat_id))
+            ?'Sub_category/create_Subcategory':'Sub_category/edit_Subcategory/'.$subcat_id;
+            if($this->session->flashdata('message')) { 
+            $flashdata = $this->session->flashdata('message'); ?>
+            <div class="alert alert-<?= $flashdata['class'] ?>">
+              <button class="close" data-dismiss="alert" type="button">×</button>
+              <?= $flashdata['message'] ?>
           </div>
-        <?php } ?>
-        <form method="post" class="validate" role="form" action="<?= base_url().'Settings/change_settings'?>" enctype="multipart/form-data" data-parsley-validate="">
+          <?php } ?>
+          <form method="post" class="validate" role="form" action="<?= base_url().'Settings/change_settings'?>" enctype="multipart/form-data" data-parsley-validate="">
             <div class="card">
-                          <div class="card-header">
-                            <strong><?= $pDescription ?></strong>
-                        </div>
-                        <div class="card-body card-block">
-                             
-
-
-  <div class="form-group">
-    <div class="row">
-      <div class="col-md-6">
-        <label>Site Title</label>
-              <input type="text" name="title" class="form-control required" placeholder="Enter Site Title" value="<?= $data['title'] ?>">
-      </div>
-      <div class="col-md-6">
-        <label>Title Short</label>
-              <input type="text" name="title_short" class="form-control required" placeholder="Enter Site Title" value="<?= $data['title_short'] ?>">
-      </div>
-    </div>
-    <br>
-    <div class="row">
-      <div class="col-md-6">
-       <label>Country Code</label>
-              <input type="text" name="country_flag" class="form-control required" placeholder="Enter SMTP Username" value="<?= $data['country_flag'] ?>">
-      </div>
-      <div class="col-md-6">
-        <label>Currency</label>
-              <input type="text" name="currency" class="form-control required" placeholder="Enter SMTP Password" value="<?= $data['currency'] ?>">
-      </div>
-    </div>
-    <br>
-    <div class="row">
-      <div class="col-md-6">
-          <label>Site Logo</label>
-         <img id="site_logo" src="<?= base_url($data['site_logo']) ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" height="75" width="75"><br>
-         <input name="site_logo" type="file" accept="image/*" onchange="setImg(this,'site_logo');" />
-      </div>
-       <div class="col-md-6">
-         <label>Favicon Icon</label>
-         <img id="fav_icon_image" src="<?= base_url($data['fav_icon']) ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" height="75" width="75"><br>
-          <input name="fav_icon" type="file" accept="image/*" onchange="setImg(this,'fav_icon_image');" />
-       </div>
-    </div>
-    <br>
-    <div class="row">
-      <div class="col-md-6">
-       <label>SMTP Username</label>
-              <input type="text" name="smtp_username" class="form-control required" placeholder="Enter SMTP Username" value="<?= $data['smtp_username'] ?>">
-      </div>
-      <div class="col-md-6">
-         <label>SMTP Password</label>
-              <input type="text" name="smtp_password" class="form-control required" placeholder="Enter SMTP Password" value="<?= $data['smtp_password'] ?>">
-      </div>
-      
-    </div>
-    <br>
-     <div class="row">
-      <div class="col-md-6">
-         <label>Google API Key</label>
-              <input type="text" name="google_api_key" class="form-control required" placeholder="Enter Google API" value="<?= $data['google_api_key'] ?>">
-      </div>
-      <div class="col-md-6">
-        <label>Commission Per Booking</label>
-              <input type="text" name="commission" class="form-control required" placeholder="Enter Service Charge" value="<?= $data['commission'] ?>">
-      </div>
-    </div>
-              
+              <div class="card-header">
+                <strong><?= $pDescription ?></strong>
+              </div>
+              <div class="card-body card-block">
+                <div class="form-group">
+                  <div class="row">
+                    <div class="col-md-6">
+                      <label>Site Title</label>
+                      <input type="text" name="title" class="form-control required" placeholder="Enter Site Title" value="<?= $data['title'] ?>">
+                    </div>
+                    <div class="col-md-6">
+                      <label>Title Short</label>
+                            <input type="text" name="title_short" class="form-control required" placeholder="Enter Site Title" value="<?= $data['title_short'] ?>">
+                    </div>
+                  </div>
+                </div>
+                <div class="form-group">
+                  <div class="row">
+                    <div class="col-md-6">
+                     <label>Country Code</label>
+                            <input type="text" name="country_flag" class="form-control required" placeholder="Enter SMTP Username" value="<?= $data['country_flag'] ?>">
+                    </div>
+                    <div class="col-md-6">
+                      <label>Currency</label>
+                      <input type="text" name="currency" class="form-control required" placeholder="Enter SMTP Password" value="<?= $data['currency'] ?>">
+                    </div>
+                  </div>
+                </div>
+                <div class="form-group">
+                  <div class="row">
+                    <div class="col-md-6">
+                        <label>Site Logo</label><br>
+                       <img id="site_logo" src="<?= base_url($data['site_logo']) ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" height="75" width="75"><br><br>
+                       <input name="site_logo" type="file" accept="image/*" onchange="setImg(this,'site_logo');" />
+                    </div>
+                     <div class="col-md-6">
+                       <label>Favicon Icon</label><br>
+                       <img id="fav_icon_image" src="<?= base_url($data['fav_icon']) ?>" onerror="this.src='<?=base_url("assets/images/no_image.png")?>';" height="75" width="75"><br><br>
+                        <input name="fav_icon" type="file" accept="image/*" onchange="setImg(this,'fav_icon_image');" />
+                     </div>
+                  </div>
+               </div>
+               <div class="form-group">
+                  <div class="row">
+                    <div class="col-md-6">
+                     <label>SMTP Username</label>
+                            <input type="text" name="smtp_username" class="form-control required" placeholder="Enter SMTP Username" value="<?= $data['smtp_username'] ?>">
+                    </div>
+                    <div class="col-md-6">
+                       <label>SMTP Password</label>
+                            <input type="text" name="smtp_password" class="form-control required" placeholder="Enter SMTP Password" value="<?= $data['smtp_password'] ?>">
+                    </div>
+                  </div>
+                </div>
+                <div class="form-group">
+                   <div class="row">
+                    <div class="col-md-6">
+                       <label>Google API Key</label>
+                            <input type="text" name="google_api_key" class="form-control required" placeholder="Enter Google API" value="<?= $data['google_api_key'] ?>">
+                    </div>
+                    <div class="col-md-6">
+                      <label>Commission Per Booking</label>
+                            <input type="text" name="commission" class="form-control required" placeholder="Enter Service Charge" value="<?= $data['commission'] ?>">
+                    </div>
+                  </div>
+                </div>
+              <div class="form-group">
+                 <div class="row">
+                    <div class="col-md-12">
+                      <button type="submit" class="btn btn-primary">Update</button>
+                    </div>
+                  </div>
+              </div>
             </div>
- <button type="submit" class="btn btn-info">Update</button>
-          </div>
-
-
+          </form>
         </div>
-
-        </form>
-         </div>
       </div>
-   </div>
+    </div>
 </div>
+
+
+<!-- PAGE-CONTENT-ENDS -->
         
         
\ No newline at end of file
diff --git a/application/views/Shopper/create.php b/application/views/Shopper/create.php
index fcf4503..0d81c97 100644
--- a/application/views/Shopper/create.php
+++ b/application/views/Shopper/create.php
@@ -1,19 +1,5 @@
-<style type="text/css">
-    
-    .catagory_image_div{
-        width: 60px;
-        height:60px;
-        border-radius: 50%;
-        background: #a8a8a8;
-    }
-    .catagory_image_div img{
-        width: 100%;
-        height:100%;
-        border-radius: 50%;
-        object-fit: cover;
-        object-position: center;
-    }
-</style>
+<!-- PAGE-INDEX-STARTS -->
+
 <div class="breadcrumbs">
     <div class="breadcrumbs-inner">
         <div class="row m-0">
@@ -28,8 +14,7 @@
                 <div class="page-header float-right">
                     <div class="page-title">
                         <ol class="breadcrumb text-right">
-                            <li><a href="<?= base_url() ?>">Dashboard
-</a></li>
+                            <li><a href="<?= base_url() ?>">Dashboard</a></li>
                             <li><a ><?= $menu ?></a></li>
                             <li class="active"><?= $smenu ?></li>
                         </ol>
@@ -39,122 +24,111 @@
         </div>
     </div>
 </div>
+
+<!-- PAGE-INDEX-ENDS -->
+
+<!-- PAGE-CONTENT-STARTS -->
+
 <div class="content">
    <div class="animated fadeIn">
       <div class="row">
          <div class="col-lg-12">
             <?php 
-        $url = (!isset($shopper_id)||empty($shopper_id))
-                  ?'Shopper/createShopper':'Shopper/updateShopper/'.$shopper_id;
-
-        if($this->session->flashdata('message')) { 
-          $flashdata = $this->session->flashdata('message'); ?>
-          <div class="alert alert-<?= $flashdata['class'] ?>">
-            <button class="close" data-dismiss="alert" type="button">×</button>
-            <?= $flashdata['message'] ?>
-          </div>
-        <?php } ?>
-        <form role="form" action="<?= base_url($url) ?>" method="post" 
-              class="validate" data-parsley-validate="" enctype="multipart/form-data">
-            <div class="card">
-                          <div class="card-header">
-                            <strong><?= $pDescription ?></strong>
+            $url = (!isset($shopper_id)||empty($shopper_id))
+            ?'Shopper/createShopper':'Shopper/updateShopper/'.$shopper_id;
+            if($this->session->flashdata('message')) { 
+            $flashdata = $this->session->flashdata('message'); ?>
+            <div class="alert alert-<?= $flashdata['class'] ?>">
+              <button class="close" data-dismiss="alert" type="button">×</button>
+              <?= $flashdata['message'] ?>
+            </div>
+            <?php } ?>
+            <form role="form" action="<?= base_url($url) ?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
+              <div class="card">
+                <div class="card-header">
+                  <strong><?= $pDescription ?></strong>
+                </div>
+                <div class="card-body card-block">
+                  <div class="form-group">
+                    <div class="row">
+                      <div class="col-md-6">
+                        <label for="nf-email" class=" form-control-label">Name</label>
+                        <input type="text" id="nf-brand" name="name" placeholder="Enter Name" class="form-control required" value="<?= (isset($shopper_data->name))?$shopper_data->name:'' ?>" >
+                      </div>
+                      <div class="col-md-6">
+                        <label for="nf-email" class=" form-control-label">Name (Arabic)</label>
+                        <input type="text" id="nf-brand" name="name_arab" placeholder="Enter Name" class="form-control required" value="<?= (isset($shopper_data->name_arab))?$shopper_data->name_arab:'' ?>" >
+                      </div>
+                    </div>
+                  </div>
+                  <div class="form-group">
+                    <div class="row">
+                      <div class="col-md-6">
+                        <label for="nf-email" class=" form-control-label">Email</label>
+                        <input type="text" id="nf-brand" name="email" placeholder="Enter Email" class="form-control required" value="<?= (isset($shopper_data->email_id))?$shopper_data->email_id:'' ?>" >
+                      </div>
+                      <div class="col-md-6">
+                        <label for="nf-email" class=" form-control-label">Commission</label>
+                        <input type="text" id="nf-brand" name="commission" placeholder="Enter Assist Name" class="form-control required" value="<?= (isset($shopper_data->commission))?$shopper_data->commission:'' ?>" >
+                      </div>
+                    </div>
+                  </div>
+                  <div class="form-group">
+                    <div class="row">
+                      <div class="col-md-6">
+                        <label for="nf-email" class=" form-control-label">Phone Code</label>
+                        <input type="text" id="nf-brand" name="phone_code" placeholder="Enter Phone Code" class="form-control required" value="<?= (isset($shopper_data->code))?$shopper_data->code:'' ?>" >
+                      </div>
+                      <div class="col-md-6">
+                        <label for="nf-email" class=" form-control-label">Phone</label>
+                        <input type="text" id="nf-brand" name="phone" placeholder="Enter Phone Number" class="form-control required" value="<?= (isset($shopper_data->phone_no))?$shopper_data->phone_no:'' ?>" >
+                      </div>
+                    </div>
+                  </div>
+                  <div class="form-group">
+                    <div class="row">
+                      <div class="col-md-6">
+                        <label for="nf-email" class=" form-control-label">Shop Name</label>
+                        <input type="text" id="nf-brand" name="shop_name" placeholder="Enter Address" class="form-control required" value="<?= (isset($shopper_data->shop_name))?$shopper_data->shop_name:'' ?>" >
+                      </div>
+                      <div class="col-md-6">
+                        <label for="nf-email" class=" form-control-label">Shop Name (Arabic)</label>
+                        <input type="text" id="nf-brand" name="shop_name_arab" placeholder="Enter Address" class="form-control required" value="<?= (isset($shopper_data->shop_name_arab))?$shopper_data->shop_name_arab:'' ?>" >
+                      </div>
+                    </div>
+                  </div>
+                  <div class="form-group">
+                      <div class="row">
+                        <div class="col-md-6">
+                          <label for="nf-email" class=" form-control-label">DOB</label>
+                          <input type="text" id="nf-brand" name="dob" placeholder="Enter DOB" class="form-control required" value="<?= (isset($shopper_data->dob))?$shopper_data->dob:'' ?>" >
                         </div>
-                        <div class="card-body card-block">
-                                <div class="form-group">
-                                  <div class="row">
-                                    <div class="col-md-6">
-                                       <label for="nf-email" class=" form-control-label">Name</label>
-                                  <input type="text" id="nf-brand" name="name" placeholder="Enter Name" class="form-control required" value="<?= (isset($shopper_data->name))?$shopper_data->name:'' ?>" >
-                                    </div>
-                                    <div class="col-md-6">
-                                       <label for="nf-email" class=" form-control-label">Name (Arabic)</label>
-                                  <input type="text" id="nf-brand" name="name_arab" placeholder="Enter Name" class="form-control required" value="<?= (isset($shopper_data->name_arab))?$shopper_data->name_arab:'' ?>" >
-                                    </div>
-                                  </div>
-                                  <br>
-                                   <div class="row">
-                                    <div class="col-md-6">
-                                      <label for="nf-email" class=" form-control-label">Email</label>
-                                  <input type="text" id="nf-brand" name="email" placeholder="Enter Email" class="form-control required" value="<?= (isset($shopper_data->email_id))?$shopper_data->email_id:'' ?>" >
-                                    </div>
-                                    <div class="col-md-6">
-                                      <label for="nf-email" class=" form-control-label">Commission</label>
-                                  <input type="text" id="nf-brand" name="commission" placeholder="Enter Assist Name" class="form-control required" value="<?= (isset($shopper_data->commission))?$shopper_data->commission:'' ?>" >
-                                    </div>
-                                  </div>
-                                  <br>
-                                  <div class="row">
-                                    <div class="col-md-6">
-                                      <label for="nf-email" class=" form-control-label">Phone Code</label>
-                                  <input type="text" id="nf-brand" name="phone_code" placeholder="Enter Phone Code" class="form-control required" value="<?= (isset($shopper_data->code))?$shopper_data->code:'' ?>" >
-                                    </div>
-                                    <div class="col-md-6">
-                                      <label for="nf-email" class=" form-control-label">Phone</label>
-                                  <input type="text" id="nf-brand" name="phone" placeholder="Enter Phone Number" class="form-control required" value="<?= (isset($shopper_data->phone_no))?$shopper_data->phone_no:'' ?>" >
-                                    </div>
-                                  </div>
-                        
-                                  <br>
-                                  <div class="row">
-                                    <div class="col-md-6">
-                                      <label for="nf-email" class=" form-control-label">Shop Name</label>
-                                  <input type="text" id="nf-brand" name="shop_name" placeholder="Enter Address" class="form-control required" value="<?= (isset($shopper_data->shop_name))?$shopper_data->shop_name:'' ?>" >
-                                    </div>
-                                    <div class="col-md-6">
-                                      <label for="nf-email" class=" form-control-label">Shop Name (Arabic)</label>
-                                  <input type="text" id="nf-brand" name="shop_name_arab" placeholder="Enter Address" class="form-control required" value="<?= (isset($shopper_data->shop_name_arab))?$shopper_data->shop_name_arab:'' ?>" >
-                                    </div>
-                                  </div>
-                                  <br>
-                                  <div class="row">
-                                    <div class="col-md-6">
-                                      <label for="nf-email" class=" form-control-label">DOB</label>
-                                  <input type="text" id="nf-brand" name="dob" placeholder="Enter DOB" class="form-control required" value="<?= (isset($shopper_data->dob))?$shopper_data->dob:'' ?>" >
-                                    </div>
+                      </div>
 
-<div class="row">
-                                    <div class="col-md-12">
-                                      <div class="col-md-12" style="padding-bottom:10px;">
-                    <div class="col-md-3">
-                      <img id="image_id_1" src="<?= (isset($shopper_data->profile_photo))?base_url($shopper_data->profile_photo):'' ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="75" width="75" />
+                      <p>Date: <input type="text" id="datepicker"></p>
                     </div>
-                    <div class="col-md-12" style="padding-top: 25px;">
-                      <input name="profile_image" type="file" accept="image/*" onchange="setImg(this,'image_id_1');" class="form-control"/>
+                    <div class="form-group">
+                      <div class="row">
+                        <div class="col-md-12">
+                          <img id="image_id_1" src="<?= (isset($shopper_data->profile_photo))?base_url($shopper_data->profile_photo):'' ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="75" width="75" />
+                          <input name="profile_image" type="file" accept="image/*" onchange="setImg(this,'image_id_1');" class="form-control"/>
+                        </div>
+                      </div>
                     </div>
-                                      </div>
-                                    </div>
-                                </div>
-
-
-</div>
-
-
-                                  <br>
-                                  <button type="submit" class="btn btn-primary btn-sm">
+                    <div class="form-group">
+                      <div class="row">
+                        <div class="col-md-12">
+                          <button type="submit" class="btn btn-primary">
                                 <i class="fa fa-dot-circle-o"></i> Submit
-                            </button>
-                                 
-                              </div>
-                        
-                          
-                             
-       
-
-                            
-
-                               </div>
-                                </div>
-                        
-                      
-                            
-                            </form>
-                          
-                       
+                          </button>
+                        </div>
+                      </div>
                     </div>
+                </form>
+              </div>
          </div>
       </div>
    </div>
-</div>
+
         
         
\ No newline at end of file
diff --git a/application/views/Subcategory/create.php b/application/views/Subcategory/create.php
index e632d38..fca5fc8 100644
--- a/application/views/Subcategory/create.php
+++ b/application/views/Subcategory/create.php
@@ -1,19 +1,6 @@
-<style type="text/css">
-    
-    .catagory_image_div{
-        width: 60px;
-        height:60px;
-        border-radius: 50%;
-        background: #a8a8a8;
-    }
-    .catagory_image_div img{
-        width: 100%;
-        height:100%;
-        border-radius: 50%;
-        object-fit: cover;
-        object-position: center;
-    }
-</style>
+
+<!-- PAGE-INDEX-STARTS -->
+
 <div class="breadcrumbs">
     <div class="breadcrumbs-inner">
         <div class="row m-0">
@@ -28,8 +15,7 @@
                 <div class="page-header float-right">
                     <div class="page-title">
                         <ol class="breadcrumb text-right">
-                            <li><a href="<?= base_url() ?>">Dashboard
-</a></li>
+                            <li><a href="<?= base_url() ?>">Dashboard</a></li>
                             <li><a ><?= $menu ?></a></li>
                             <li class="active"><?= $smenu ?></li>
                         </ol>
@@ -39,101 +25,86 @@
         </div>
     </div>
 </div>
+
+<!-- PAGE-INDEX-ENDS -->
+
+<!-- PAGE-CONTENT-STARTS -->
+
 <div class="content">
    <div class="animated fadeIn">
       <div class="row">
-         <div class="col-lg-12">
-            <?php 
-        $url = (!isset($subcat_id)||empty($subcat_id))
-                  ?'Sub_category/create_Subcategory':'Sub_category/edit_Subcategory/'.$subcat_id;
-
-        if($this->session->flashdata('message')) { 
+        <div class="col-lg-12">
+          <?php 
+          $url = (!isset($subcat_id)||empty($subcat_id))
+          ?'Sub_category/create_Subcategory':'Sub_category/edit_Subcategory/'.$subcat_id;
+          if($this->session->flashdata('message')) { 
           $flashdata = $this->session->flashdata('message'); ?>
           <div class="alert alert-<?= $flashdata['class'] ?>">
             <button class="close" data-dismiss="alert" type="button">×</button>
             <?= $flashdata['message'] ?>
           </div>
-        <?php } ?>
-         <form role="form" action="<?= base_url($url) ?>" method="post" 
-              class="validate" data-parsley-validate="" enctype="multipart/form-data">
+          <?php } ?>
+          <form role="form" action="<?= base_url($url) ?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
             <div class="card">
-                          <div class="card-header">
-                            <strong><?= $pDescription ?></strong>
-                          </div>
-                        <div class="card-body card-block">                   
-
-<div class="form-group">
-  <div class="row">
-    <div class="col-md-6">
-       <label for="nf-email" class=" form-control-label">Category Name</label>
-<select name="cat_id" id="selectSm" class="form-control-sm form-control">
-                                                <option value="">Please select</option>
-                                        
-                
-                                    <?php foreach($catData as $key =>  $category) { ?> 
-
-    <?php  if  (isset($subcat_id)||!empty($subcat_id)) { ?>
-
-<option <?= $subcatData->cat_id == $category['id'] ? "selected" : "" ; ?> value="<?= $category['id'] ?>"><?= $category['cat_name'] ?></option>
-<?php } ?> 
-<option  value="<?= $category['id'] ?>"><?= $category['cat_name'] ?>(<?= $category['cat_name_arab'] ?>)</option>
-
-
-                                
-                                            <?php } ?> 
-                                                
-                                            </select>
-    </div>
-     <div class="col-md-6">
-      
-     </div>
-  </div>
-  <br>
-   <div class="row">
-    <div class="col-md-6">
-      <label for="nf-email" class=" form-control-label">Subcategory Name</label>
-                                  <input type="text" id="nf-brand" name="sub_cat_name" placeholder="Enter Brand Name" class="form-control required" value="<?= (isset($subcatData->sub_cat_name))?$subcatData->sub_cat_name:'' ?>" >
-    </div>
-    <div class="col-md-6">
-      <label for="nf-email" class=" form-control-label">Subcategory Name (Arabic)</label>
-                                  <input type="text" id="nf-brand" name="sub_cat_name_arab" placeholder="Enter Brand Name" class="form-control required" value="<?= (isset($subcatData->sub_cat_name_arab))?$subcatData->sub_cat_name_arab:'' ?>" >
-    </div>
-  </div>
-  <br>
-
-
- <div class="row">
-                                    <div class="col-md-12">
-                                      <div class="col-md-12" style="padding-bottom:10px;">
-                    <div class="col-md-3">
-                      <img id="image_id_1" src="<?= (isset($subcatData->sub_cat_image))?base_url($subcatData->sub_cat_image):'' ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="75" width="75" />
+              <div class="card-header">
+                <strong><?= $pDescription ?></strong>
+              </div>
+              <div class="card-body card-block">                   
+                <div class="form-group">
+                  <div class="row">
+                    <div class="col-md-6">
+                      <label for="nf-email" class=" form-control-label">Category Name</label>
+                      <select name="cat_id" id="selectSm" class="form-control">
+                        <option value="">Please select</option>    
+                        <?php foreach($catData as $key =>  $category) { ?> 
+                        <?php  if  (isset($subcat_id)||!empty($subcat_id)) { ?>
+                        <option <?= $subcatData->cat_id == $category['id'] ? "selected" : "" ; ?> value="<?= $category['id'] ?>"><?= $category['cat_name'] ?></option>
+                        <?php } ?> 
+                        <option  value="<?= $category['id'] ?>"><?= $category['cat_name'] ?>(<?= $category['cat_name_arab'] ?>)</option>
+                        <?php } ?> 
+                      </select>
+                    </div>
+                     <div class="col-md-6">
+                     </div>
+                  </div>
+                </div>
+                <div class="form-group">
+                  <div class="row">
+                    <div class="col-md-6">
+                      <label for="nf-email" class=" form-control-label">Subcategory Name</label>
+                      <input type="text" id="nf-brand" name="sub_cat_name" placeholder="Enter Brand Name" class="form-control required" value="<?= (isset($subcatData->sub_cat_name))?$subcatData->sub_cat_name:'' ?>" >
                     </div>
-                    <div class="col-md-12" style="padding-top: 25px;">
+                    <div class="col-md-6">
+                      <label for="nf-email" class=" form-control-label">Subcategory Name (Arabic)</label>
+                      <input type="text" id="nf-brand" name="sub_cat_name_arab" placeholder="Enter Brand Name" class="form-control required" value="<?= (isset($subcatData->sub_cat_name_arab))?$subcatData->sub_cat_name_arab:'' ?>" >
+                    </div>
+                  </div>
+                </div>
+                <div class="form-group">
+                  <div class="row">
+                    <div class="col-md-12">
+                      <img id="image_id_1" src="<?= (isset($subcatData->sub_cat_image))?base_url($subcatData->sub_cat_image):'' ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="75" width="75" />
                       <input name="subcategory" type="file" accept="image/*" onchange="setImg(this,'image_id_1');" class="form-control"/>
                     </div>
-                                      </div>
-                                    </div>
-                                </div>
-
-
-<button type="submit" class="btn btn-primary btn-sm">
-                                <i class="fa fa-dot-circle-o"></i> Submit
-                            </button>
-                         
-                               </div>
-                                </div>
-
-                                
-                                
-            
-                            
-                            </form>
-                          
-              
+                  </div>
+                </div>
+                <div class="form-group">
+                  <div class="row">
+                    <div class="col-md-12">
+                      <button type="submit" class="btn btn-primary">
+                        <i class="fa fa-dot-circle-o"></i> Submit
+                      </button>
                     </div>
-         </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </form>
+        </div>        
       </div>
-   </div>
-</div>
-        
+    </div>
+  </div>
+
+  <!-- PAGE-CONTENT-ENDS -->
+
         
\ No newline at end of file
diff --git a/application/views/Subcategory/list.php b/application/views/Subcategory/list.php
index 90a44d3..de99a1a 100644
--- a/application/views/Subcategory/list.php
+++ b/application/views/Subcategory/list.php
@@ -1,37 +1,20 @@
 
 
-
-<style type="text/css">
-    
-    .catagory_image_div{
-        width: 50px;
-        height:50px;
-        border-radius: 50%;
-        background: #a8a8a8;
-    }
-    .catagory_image_div img{
-        width: 100%;
-        height:100%;
-        border-radius: 50%;
-        object-fit: cover;
-        object-position: center;
-    }
-</style>
-
+<!-- PAGE-INDEX-STARTS -->
 
 <div class="breadcrumbs">
     <div class="breadcrumbs-inner">
         <?php
-if($this->session->flashdata('message')) {
-  $message = $this->session->flashdata('message');
-  ?>
-<div class="alert alert-<?php echo $message['class']; ?>">
-<button class="close" data-dismiss="alert" type="button">×</button>
-<?php echo $message['message']; ?>
-</div>
-<?php
-}
-?>
+        if($this->session->flashdata('message')) {
+        $message = $this->session->flashdata('message');
+        ?>
+        <div class="alert alert-<?php echo $message['class']; ?>">
+            <button class="close" data-dismiss="alert" type="button">×</button>
+            <?php echo $message['message']; ?>
+        </div>
+        <?php
+        }
+        ?>
         <div class="row m-0">
             <div class="col-sm-4">
                 <div class="page-header float-left">
@@ -44,10 +27,8 @@ if($this->session->flashdata('message')) {
                 <div class="page-header float-right">
                     <div class="page-title">
                         <ol class="breadcrumb text-right">
-                             <li><a href="<?= base_url() ?>">Dashboard
-</a></li>
+                             <li><a href="<?= base_url() ?>">Dashboard</a></li>
                             <li><a ><?= $menu ?></a></li>
-                           <!--  <li class="active"><?= $smenu ?></li> -->
                         </ol>
                     </div>
                 </div>
@@ -55,70 +36,67 @@ if($this->session->flashdata('message')) {
         </div>
     </div>
 </div>
-<div class="content">
-            <div class="animated fadeIn">
-                <div class="row">
 
-                    <div class="col-md-12">
-                        <div class="card">
-                            <div class="card-header">
-                                <strong class="card-title"><?= $pDescription ?></strong>
-                            </div>
-                            <div class="card-body">
-                                <table id="bootstrap-data-table" class="table table-striped table-bordered">
-                                    <thead>
-                                        <tr>
-                                            <th>No</th>
-                                            <th>Category</th>
-                                            <th>Name</th>
-                                            <th>Image</th>
-                                            <th>Action</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                       <?php
-                if(!empty($subcatData)){
-                  foreach($subcatData as $key =>  $category) { ?> 
-                                        <tr>
-                                            <td><?php echo $key+1;?></td>
-                                            <td><?= $category->cat_name ?>
-                                            <td><?= $category->sub_cat_name ?>
-                                        </td>
-                                            <td>
-                                            <div class="catagory_image_div">
-                               <img src="<?php echo base_url(); ?><?= $category->sub_cat_image ?> "  />                     
+<!-- PAGE-INDEX-ENDS -->
 
-                                                </div>
-                                            </td>
-                                            <td><a class="btn btn-info btn-sm" href="<?= base_url('Sub_category/edit/'.encode_param($category->id))?>">
-                                     <i class="glyphicon glyphicon-edit icon-white"></i>
-                                               Edit
-                                                 </a>
-                                          <a class="btn btn-sm btn-danger" 
-href="<?= base_url('Sub_category/delete/'.encode_param($category->id))?>"
+<!-- PAGE-CONTENT-STARTS -->
 
-
-onClick="return doconfirm()">
-<i class="fa fa-fw fa-trash"></i>Delete
-</a>
-                                         </td>
-                                        </tr>
-                                       <?php }} ?> 
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
+<div class="content">
+    <div class="animated fadeIn">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card">
+                    <div class="card-header">
+                        <strong class="card-title"><?= $pDescription ?></strong>
+                    </div>
+                    <div class="card-body">
+                        <table id="bootstrap-data-table" class="table table-striped table-bordered">
+                            <thead>
+                                <tr>
+                                    <th>No</th>
+                                    <th>Category</th>
+                                    <th>Name</th>
+                                    <th>Image</th>
+                                    <th>Action</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php
+                                if(!empty($subcatData)){
+                                foreach($subcatData as $key =>  $category) { ?> 
+                                <tr>
+                                    <td><?php echo $key+1;?></td>
+                                    <td><?= $category->cat_name ?>
+                                    <td><?= $category->sub_cat_name ?></td>
+                                    <td>
+                                        <img class="avatar_rounded" src="<?php echo base_url(); ?><?= $category->sub_cat_image ?> "  />
+                                    </td>
+                                    <td>
+                                        <a class="btn btn-info btn-sm" href="<?= base_url('Sub_category/edit/'.encode_param($category->id))?>">
+                                            <i class="fa fa-fw fa-pencil"></i>
+                                            Edit
+                                        </a>
+                                        <a class="btn btn-sm btn-danger" href="<?= base_url('Sub_category/delete/'.encode_param($category->id))?>"
+                                            onClick="return doconfirm()">
+                                            <i class="fa fa-fw fa-trash"></i>Delete
+                                        </a>
+                                    </td>
+                                </tr>
+                                <?php }} ?> 
+                            </tbody>
+                        </table>
                     </div>
-
-
                 </div>
-            </div><!-- .animated -->
-        </div><!-- .content -->
+            </div>
+        </div>
+    </div>
+</div>
         
-        <script type="text/javascript">
-            
-function doconfirm(){
-action = confirm("Are you sure to delete permanently?");
-if(action != true) return false;
-}
-        </script>
\ No newline at end of file
+<!-- PAGE-CONTENT-ENDS -->
+
+<script type="text/javascript">  
+    function doconfirm(){
+    action = confirm("Are you sure to delete permanently?");
+    if(action != true) return false;
+    }
+</script>
\ No newline at end of file
diff --git a/application/views/customer/create.php b/application/views/customer/create.php
index e337c45..1650dcf 100644
--- a/application/views/customer/create.php
+++ b/application/views/customer/create.php
@@ -1,19 +1,6 @@
-<style type="text/css">
-    
-    .catagory_image_div{
-        width: 60px;
-        height:60px;
-        border-radius: 50%;
-        background: #a8a8a8;
-    }
-    .catagory_image_div img{
-        width: 100%;
-        height:100%;
-        border-radius: 50%;
-        object-fit: cover;
-        object-position: center;
-    }
-</style>
+
+<!-- PAGE-INDEX-STARTS -->
+
 <div class="breadcrumbs">
     <div class="breadcrumbs-inner">
         <div class="row m-0">
@@ -28,8 +15,7 @@
                 <div class="page-header float-right">
                     <div class="page-title">
                         <ol class="breadcrumb text-right">
-                            <li><a href="<?= base_url() ?>">Dashboard
-</a></li>
+                            <li><a href="<?= base_url() ?>">Dashboard</a></li>
                             <li><a ><?= $menu ?></a></li>
                             <li class="active"><?= $smenu ?></li>
                         </ol>
@@ -39,138 +25,137 @@
         </div>
     </div>
 </div>
+
+<!-- PAGE-INDEX-ENDS -->
+
+<!-- PAGE-CONTENT-STARTS -->
+
 <div class="content">
-   <div class="animated fadeIn">
+  <div class="animated fadeIn">
       <div class="row">
-         <div class="col-lg-12">
-            <?php 
+        <div class="col-lg-12">
+        <?php 
         $url = (!isset($customer_id)||empty($customer_id))
-                  ?'Customer/createCustomer':'Customer/updateCustomer/'.$customer_id;
-
+        ?'Customer/createCustomer':'Customer/updateCustomer/'.$customer_id;
         if($this->session->flashdata('message')) { 
-          $flashdata = $this->session->flashdata('message'); ?>
+        $flashdata = $this->session->flashdata('message'); ?>
           <div class="alert alert-<?= $flashdata['class'] ?>">
             <button class="close" data-dismiss="alert" type="button">×</button>
             <?= $flashdata['message'] ?>
           </div>
-        <?php } ?>
-        <form role="form" action="<?= base_url($url) ?>" method="post" 
-              class="validate" data-parsley-validate="" enctype="multipart/form-data">
+          <?php } ?>
+          <form role="form" action="<?= base_url($url) ?>" method="post" class="validate" data-parsley-validate="" enctype="multipart/form-data">
             <div class="card">
-                          <div class="card-header">
-                            <strong><?= $pDescription ?></strong>
-                        </div>
-                        <div class="card-body card-block">
-
-                                <div class="form-group">
-                                  <div class="row">
-                                    <div class="col-md-6">
-                                      <label for="nf-email" class=" form-control-label">Name</label>
-                                  <input type="text" id="nf-brand" name="name" placeholder="Enter Name" class="form-control required" value="<?= (isset($customer_data->name))?$customer_data->name:'' ?>" >
-                                    </div>
-                                    <div class="col-md-6">
-                                      <label for="nf-email" class=" form-control-label">Name (Arabic)</label>
-                                  <input type="text" id="nf-brand" name="name_arab" placeholder="Enter Name Arabic" class="form-control required" value="<?= (isset($customer_data->name_arab))?$customer_data->name_arab:'' ?>" >
-                                    </div>
-                                  </div>
-                                  <br>
-                                  <div class="row">
-                                    <div class="col-md-6">
-                                      <label for="nf-email" class=" form-control-label">Email</label>
-                                  <input type="text" id="nf-brand" name="email" placeholder="Enter Email" class="form-control required" value="<?= (isset($customer_data->email_id))?$customer_data->email_id:'' ?>" >
-                                    </div>
-                                     <div class="col-md-6">
-                                      <label for="nf-email" class=" form-control-label">DOB</label>
-                                  <input type="text" id="nf-brand" name="dob" placeholder="Enter DOB" class="form-control required" value="<?= (isset($customer_data->dob))?$customer_data->dob:'' ?>" >
-                                    </div>
-                                  </div>
-                                  <br>
-                                   <div class="row">
-                                    <div class="col-md-6">
-                                      <label for="nf-email" class=" form-control-label">Phone Code</label>
-                                  <input type="text" id="nf-brand" name="phone_code" placeholder="Enter Phone Code" class="form-control required" value="<?= (isset($customer_data->code))?$customer_data->code:'' ?>" >
-                                    </div>
-                         
-                                    <div class="col-md-6">
-                                      <label for="nf-email" class=" form-control-label">Phone</label>
-                                  <input type="text" id="nf-brand" name="phone" placeholder="Enter Phone Number" class="form-control required" value="<?= (isset($customer_data->phone_no))?$customer_data->phone_no:'' ?>" >
-                                    </div>
-                                  </div>
-  
-                                  <br>
-                                  <div class="row">
-                                    <div class="col-md-6">
-                                      <label for="nf-email" class=" form-control-label">Address</label>
-                                  <input type="text" id="nf-brand" name="address" placeholder="Enter Address" class="form-control required" value="<?= (isset($customer_data->address))?$customer_data->address:'' ?>" >
-                                    </div>
-                                    <div class="col-md-6">
-                                      <label for="nf-email" class=" form-control-label">Address (Arabic)</label>
-                                  <input type="text" id="nf-brand" name="address_arab" placeholder="Enter Address" class="form-control required" value="<?= (isset($customer_data->address_arab))?$customer_data->address_arab:'' ?>" >
-                                    </div>
-                                  </div>
-                                  <br>
-                                  <div class="row">
-                                    <div class="col-md-6">
-                                       <label for="nf-email" class=" form-control-label">Assist Name</label>
-                                  <input type="text" id="nf-brand" name="assist_name" placeholder="Enter Assist Name" class="form-control required" value="<?= (isset($customer_data->assist_name))?$customer_data->assist_name:'' ?>" >
-                                    </div>
-                                    <div class="col-md-6">
-                                        <label for="nf-email" class=" form-control-label">Assist Name (Arabic)</label>
-                                  <input type="text" id="nf-brand" name="assist_name_arab" placeholder="Enter Assist Name Arabic" class="form-control required" value="<?= (isset($customer_data->assist_name_arab))?$customer_data->assist_name_arab:'' ?>" >
-                                     
-                                    </div>
-                                  </div>
-                                  <br>
-                                  <div class="row">
-                                    <div class="col-md-6">
-                                       <label for="nf-email" class=" form-control-label">Assist Email</label>
-                                  <input type="text" id="nf-brand" name="assist_email" placeholder="Enter Assist Email" class="form-control required" value="<?= (isset($customer_data->assist_email_id))?$customer_data->assist_email_id:'' ?>" >
-                                    
-                                    </div>
-                                    <div class="col-md-6">
-                                        <label for="nf-email" class=" form-control-label">Assist Phone Code</label>
-                                  <input type="text" id="nf-brand" name="assist_phone_code" placeholder="Enter Assist Phone Code" class="form-control required" value="<?= (isset($customer_data->assist_code))?$customer_data->assist_code:'' ?>" >
-                                     
-                                    </div>
-                                  </div>
-                                  <br>
-                                    <div class="row">
-                                       <div class="col-md-6">
-                                <label for="nf-email" class=" form-control-label">Assist Phone</label>
-                                  <input type="text" id="nf-brand" name="assist_phone" placeholder="Enter Assist Phone" class="form-control required" value="<?= (isset($customer_data->assist_phone_no))?$customer_data->assist_phone_no:'' ?>" >
-                                </div>
-                              
-             <div class="col-md-6"> 
-               <div class="form-group">
-                  <label>Profile Picture</label>
-                  <div class="col-md-12" style="padding-bottom:10px;">
-                    <div class="col-md-3">
-                      <img id="image_id_1" src="<?= (isset($customer_data->profile_photo))?base_url($customer_data->profile_photo):'' ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="75" width="75" />
-                    </div>
-                    <div class="col-md-12" style="padding-top: 25px;">
-                      <input name="profile_image" type="file" accept="image/*" onchange="setImg(this,'image_id_1');" class="form-control"/>
+              <div class="card-header">
+                <strong><?= $pDescription ?></strong>
+              </div>
+              <div class="card-body card-block">
+                <div class="form-group">
+                  <div class="row">
+                    <div class="col-md-6">
+                      <label for="nf-email" class=" form-control-label">Name</label>
+                      <input type="text" id="nf-brand" name="name" placeholder="Enter Name" class="form-control required" value="<?= (isset($customer_data->name))?$customer_data->name:'' ?>" >
+                    </div>
+                    <div class="col-md-6">
+                      <label for="nf-email" class=" form-control-label">Name (Arabic)</label>
+                      <input type="text" id="nf-brand" name="name_arab" placeholder="Enter Name Arabic" class="form-control required" value="<?= (isset($customer_data->name_arab))?$customer_data->name_arab:'' ?>" >
                     </div>
                   </div>
                 </div>
-              </div>
-
-                                  <button type="submit" class="btn btn-primary btn-sm">
+                <div class="form-group">
+                  <div class="row">
+                    <div class="col-md-6">
+                      <label for="nf-email" class=" form-control-label">Email</label>
+                      <input type="text" id="nf-brand" name="email" placeholder="Enter Email" class="form-control required" value="<?= (isset($customer_data->email_id))?$customer_data->email_id:'' ?>" >
+                    </div>
+                    <div class="col-md-6">
+                      <label for="nf-email" class=" form-control-label">DOB</label>
+                      <input type="text" id="nf-brand" name="dob" placeholder="Enter DOB" class="form-control required" value="<?= (isset($customer_data->dob))?$customer_data->dob:'' ?>" >
+                    </div>
+                  </div>
+                </div>
+                <div class="form-group">
+                  <div class="row">
+                    <div class="col-md-6">
+                      <label for="nf-email" class=" form-control-label">Phone Code</label>
+                      <input type="text" id="nf-brand" name="phone_code" placeholder="Enter Phone Code" class="form-control required" value="<?= (isset($customer_data->code))?$customer_data->code:'' ?>" >
+                    </div>
+                    <div class="col-md-6">
+                      <label for="nf-email" class=" form-control-label">Phone</label>
+                      <input type="text" id="nf-brand" name="phone" placeholder="Enter Phone Number" class="form-control required" value="<?= (isset($customer_data->phone_no))?$customer_data->phone_no:'' ?>" >
+                    </div>
+                  </div>
+                </div>
+                <div class="form-group">
+                  <div class="row">
+                    <div class="col-md-6">
+                      <label for="nf-email" class=" form-control-label">Address</label>
+                      <input type="text" id="nf-brand" name="address" placeholder="Enter Address" class="form-control required" value="<?= (isset($customer_data->address))?$customer_data->address:'' ?>" >
+                    </div>
+                    <div class="col-md-6">
+                      <label for="nf-email" class=" form-control-label">Address (Arabic)</label>
+                      <input type="text" id="nf-brand" name="address_arab" placeholder="Enter Address" class="form-control required" value="<?= (isset($customer_data->address_arab))?$customer_data->address_arab:'' ?>" >
+                    </div>
+                  </div>
+                </div>
+                <div class="form-group">
+                  <div class="row">
+                    <div class="col-md-6">
+                      <label for="nf-email" class=" form-control-label">Assist Name</label>
+                      <input type="text" id="nf-brand" name="assist_name" placeholder="Enter Assist Name" class="form-control required" value="<?= (isset($customer_data->assist_name))?$customer_data->assist_name:'' ?>" >
+                    </div>
+                    <div class="col-md-6">
+                      <label for="nf-email" class=" form-control-label">Assist Name (Arabic)</label>
+                      <input type="text" id="nf-brand" name="assist_name_arab" placeholder="Enter Assist Name Arabic" class="form-control required" value="<?= (isset($customer_data->assist_name_arab))?$customer_data->assist_name_arab:'' ?>" >
+                    </div>
+                  </div>
+                </div>
+                <div class="form-group">
+                  <div class="row">
+                    <div class="col-md-6">
+                      <label for="nf-email" class=" form-control-label">Assist Email</label>
+                      <input type="text" id="nf-brand" name="assist_email" placeholder="Enter Assist Email" class="form-control required" value="<?= (isset($customer_data->assist_email_id))?$customer_data->assist_email_id:'' ?>" >
+                    </div>
+                    <div class="col-md-6">
+                      <label for="nf-email" class=" form-control-label">Assist Phone Code</label>
+                      <input type="text" id="nf-brand" name="assist_phone_code" placeholder="Enter Assist Phone Code" class="form-control required" value="<?= (isset($customer_data->assist_code))?$customer_data->assist_code:'' ?>" >
+                    </div>
+                  </div>
+                </div>
+                 <div class="form-group">
+                    <div class="row">
+                      <div class="col-md-12">
+                        <label for="nf-email" class=" form-control-label">Assist Phone</label>
+                        <input type="text" id="nf-brand" name="assist_phone" placeholder="Enter Assist Phone" class="form-control required" value="<?= (isset($customer_data->assist_phone_no))?$customer_data->assist_phone_no:'' ?>" >
+                      </div> 
+                    </div>
+                  </div>
+                  <div class="form-group">
+                    <div class="row">         
+                     <div class="col-md-6"> 
+                        <label>Profile Picture</label><br>
+                        <img id="image_id_1" src="<?= (isset($customer_data->profile_photo))?base_url($customer_data->profile_photo):'' ?>" onerror="this.src='<?=base_url("assets/images/user_avatar.jpg")?>';" height="75" width="75" />
+                        <input name="profile_image" type="file" accept="image/*" onchange="setImg(this,'image_id_1');" class="form-control"/>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="form-group">
+                    <div class="row">
+                      <div class="col-md-12">
+                          <button type="submit" class="btn btn-primary">
                                 <i class="fa fa-dot-circle-o"></i> Submit
-                            </button>
-                                  
-                              </div>
-                               
-                                </div>
-                        
-           
-                           
-                            </form>
-                          
-             
+                          </button>
+                      </div>
                     </div>
+                  </div>   
+                </div>
+              </div>
+            </form>
+          </div>
          </div>
       </div>
    </div>
+   <div class="clear-fix"></div>
 
         
         
\ No newline at end of file
diff --git a/application/views/customer/list.php b/application/views/customer/list.php
index 71c6c9e..65fbef3 100644
--- a/application/views/customer/list.php
+++ b/application/views/customer/list.php
@@ -1,37 +1,19 @@
 
-
-
-<style type="text/css">
-    
-    .catagory_image_div{
-        width: 50px;
-        height:50px;
-        border-radius: 50%;
-        background: #a8a8a8;
-    }
-    .catagory_image_div img{
-        width: 100%;
-        height:100%;
-        border-radius: 50%;
-        object-fit: cover;
-        object-position: center;
-    }
-</style>
-
+<!-- PAGE-INDEX-STARTS -->
 
 <div class="breadcrumbs">
     <div class="breadcrumbs-inner">
         <?php
-if($this->session->flashdata('message')) {
-  $message = $this->session->flashdata('message');
-  ?>
-<div class="alert alert-<?php echo $message['class']; ?>">
-<button class="close" data-dismiss="alert" type="button">×</button>
-<?php echo $message['message']; ?>
-</div>
-<?php
-}
-?>
+        if($this->session->flashdata('message')) {
+        $message = $this->session->flashdata('message');
+        ?>
+            <div class="alert alert-<?php echo $message['class']; ?>">
+                <button class="close" data-dismiss="alert" type="button">×</button>
+                <?php echo $message['message']; ?>
+            </div>
+        <?php
+        }
+        ?>
         <div class="row m-0">
             <div class="col-sm-4">
                 <div class="page-header float-left">
@@ -44,10 +26,8 @@ if($this->session->flashdata('message')) {
                 <div class="page-header float-right">
                     <div class="page-title">
                         <ol class="breadcrumb text-right">
-                             <li><a href="<?= base_url() ?>">Dashboard
-</a></li>
+                            <li><a href="<?= base_url() ?>">Dashboard</a></li>
                             <li><a ><?= $menu ?></a></li>
-                            <!-- <li class="active"><?= $smenu ?></li> -->
                         </ol>
                     </div>
                 </div>
@@ -55,80 +35,76 @@ if($this->session->flashdata('message')) {
         </div>
     </div>
 </div>
-<div class="content">
-            <div class="animated fadeIn">
-                <div class="row">
-
-                    <div class="col-md-12">
-                        <div class="card">
-                            <div class="card-header">
-                                <strong class="card-title"><?= $pDescription ?></strong>
-                            </div>
-                            <div class="card-body">
-                                <table id="bootstrap-data-table" class="table table-striped table-bordered">
-                                    <thead>
-                                        <tr>
-                                            <th>No</th>
-                                            <th>Name</th>
-                                            <th>Email</th>
-                                            <th>Phone</th>
-                                            <th>Action</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                       <?php
-                if(!empty($customer_data)){
-                  foreach($customer_data as $key =>  $customer) { ?> 
-                                        <tr>
-                                            <td><?php echo $key+1;?></td>
-                                            <td><?= $customer->name ?></td>
-                                            <td><?= $customer->email_id ?></td>
-                                            <td><?= $customer->phone_no ?></td>
-                                           
-                                            <td><a class="btn btn-sm btn-info" id="viewCustomer" customer_id="<?= encode_param($customer->id) ?>">
-                                                 <i class="fa fa-fw fa-eye"></i>View
-                                                 </a>
-
 
+<!-- PAGE-INDEX-ENDS -->
 
-                                                <a class="btn btn-info btn-sm" href="<?= base_url('Customer/editCustomers/'.encode_param($customer->id))?>">
-                                               <i class="fa fa-pencil"></i>
-                                                 Edit
-                                                </a>
-                                                 <a class="btn btn-sm btn-danger" 
-                            href="<?= base_url("Customer/changeStatus/".encode_param($customer->id))."/2" ?>" 
-                            onClick="return doconfirm()">
-                          <i class="fa fa-fw fa-trash"></i>Delete
-                        </a>    
-                                         
-                        <?php if($customer->status == 1){ ?>
-                          <a class="btn btn-sm btn-success" style="background-color:#ac2925" href="<?= base_url("Customer/changeStatus/".encode_param($customer->id))."/0" ?>">
-                            <i class="fa fa-cog"></i> De-activate
-                          </a>
-                        <?php } else { ?>
-                          <a class="btn btn-sm btn-success" href="<?= base_url("Customer/changeStatus/".encode_param($customer->id))."/1" ?>">
-                            <i class="fa fa-cog"></i> Activate
-                          </a>
-                        <?php } ?>
+<!-- PAGE-CONTENT-STARTS -->
 
-                                         </td>
-                                        </tr>
-                                       <?php }} ?> 
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
+<div class="content">
+    <div class="animated fadeIn">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="card">
+                    <div class="card-header">
+                        <strong class="card-title"><?= $pDescription ?></strong>
+                    </div>
+                    <div class="card-body">
+                        <table id="bootstrap-data-table" class="table table-striped table-bordered">
+                            <thead>
+                                <tr>
+                                    <th>No</th>
+                                    <th>Name</th>
+                                    <th>Email</th>
+                                    <th>Phone</th>
+                                    <th>Action</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php
+                                if(!empty($customer_data)){
+                                  foreach($customer_data as $key =>  $customer) { ?> 
+                                <tr>
+                                    <td><?php echo $key+1;?></td>
+                                    <td><?= $customer->name ?></td>
+                                    <td><?= $customer->email_id ?></td>
+                                    <td><?= $customer->phone_no ?></td>
+                                    <td>
+                                        <a class="btn btn-sm btn-info" id="viewCustomer" customer_id="<?= encode_param($customer->id) ?>">
+                                            <i class="fa fa-fw fa-eye"></i>View
+                                        </a>
+                                        <a class="btn btn-info btn-sm" href="<?= base_url('Customer/editCustomers/'.encode_param($customer->id))?>">
+                                            <i class="fa fa-pencil"></i>Edit
+                                        </a>
+                                        <a class="btn btn-sm btn-danger" href="<?= base_url("Customer/changeStatus/".encode_param($customer->id))."/2" ?>" 
+                                            onClick="return doconfirm()">
+                                            <i class="fa fa-fw fa-trash"></i>Delete
+                                        </a>     
+                                        <?php if($customer->status == 1){ ?>
+                                          <a class="btn btn-sm btn-success" style="background-color:#ac2925" href="<?= base_url("Customer/changeStatus/".encode_param($customer->id))."/0" ?>">
+                                            <i class="fa fa-cog"></i> De-activate
+                                          </a>
+                                        <?php } else { ?>
+                                          <a class="btn btn-sm btn-success" href="<?= base_url("Customer/changeStatus/".encode_param($customer->id))."/1" ?>">
+                                            <i class="fa fa-cog"></i> Activate
+                                          </a>
+                                        <?php } ?>
+                                    </td>
+                                </tr>
+                                <?php }} ?> 
+                            </tbody>
+                        </table>
                     </div>
-
-
                 </div>
-            </div><!-- .animated -->
-        </div><!-- .content -->
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- PAGE-CONTENT-ENDS -->
         
-        <script type="text/javascript">
-            
-function doconfirm(){
-action = confirm("Are you sure to delete permanently?");
-if(action != true) return false;
-}
-        </script>
\ No newline at end of file
+    <script type="text/javascript">        
+        function doconfirm(){
+        action = confirm("Are you sure to delete permanently?");
+        if(action != true) return false;
+        }
+    </script>
\ No newline at end of file
diff --git a/application/views/dashboard/dashboard.php b/application/views/dashboard/dashboard.php
index ec78959..6048efa 100644
--- a/application/views/dashboard/dashboard.php
+++ b/application/views/dashboard/dashboard.php
@@ -1,3 +1,226 @@
-<div class="content"> </div>
+<!-- PAGE-INDEX-STARTS -->
+
+<div class="breadcrumbs">
+    <div class="breadcrumbs-inner">
+        <div class="row m-0">
+            <div class="col-sm-4">
+                <div class="page-header float-left">
+                    <div class="page-title">
+                        <h1>Dashboard</h1>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-8">
+                <div class="page-header float-right">
+                    <div class="page-title">
+                        <ol class="breadcrumb text-right">
+                           <!--  <li><a>Dashboard</a></li> -->
+                        </ol>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- PAGE-INDEX-ENDS -->
+
+<div class="content">
+    <div class="animated fadeIn">
+        <div class="row">
+            <div class="col-lg-3 col-md-6">
+                <div class="card">
+                    <div class="card-body">
+                        <div class="stat-widget-five">
+                            <div class="stat-icon dib flat-color-1">
+                                <i class="pe-7s-cash"></i>
+                            </div>
+                            <div class="stat-content">
+                                <div class="text-left dib">
+                                    <div class="stat-text">$<span class="count">23569</span></div>
+                                    <div class="stat-heading">Revenue</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-lg-3 col-md-6">
+                <div class="card">
+                    <div class="card-body">
+                        <div class="stat-widget-five">
+                            <div class="stat-icon dib flat-color-2">
+                                <i class="pe-7s-cart"></i>
+                            </div>
+                            <div class="stat-content">
+                                <div class="text-left dib">
+                                    <div class="stat-text"><span class="count">3435</span></div>
+                                    <div class="stat-heading">Sales</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-lg-3 col-md-6">
+                <div class="card">
+                    <div class="card-body">
+                        <div class="stat-widget-five">
+                            <div class="stat-icon dib flat-color-3">
+                                <i class="pe-7s-browser"></i>
+                            </div>
+                            <div class="stat-content">
+                                <div class="text-left dib">
+                                    <div class="stat-text"><span class="count">349</span></div>
+                                    <div class="stat-heading">Templates</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-lg-3 col-md-6">
+                <div class="card">
+                    <div class="card-body">
+                        <div class="stat-widget-five">
+                            <div class="stat-icon dib flat-color-4">
+                                <i class="pe-7s-users"></i>
+                            </div>
+                            <div class="stat-content">
+                                <div class="text-left dib">
+                                    <div class="stat-text"><span class="count">2986</span></div>
+                                    <div class="stat-heading">Clients</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="clearfix"></div>
+        <div class="row">
+            <div class="col-lg-6">
+                <div class="card">
+                    <div class="card-body">
+                        <h4 class="card-title box-title">To Do List</h4>
+                        <div class="card-content">
+                            <div class="todo-list">
+                                <div class="tdl-holder">
+                                    <div class="tdl-content">
+                                        <ul>
+                                            <li>
+                                                <label>
+                                                    <input type="checkbox"><i class="check-box"></i><span>Conveniently fabricate interactive technology for ....</span>
+                                                    <a href='#' class="fa fa-times"></a>
+                                                    <a href='#' class="fa fa-pencil"></a>
+                                                    <a href='#' class="fa fa-check"></a>
+                                                </label>
+                                            </li>
+                                            <li>
+                                                <label>
+                                                    <input type="checkbox"><i class="check-box"></i><span>Creating component page</span>
+                                                    <a href='#' class="fa fa-times"></a>
+                                                    <a href='#' class="fa fa-pencil"></a>
+                                                    <a href='#' class="fa fa-check"></a>
+                                                </label>
+                                            </li>
+                                            <li>
+                                                <label>
+                                                    <input type="checkbox" checked><i class="check-box"></i><span>Follow back those who follow you</span>
+                                                    <a href='#' class="fa fa-times"></a>
+                                                    <a href='#' class="fa fa-pencil"></a>
+                                                    <a href='#' class="fa fa-check"></a>
+                                                </label>
+                                            </li>
+                                            <li>
+                                                <label>
+                                                    <input type="checkbox" checked><i class="check-box"></i><span>Design One page theme</span>
+                                                    <a href='#' class="fa fa-times"></a>
+                                                    <a href='#' class="fa fa-pencil"></a>
+                                                    <a href='#' class="fa fa-check"></a>
+                                                </label>
+                                            </li>
+                                            <li>
+                                                <label>
+                                                    <input type="checkbox" checked><i class="check-box"></i><span>Creating component page</span>
+                                                    <a href='#' class="fa fa-times"></a>
+                                                    <a href='#' class="fa fa-pencil"></a>
+                                                    <a href='#' class="fa fa-check"></a>
+                                                </label>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-lg-6">
+                <div class="card">
+                    <div class="card-body">
+                        <h4 class="card-title box-title">Live Chat</h4>
+                        <div class="card-content">
+                            <div class="messenger-box">
+                                <ul>
+                                    <li>
+                                        <div class="msg-received msg-container">
+                                            <div class="avatar">
+                                                <img src="./assets/images/avatar/64-1.jpg" alt="">
+                                                <div class="send-time">11.11 am</div>
+                                            </div>
+                                            <div class="msg-box">
+                                                <div class="inner-box">
+                                                    <div class="name">
+                                                        John Doe
+                                                    </div>
+                                                    <div class="meg">
+                                                        Lorem ipsum dolor sit amet, consectetur adipisicing elit. Perspiciatis sunt placeat velit ad reiciendis ipsam
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </li>
+                                    <li>
+                                        <div class="msg-sent msg-container">
+                                            <div class="avatar">
+                                                <img src="./assets/images/avatar/64-2.jpg" alt="">
+                                                <div class="send-time">11.11 am</div>
+                                            </div>
+                                            <div class="msg-box">
+                                                <div class="inner-box">
+                                                    <div class="name">
+                                                        John Doe
+                                                    </div>
+                                                    <div class="meg">
+                                                        Hay how are you doing?
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </li>
+                                </ul>
+                                <div class="send-mgs">
+                                    <div class="yourmsg">
+                                        <input class="form-control" type="text">
+                                    </div>
+                                    <button class="btn msg-send-btn">
+                                        <i class="pe-7s-paper-plane"></i>
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- PAGE-CONTENT-ENDS -->
         
         
\ No newline at end of file
diff --git a/application/views/template/footer_script.php b/application/views/template/footer_script.php
index 3513c41..fd11710 100644
--- a/application/views/template/footer_script.php
+++ b/application/views/template/footer_script.php
@@ -12,6 +12,7 @@
 <script src="<?php echo base_url('assets/js/jquery.matchHeight.min.js'); ?>"></script>
 <script src="<?php echo base_url('assets/js/main.js'); ?>"></script>
 <script src="<?php echo base_url('assets/js/parsley.min.js'); ?>"></script>
+<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
 <script src="<?= base_url('assets/js/custom-script.js') ?>"></script>
 
 <?php
diff --git a/application/views/template/header_script.php b/application/views/template/header_script.php
index bb11f8d..c252ec3 100644
--- a/application/views/template/header_script.php
+++ b/application/views/template/header_script.php
@@ -17,6 +17,8 @@
     <link rel="stylesheet" href="<?php echo base_url('assets/css/style.css'); ?>">
     <link rel="stylesheet" href="<?php echo base_url('assets/css/lib/datatable/dataTables.bootstrap.min.css'); ?>">
     <link href="<?php echo base_url();?>assets/css/parsley/parsley.css" rel="stylesheet">
+    <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+    <link rel="stylesheet" href="/resources/demos/style.css">
 
     <script src="<?php echo base_url('assets/js/jquery.min.js'); ?>"></script>
     <!-- <script type="text/javascript" src="https://cdn.jsdelivr.net/html5shiv/3.7.3/html5shiv.min.js"></script> -->
diff --git a/assets/css/style.css b/assets/css/style.css
index a6b8dbd..b141e06 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -1,23 +1,37 @@
-/* This css file is to over write bootstarp css
---------------------------------------------------------- /
-* Theme Name: Ela Admin Template
-* Theme URI: http://demos.jeweltheme.com/
-* Author: jewel_theme
-* Author URI: http://themeforest.net/user/jewel_theme/portfolio
-* Description:
-* Version: 1.0.0
-* License: GNU General Public License v2 or later
-* License URI: http://www.gnu.org/licenses/gpl-2.0.html
-* Tags: html, themplate, Ela Admin
---------------------------------------------------------- */
-/* 
+/*
+	Site Name: Techware Master Admin Panel
+	URI: http:
+	Description: This is the main css for Techware Master Admin Panel
+	Version: 1.0
+	Author: Amal-Techware Solution
+	Author URI:
+	Tags:
 
+*/
+
+
+
+/* Googel Fonts  */
 
-Googel Fonts  */
 @import url("https://fonts.googleapis.com/css?family=Open+Sans:400,600,700");
+
 /* Googel Fonts End  
 
 */
+
+.avatar_rounded{
+  width: 40px;
+  height:40px;
+  border-radius: 50%;
+  object-position: center;
+  object-fit: cover;
+}
+
+
+*::-webkit-scrollbar {
+      display: none;
+}
+
 @import url("https://fonts.googleapis.com/css?family=Open+Sans:400,600,700");
 .bg-flat-color-1 {
   background: #00c292; }
@@ -563,7 +577,7 @@ aside.left-panel {
   height: 100vh;
   padding: 0;
   vertical-align: top;
-  width: 280px;
+  width: 250px;
   -webkit-box-shadow: 1px 0 20px rgba(0, 0, 0, 0.08);
           box-shadow: 1px 0 20px rgba(0, 0, 0, 0.08);
   position: fixed;
@@ -599,16 +613,15 @@ aside.left-panel {
     font-family: 'Open Sans';
     font-size: 14px;
     font-weight: 700;
-    line-height: 50px;
-    padding: 0;
+    line-height:30px;
+    padding: 15px !important;
     text-transform: uppercase;
     width: 100%; }
   .navbar .navbar-nav {
     float: none;
     position: relative; }
     .navbar .navbar-nav > li {
-      padding-left: 30px;
-      padding-right: 30px; }
+      padding:0px; }
       .navbar .navbar-nav > li.active {
         background: #fafafa; }
     .navbar .navbar-nav li {
@@ -624,7 +637,8 @@ aside.left-panel {
         display: inline-block;
         font-size: 14px;
         line-height: 26px;
-        padding: 10px 0;
+        padding:10px;
+        padding-left: 25px;
         position: relative;
         width: 100%; }
         .navbar .navbar-nav li > a:hover, .navbar .navbar-nav li > a:hover .menu-icon {
@@ -633,7 +647,7 @@ aside.left-panel {
           color: #607d8b;
           float: left;
           margin-top: 8px;
-          width: 55px;
+          width:30px;
           text-align: left;
           z-index: 9; }
         .navbar .navbar-nav li > a .menu-title-text {
@@ -651,8 +665,8 @@ aside.left-panel {
           .navbar .navbar-nav li.menu-item-has-children a:before {
             content: "";
             position: absolute;
-            top: 23px;
-            right: 0;
+            top: 22px;
+            right: 35px;
             width: 8px;
             height: 8px;
             border-style: solid;
@@ -670,17 +684,21 @@ aside.left-panel {
           -webkit-box-shadow: none;
                   box-shadow: none;
           overflow-y: hidden;
-          padding: 0 0 0 35px; }
+          padding: 0 0 0 0px; 
+          padding-left:35px;
+        }
           .navbar .navbar-nav li.menu-item-has-children .sub-menu li {
-            position: relative; }
+            position: relative;
+            padding:5px;
+           }
           .navbar .navbar-nav li.menu-item-has-children .sub-menu i {
             color: #c8c9ce;
             float: left;
             padding: 0;
             position: absolute;
-            left: 0;
+            left: 5;
             font-size: 14px;
-            top: 9px; }
+            top: 15px; }
           .navbar .navbar-nav li.menu-item-has-children .sub-menu a {
             padding: 2px 0 2px 30px; }
             .navbar .navbar-nav li.menu-item-has-children .sub-menu a:before {
@@ -693,7 +711,7 @@ aside.left-panel {
         .navbar .navbar-nav li.menu-item-has-children.show a:before {
           border-color: transparent #607d8b #607d8b transparent;
           top: 20px;
-          right: -5px; }
+          right: 35px; }
         .navbar .navbar-nav li.menu-item-has-children.show a:hover:before {
           border-color: transparent #03a9f3 #03a9f3 transparent; }
         .navbar .navbar-nav li.menu-item-has-children.show .sub-menu {
@@ -723,7 +741,8 @@ aside.left-panel {
 .open .navbar .navbar-brand.hidden {
   display: block; }
 .open .sub-menu .subtitle {
-  display: block;
+
+  display:none;
   font-size: 15px;
   line-height: 35px;
   color: #607d8b;
@@ -822,7 +841,7 @@ aside.left-panel {
 /* Right panel */
 .right-panel {
   background: #f1f2f7;
-  margin-left: 280px;
+  margin-left: 250px;
   margin-top: 55px; }
   .right-panel .top-left {
     width: 350px;
@@ -831,11 +850,12 @@ aside.left-panel {
     float: left; }
   .right-panel .breadcrumbs {
     float: left;
-    margin-top: 30px;
-    padding: 0 1.875em;
+    box-shadow: 1px 0 20px rgba(0, 0, 0, 0.08);
+    padding:0px;
     width: 100%; }
     .right-panel .breadcrumbs .breadcrumbs-inner {
-      background-color: #fff; }
+      background-color: #fff;
+      padding: 10px; }
     .right-panel .breadcrumbs .col-lg-8 .page-header {
       float: left; }
   .right-panel .page-header {
@@ -863,7 +883,7 @@ aside.left-panel {
   -webkit-box-shadow: none;
           box-shadow: none;
   clear: both;
-  padding: 0 30px;
+  padding: 0 15px;
   height: 55px;
   position: fixed;
   left: 280px;
@@ -872,7 +892,7 @@ aside.left-panel {
   top: 0;
   z-index: 999; }
 .right-panel .navbar-brand {
-  width: 250px;
+  width:190px;
   display: inline-block; }
 .right-panel .menutoggle {
   padding-top: 7px; }
@@ -920,7 +940,7 @@ header.fixed-top {
   width: 43px; }
 
 header .form-inline {
-  background: #131c21;
+  background: #d1a94f;
   display: none;
   height: 55px;
   margin: 0;
@@ -934,13 +954,16 @@ header .form-inline {
     max-width: 1025px;
     margin: 0 auto;
     position: relative; }
+    header .form-inline .search-form input[type="text"]::placeholder{
+      color: #fff;
+    }
     header .form-inline .search-form input[type="text"] {
-      background: #131c21;
+      background: #d1a94f;
       border: none;
       border-radius: 0;
       -webkit-box-shadow: none;
               box-shadow: none;
-      color: #d3d3d3;
+      color: #fff;
       font-size: 16px;
       height: inherit;
       margin-right: 0 !important;
@@ -1196,12 +1219,16 @@ header .form-inline {
 
 .content {
   float: left;
-  padding: 1.875em;
-  width: 100%; }
+  padding:20px;
+  width: 100%; 
+  height: calc(100vh - 188px);
+  overflow: scroll;
+  overflow-x: hidden;
+}
 
 .card {
   margin-bottom: 1.875em;
-  border-radius: 5px;
+  border-radius: 0px;
   padding: 0;
   border: 0px solid transparent;
   -webkit-box-shadow: 0 0 20px rgba(0, 0, 0, 0.08);
@@ -2090,15 +2117,24 @@ header .form-inline {
 
 /* Footer */
 footer.site-footer {
-  padding: 0 1.875em; }
+  position: fixed;
+  left: 0px;
+  right: 0px;
+  bottom: 0px;
+  z-index: 999;
+  background: #b5882d;
+  padding: 20px;
+  box-shadow: 1px 0 20px rgba(0, 0, 0, 0.1);
+
+}
   footer.site-footer .footer-inner {
-    color: #78909c;
+    color: #fff;
+    background-color: #b5882d !important;
     font-family: 'Open Sans';
     font-size: 14px;
-    line-height: 1.5;
-    padding: 2.45em 1.125em; }
+    line-height: 1.5; }
     footer.site-footer .footer-inner a {
-      color: #6a7074; }
+      color: #fff; }
 
 .calender-cont {
   position: relative;
@@ -2335,7 +2371,10 @@ footer.site-footer {
   .card {
     margin-bottom: 1.25em; }
     .card .card-header {
-      position: relative; }
+      position: relative; 
+      background-color: #d1a94f !important;
+      color: #fff !important;
+    }
       .card .card-header strong {
         display: block; }
       .card .card-header small {
@@ -2503,4 +2542,67 @@ footer.site-footer {
     left: inherit !important;
     right: 20px !important; }
 
-/*# sourceMappingURL=style.css.map */
\ No newline at end of file
+/*# sourceMappingURL=style.css.map */
+
+
+.navbar .navbar-nav > .active > a, .navbar .navbar-nav > .active > a:focus, .navbar .navbar-nav > .active > a:hover{
+  color: #d1a94f !important;
+}
+
+.navbar .navbar-nav li.active .menu-icon, .navbar .navbar-nav li:hover .toggle_nav_button:before, .navbar .navbar-nav li .toggle_nav_button.nav-open:before{
+  color: #d1a94f !important;
+}
+
+.btn-primary {
+    color: #fff;
+    background-color: #d1a94f;
+    border-color: #d1a94f;
+    border-radius: 0px;
+}
+
+.btn-primary:hover{
+    color: #fff;
+    background-color: #d1a94f;
+    border-color: #d1a94f;
+    border-radius: 0px;
+}
+
+.form-control{
+  border-radius: 0px !important;
+}
+
+.navbar-nav li a:hover{
+  color: #d1a94f !important;
+}
+
+.navbar-nav li a:focus{
+  color: #d1a94f !important;
+}
+
+.navbar-nav li a:hover .menu-icon{
+  color: #d1a94f !important;
+}
+
+.navbar-nav li a:focus .menu-icon{
+  color: #d1a94f !important;
+}
+
+.navbar-nav li a:hover:before{
+  color: #d1a94f !important;
+}
+
+.navbar-nav li a:focus:before{
+  color: #d1a94f !important;
+}
+
+.card-header{
+  background-color: #d1a94f !important;
+  border-radius: 0px !important;
+}
+
+.card-header strong{
+  color: #fff !important;
+  font-weight: 500;
+} 
+
+
diff --git a/assets/images/favicon.png b/assets/images/favicon.png
index 6bac37b..e99e65e 100644
Binary files a/assets/images/favicon.png and b/assets/images/favicon.png differ
diff --git a/assets/images/logo.png b/assets/images/logo.png
index 756e119..e6c5f7e 100644
Binary files a/assets/images/logo.png and b/assets/images/logo.png differ
diff --git a/assets/images/logo2.png b/assets/images/logo2.png
index 4890d8b..e99e65e 100644
Binary files a/assets/images/logo2.png and b/assets/images/logo2.png differ
diff --git a/assets/js/custom-script.js b/assets/js/custom-script.js
index f5f6feb..0ffbca2 100644
--- a/assets/js/custom-script.js
+++ b/assets/js/custom-script.js
@@ -1,4 +1,7 @@
 jQuery(document).ready(function(){
+
+
+
     jQuery('<div class="overlay"></div>').insertBefore(".content-wrapper");
 });
 
diff --git a/assets/uploads/post_117303.jpg b/assets/uploads/post_117303.jpg
deleted file mode 100644
index 698fc20..0000000
Binary files a/assets/uploads/post_117303.jpg and /dev/null differ
diff --git a/assets/uploads/post_152628.jpg b/assets/uploads/post_152628.jpg
deleted file mode 100644
index 698fc20..0000000
Binary files a/assets/uploads/post_152628.jpg and /dev/null differ
diff --git a/assets/uploads/post_284202.jpg b/assets/uploads/post_284202.jpg
deleted file mode 100644
index 698fc20..0000000
Binary files a/assets/uploads/post_284202.jpg and /dev/null differ
diff --git a/assets/uploads/post_358788.jpg b/assets/uploads/post_358788.jpg
deleted file mode 100644
index 698fc20..0000000
Binary files a/assets/uploads/post_358788.jpg and /dev/null differ
diff --git a/assets/uploads/post_386237.jpg b/assets/uploads/post_386237.jpg
deleted file mode 100644
index 698fc20..0000000
Binary files a/assets/uploads/post_386237.jpg and /dev/null differ
diff --git a/assets/uploads/post_436884.jpg b/assets/uploads/post_436884.jpg
deleted file mode 100644
index d8da1a9..0000000
Binary files a/assets/uploads/post_436884.jpg and /dev/null differ
diff --git a/assets/uploads/post_443283.jpg b/assets/uploads/post_443283.jpg
deleted file mode 100644
index d8da1a9..0000000
Binary files a/assets/uploads/post_443283.jpg and /dev/null differ
diff --git a/assets/uploads/post_453763.jpg b/assets/uploads/post_453763.jpg
deleted file mode 100644
index 698fc20..0000000
Binary files a/assets/uploads/post_453763.jpg and /dev/null differ
diff --git a/assets/uploads/post_456510.jpg b/assets/uploads/post_456510.jpg
deleted file mode 100644
index 3de8d32..0000000
Binary files a/assets/uploads/post_456510.jpg and /dev/null differ
diff --git a/assets/uploads/post_566324.jpg b/assets/uploads/post_566324.jpg
deleted file mode 100644
index 3de8d32..0000000
Binary files a/assets/uploads/post_566324.jpg and /dev/null differ
diff --git a/assets/uploads/post_634025.jpg b/assets/uploads/post_634025.jpg
deleted file mode 100644
index 3de8d32..0000000
Binary files a/assets/uploads/post_634025.jpg and /dev/null differ
diff --git a/assets/uploads/post_656415.jpg b/assets/uploads/post_656415.jpg
deleted file mode 100644
index 3de8d32..0000000
Binary files a/assets/uploads/post_656415.jpg and /dev/null differ
diff --git a/assets/uploads/post_710502.jpg b/assets/uploads/post_710502.jpg
deleted file mode 100644
index d8da1a9..0000000
Binary files a/assets/uploads/post_710502.jpg and /dev/null differ
diff --git a/assets/uploads/post_756280.jpg b/assets/uploads/post_756280.jpg
deleted file mode 100644
index 698fc20..0000000
Binary files a/assets/uploads/post_756280.jpg and /dev/null differ
diff --git a/assets/uploads/post_762515.jpg b/assets/uploads/post_762515.jpg
deleted file mode 100644
index 3de8d32..0000000
Binary files a/assets/uploads/post_762515.jpg and /dev/null differ
diff --git a/assets/uploads/post_786712.jpg b/assets/uploads/post_786712.jpg
deleted file mode 100644
index d8da1a9..0000000
Binary files a/assets/uploads/post_786712.jpg and /dev/null differ
diff --git a/assets/uploads/post_867305.jpg b/assets/uploads/post_867305.jpg
deleted file mode 100644
index d8da1a9..0000000
Binary files a/assets/uploads/post_867305.jpg and /dev/null differ
diff --git a/assets/uploads/post_899909.jpg b/assets/uploads/post_899909.jpg
deleted file mode 100644
index 3de8d32..0000000
Binary files a/assets/uploads/post_899909.jpg and /dev/null differ
diff --git a/assets/uploads/post_908814.jpg b/assets/uploads/post_908814.jpg
deleted file mode 100644
index 3de8d32..0000000
Binary files a/assets/uploads/post_908814.jpg and /dev/null differ
diff --git a/assets/uploads/post_963824.jpg b/assets/uploads/post_963824.jpg
deleted file mode 100644
index d8da1a9..0000000
Binary files a/assets/uploads/post_963824.jpg and /dev/null differ
diff --git a/assets/uploads/post_991947.jpg b/assets/uploads/post_991947.jpg
deleted file mode 100644
index d8da1a9..0000000
Binary files a/assets/uploads/post_991947.jpg and /dev/null differ
diff --git a/uploads/services/1555391456_Access_Logo.png b/uploads/services/1555391456_Access_Logo.png
new file mode 100644
index 0000000..5a2ec5f
Binary files /dev/null and b/uploads/services/1555391456_Access_Logo.png differ
--
libgit2 0.27.1