diff --git a/app/Http/Controllers/API/v1/Admin/AddController.php b/app/Http/Controllers/API/v1/Admin/AddController.php
index f8384f6..905c3ba 100644
--- a/app/Http/Controllers/API/v1/Admin/AddController.php
+++ b/app/Http/Controllers/API/v1/Admin/AddController.php
@@ -31,7 +31,8 @@ class AddController extends Controller
     		'name'  =>  'required|unique:users',
     		'email'  =>  'required|email|unique:users',
     		'password'  =>  'required',
-    		'confirm_password'  =>  'same:password'
+    		'confirm_password'  =>  'same:password',
+			'role'  =>  'required'
     	]);
     }
 }
diff --git a/app/Http/Controllers/API/v1/Election/VoteController.php b/app/Http/Controllers/API/v1/Election/VoteController.php
index 227b352..f3be8e3 100644
--- a/app/Http/Controllers/API/v1/Election/VoteController.php
+++ b/app/Http/Controllers/API/v1/Election/VoteController.php
@@ -32,55 +32,80 @@ class VoteController extends Controller
 
     private function insertVote($request)
     {
-        foreach ($request->vote as $key => $value) {
-            Result::updateOrCreate([
+        // dd($request->vote[0]['nominee_id']);
+        $votes = array_map(function($nominee_id) use($request){
+            return[
                 'voter_id' => Auth::id(),
                 'election_id' => Util::getCurrentElection(),
-                'position_id' => $value['position_id'],
-            ], ['nominee_id' => $value['nominee_id']]);
+                'position_id' => $request->vote[0]['position_id'],
+                'nominee_id' => $nominee_id
+            ];
+
+        },$request->vote[0]['nominee_id']);
+
+        foreach($votes as $vote){
+            Result::updateOrCreate([
+                        'voter_id' => $vote['voter_id'],
+                        'election_id' => $vote['election_id'],
+                        'position_id' => $vote['position_id'],
+                    'nominee_id' => $vote['nominee_id'],
+            ]);
         }
+       
     }
 
     private function validNominee($id, $position_id)
     {
-        return Nominee::where([
-            ['id', '=', $id],
-            ['position_id', '=', $position_id]
-        ])->count();
+        try{
+            $nominee = Nominee::where('position_id', '=', $position_id)->whereIn('id',$id)->count();
+        }catch(Exception $e){
+            dd($id);
+        }
+        return $nominee;
     }
 
     private function isPositionExist($id)
     {
-        return Position::where('id', $id)->count();        
+        try{
+            return Position::where('id', $id)->count();        
+        }catch(Exception $e){
+            dd($id);
+        }
     }
 
     private function voteAllPosition($request)
     {
         $total_position = Position::where('election_id', Util::getCurrentElection())->count();
-        $total_vote = count($request->vote);
+        $total_vote = !empty($request->vote) ? count($request->vote) : 0;
+        
         return $total_vote >= $total_position;
     }
+    
 
     private function validateRequest($request)
     {
         $result['status'] = 'failed';
         $vote = $request->vote;
 
-
+        
 
         /**
          * Check if the user vote on all position
          */
         if (!$this->voteAllPosition($request)) {
+            dd('test');
             $result['message'] = 'You must vote on all position.';
             return $result;
         }
 
-        foreach ($vote as $key => $value) {
+        foreach ($vote as $value) {
             /**
              * Check if position_id and nominee_id has a value
              */
+            // dd($vote,$value);
             if (empty($value['position_id']) || empty($value['nominee_id'])) {
+
+                dd($value,empty($value['position_id']),empty($value['nominee_id']));
                 $result['message'] = 'You must vote on all position.';
                 return $result;
             }
@@ -90,6 +115,7 @@ class VoteController extends Controller
              * Check if the Position you vote exists
              */
             if (!$this->isPositionExist($value['position_id'])) {
+                dd('test');
                 $result['message'] = 'Invalid Position.';
                 return $result;
             } 
@@ -97,8 +123,11 @@ class VoteController extends Controller
             /**
              * Check if the Nominee you vote on certain position exists
              */
-            elseif (!$this->validNominee($value['nominee_id'], $value['position_id'])) {
+            // elseif (!$this->validNominee($value['nominee_id'], $value['position_id'])) {
+                elseif($this->validNominee($value['nominee_id'],$value['position_id']) <= 0){
+
                 $result['message'] = 'Invalid Nominee for '.Position::find($value['position_id'])->name.' position.';
+
                 return $result;
             } 
         }
diff --git a/app/Http/Controllers/API/v1/Voter/LoginController.php b/app/Http/Controllers/API/v1/Voter/LoginController.php
index 5e66643..c42b948 100644
--- a/app/Http/Controllers/API/v1/Voter/LoginController.php
+++ b/app/Http/Controllers/API/v1/Voter/LoginController.php
@@ -149,7 +149,6 @@ class LoginController extends Controller
 			$mobileno = '6' . $tele;
 			$messages = sprintf(config('onewaysms.message'),$tac_token,$date);
 
-			var_dump($mobileno,$messages);
 			$parameter = [
 				'apiusername' => env("ONEWAY_SMS_USERNAME"),
 				'apipassword' => env("ONEWAY_SMS_PASSWORD"),
diff --git a/app/User.php b/app/User.php
index 14dd530..6d3984d 100644
--- a/app/User.php
+++ b/app/User.php
@@ -16,7 +16,7 @@ class User extends Authenticatable
      * @var array
      */
     protected $fillable = [
-        'name', 'email', 'password',
+        'name', 'email', 'password', 'role'
     ];
 
     /**
diff --git a/app/Voter.php b/app/Voter.php
index a055a05..0ccd09e 100644
--- a/app/Voter.php
+++ b/app/Voter.php
@@ -10,5 +10,5 @@ class Voter extends Authenticatable
 	use HasApiTokens;
 
     protected $table = 'voter';
-    protected $fillable = ['name', 'no_kp', 'no_anggota','unit', 'election_id', 'alamat', 'telefon'];
+    protected $fillable = ['name', 'no_kp', 'no_anggota','unit', 'election_id', 'alamat', 'telefon', 'saham', 'yuran'];
 }
diff --git a/config/onewaysms.php b/config/onewaysms.php
index b8ad041..0b908a1 100644
--- a/config/onewaysms.php
+++ b/config/onewaysms.php
@@ -1,7 +1,7 @@
 <?php 
 
 return [
-    'message' => 'KOPERASI : TAC:  %s - %s NOMBOR TAC',
+    'message' => 'KoPKB : %s is your TAC to log in to your myKoPKB Member account. It will expire in 5 minutes.',
     'minutes' => 5
 ];
 
diff --git a/database/migrations/2024_03_23_135849_add_photo_column_to_nominee_table.php b/database/migrations/2024_03_23_135849_add_photo_column_to_nominee_table.php
index 6ed0aca..846bb8e 100644
--- a/database/migrations/2024_03_23_135849_add_photo_column_to_nominee_table.php
+++ b/database/migrations/2024_03_23_135849_add_photo_column_to_nominee_table.php
@@ -3,6 +3,7 @@
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
 
 class AddPhotoColumnToNomineeTable extends Migration
 {
@@ -14,9 +15,16 @@ class AddPhotoColumnToNomineeTable extends Migration
     public function up()
     {
         Schema::table('nominee', function (Blueprint $table) {
-            $table->binary('photo')->nullable();
             $table->dropColumn('image');
         });
+
+        if (Schema::hasColumn('nominee', 'image_path')) {
+            Schema::table('nominee', function (Blueprint $table) {
+                $table->dropColumn('image_path');
+            });
+        }
+
+        DB::statement("ALTER TABLE nominee ADD photo MEDIUMBLOB");
     }
 
     /**
diff --git a/database/migrations/2024_03_24_132333_add_role_to_users_table.php b/database/migrations/2024_03_24_132333_add_role_to_users_table.php
new file mode 100644
index 0000000..e0a99b8
--- /dev/null
+++ b/database/migrations/2024_03_24_132333_add_role_to_users_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddRoleToUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            //
+            $table->string('role', 60)->nullable();
+        });
+
+        // DB::statement("ALTER TABLE nominee ADD photo MEDIUMBLOB");
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            //
+            $table->dropColumn('role');
+        });
+    }
+}
diff --git a/database/migrations/2024_03_26_095932_add_saham_to_voter_table.php b/database/migrations/2024_03_26_095932_add_saham_to_voter_table.php
new file mode 100644
index 0000000..9b30d61
--- /dev/null
+++ b/database/migrations/2024_03_26_095932_add_saham_to_voter_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddSahamToVoterTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('voter', function (Blueprint $table) {
+            //
+            $table->decimal('saham', 9,2);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('voter', function (Blueprint $table) {
+            //
+            $table->dropColumn('saham');
+        });
+    }
+}
diff --git a/database/migrations/2024_03_26_100140_add_yuran_to_voter_table.php b/database/migrations/2024_03_26_100140_add_yuran_to_voter_table.php
new file mode 100644
index 0000000..2695571
--- /dev/null
+++ b/database/migrations/2024_03_26_100140_add_yuran_to_voter_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddYuranToVoterTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('voter', function (Blueprint $table) {
+            //
+            $table->decimal('yuran', 9,2);
+            
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('voter', function (Blueprint $table) {
+            //
+            $table->dropColumn('yuran');
+        });
+    }
+}
diff --git a/resources/assets/js/components/demo/admin/admin/add.vue b/resources/assets/js/components/demo/admin/admin/add.vue
index da25169..e8df930 100644
--- a/resources/assets/js/components/demo/admin/admin/add.vue
+++ b/resources/assets/js/components/demo/admin/admin/add.vue
@@ -1,62 +1,71 @@
 <template>
-<div class="panel panel-default">
-	<div class="panel-body">
-		<form id="add_form" @submit.prevent="add()">
+	<div class="panel panel-default">
+		<div class="panel-body">
+			<form id="add_form" @submit.prevent="add()">
 
-			<div class="form-group">
-				<label for="name">Nama</label>
-				<input type="text" name="name" class="form-control" required/>
-			</div>
+				<div class="form-group">
+					<label for="name">Nama</label>
+					<input type="text" name="name" class="form-control" required />
+				</div>
 
-			<div class="form-group">
-				<label for="email">Email</label>
-				<input type="email" name="email" class="form-control" required/>
-			</div>
+				<div class="form-group">
+					<label for="email">Email</label>
+					<input type="email" name="email" class="form-control" required />
+				</div>
 
-			<div class="form-group">
-				<label for="password">Password</label>
-				<input type="password" name="password" class="form-control" required/>
-			</div>
+				<div class="form-group">
+					<label for="password">Password</label>
+					<input type="password" name="password" class="form-control" required />
+				</div>
 
-			<div class="form-group">
-				<label for="confirm_password">Confirm Password</label>
-				<input type="password" name="confirm_password" class="form-control" required/>
-			</div>
+				<div class="form-group">
+					<label for="confirm_password">Confirm Password</label>
+					<input type="password" name="confirm_password" class="form-control" required />
+				</div>
 
-			<div class="form-group">
-				<input type="submit" value="Submit" class="btn btn-info"/>
-				<router-link :to="{name: 'Manage Account'}" class="btn btn-default">Back</router-link>
-			</div>
+				<div class="form-group">
+					<label for="role">Role</label>
+					<select class="form-control" id="role" name="role"
+						value="" required>
+						<option value="1">Admin</option>
+						<option value="2">Jawatankuasa Audit</option>
+					</select>
+				</div>
 
-		</form>
+				<div class="form-group">
+					<input type="submit" value="Submit" class="btn btn-info" />
+					<router-link :to="{ name: 'Manage Account' }" class="btn btn-default">Back</router-link>
+				</div>
+
+			</form>
+		</div>
 	</div>
-</div>
 </template>
 
 <script>
-export default{
+export default {
 	data: () => ({
 		loading: false
 	}),
 
-	methods:{
+	methods: {
 		add: function () {
 			if (this.loading || !this.isPasswordMatch()) return;
 			var vm = this;
 			this.loading = true;
 			this.util.notify('Adding Admin', 'loading');
-			axios.post(config.API+'admin', $('#add_form').serialize())
-				.then(response=>{
+			axios.post(config.API + 'admin', $('#add_form').serialize())
+				.then(response => {
 					vm.loading = false;
 					$.notifyClose();
 					if (vm.util.showResult(response, 'success')) {
-						vm.$router.push({name: 'Manage Account'});
+						vm.$router.push({ name: 'Manage Account' });
 					}
 				})
-				.catch(error=>{
+				.catch(error => {
 					vm.loading = false;
 					$.notifyClose();
-					vm.util.showResult(error, 'error')	
+					vm.util.showResult(error, 'error')
 				})
 		},
 
@@ -65,6 +74,6 @@ export default{
 			if (!isMatch) this.util.notify('Password not match', 'error');
 			return isMatch;
 		}
-	}	
+	}
 }
 </script>
\ No newline at end of file
diff --git a/resources/assets/js/components/demo/admin/home/index.vue b/resources/assets/js/components/demo/admin/home/index.vue
index 22a0d85..70546a4 100644
--- a/resources/assets/js/components/demo/admin/home/index.vue
+++ b/resources/assets/js/components/demo/admin/home/index.vue
@@ -1,118 +1,142 @@
 <template>
-<div class="panel panel-default">
-	<div class="panel-body">
-		<h4>Undian terkini </h4>
-		<div class="form-group">
-			<button class="btn btn-success" v-if="data.election.status == 1" @click="util.showModal('#start-election-modal')">Start Election</button>
-			
-			<router-link :to="{name: 'Current Result'}" class="btn btn-info" v-if="data.election.status == 2">
-				View Results
-			</router-link>
-			
-			<button class="btn btn-danger" v-if="data.election.status == 2" @click="util.showModal('#stop-election-modal')">End Election</button>	
+	<div class="panel panel-default">
+		<div class="panel-body">
+			<h4> Recent Elections</h4>
+			<div class="form-group">
+				<button class="btn btn-success" v-if="data.election.status == 1 &&  data.user.role==1"
+					@click="util.showModal('#start-election-modal')">Start Election</button>
 
-			<label v-if="data.election.status == 2">Undian telah bermula  {{ start_date }}</label>
+				<router-link :to="{ name: 'Current Result' }" class="btn btn-info" v-if="data.election.status == 2">
+					View Results
+				</router-link>
+
+				<button class="btn btn-danger" v-if="data.election.status == 2"
+					@click="util.showModal('#stop-election-modal')">End Election</button>
+
+				<label v-if="data.election.status == 2">Election has Started {{ start_date }}</label>
+
+			</div>
+
+			<div class="table-responsive">
+				<table class="table table-hover">
+					<thead>
+						<tr>
+							<th>ID</th>
+							<th>Election Name</th>
+							<th>Election Start</th>
+							<th>Election End</th>
+							<th>View</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr v-for="election in data.elections">
+							<td>{{ election.id }}</td>
+							<td>{{ election.name }}</td>
+							<td>{{ election.start }}</td>
+							<td>{{ election.end }}</td>
+							<td>
+								<router-link :to="{ name: 'Election Result', params: { election_id: election.id } }"
+									class="btn btn-info">View Result</router-link>
+							</td>
+						</tr>
+						<tr v-if="data.elections.length < 1">
+							<td colspan="5">No elections yet</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+
+			<form @submit.prevent="start" id="start_form">
+				<div class="modal fade" id="start-election-modal" tabindex="-1" role="dialog"
+					aria-labelledby="start-election-modal" aria-hidden="true">
+					<div class="modal-dialog" role="document">
+						<div class="modal-content">
+							<div class="modal-header">
+								<h5 class="modal-title" id="exampleModalLabel">Start Election</h5>
+								<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+									<span aria-hidden="true">&times;</span>
+								</button>
+							</div>
+							<div class="modal-body">
+								<div class="form-group">
+									<label for="name">Election Name</label>
+									<input type="text" name="name" autocomplete="on" class="form-control" placeholder="(Optional)" />
+								</div>
+
+								<div class="form-group">
+									<label for="password">Confirm Password</label>
+									<input type="password" name="password" class="form-control" required />
+								</div>
+							</div>
+							<div class="modal-footer">
+								<input type="submit" class="btn btn-info" value="Start" />
+								<input type="button" data-dismiss="modal" class="btn btn-default" value="Cancel" />
+							</div>
+						</div>
+					</div>
+				</div>
+			</form>
+
+			<form @submit.prevent="stop" id="stop_form">
+				<div class="modal fade" id="stop-election-modal" tabindex="-1" role="dialog"
+					aria-labelledby="stop-election-modal" aria-hidden="true">
+					<div class="modal-dialog" role="document">
+						<div class="modal-content">
+							<div class="modal-header">
+								<h5 class="modal-title" id="exampleModalLabel">Stop Election</h5>
+								<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+									<span aria-hidden="true">&times;</span>
+								</button>
+							</div>
+							<div class="modal-body">
+								<div class="form-group">
+									<label for="name">Election Name</label>
+									<input type="text" name="name" :value="data.election.name" autocomplete="on" class="form-control" placeholder="(Optional)" />
+								</div>
+
+								<div class="form-group">
+									<label for="password">Confirm Password</label>
+									<input type="password" name="password" autocomplete="on" class="form-control" required />
+								</div>
+							</div>
+							<div class="modal-footer">
+								<input type="submit" class="btn btn-info" value="Stop Election" />
+								<input type="button" data-dismiss="modal" class="btn btn-default" value="Cancel" />
+							</div>
+						</div>
+					</div>
+				</div>
+			</form>
 
 		</div>
-
-		<div class="table-responsive">
-			<table class="table table-hover">
-				<thead>
-					<tr>
-						<th>ID</th>
-						<th>Nama Pengundi</th>
-						<th>Undian Mula </th>
-						<th>Undian Tamat</th>
-						<th>Papar</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="election in data.elections">
-						<td>{{ election.id }}</td>
-						<td>{{ election.name }}</td>
-						<td>{{ election.start}}</td>
-						<td>{{ election.end}}</td>
-						<td>
-							<router-link :to="{name: 'Election Result', params:{election_id:election.id}}" class="btn btn-info">View Result</router-link></td>
-					</tr>
-					<tr v-if="data.elections.length < 1">
-						<td colspan="5">No elections yet</td>
-					</tr>
-				</tbody>
-			</table>
-		</div>
-
-		<form @submit.prevent="start" id="start_form">
-		<modal id="start-election-modal">
-			<modal-header>Start Election</modal-header>
-			<modal-body>
-				<div class="form-group">
-					<label for="name">Election Name</label>
-					<input type="text" name="name" class="form-control" placeholder="(Optional)"/>
-				</div>
-				<div class="form-group">
-					<label for="password">Confirm Password</label>
-					<input type="password" name="password" class="form-control" required/>
-				</div>
-			</modal-body>
-			<modal-footer>
-				<input type="submit" class="btn btn-info" value="Start"/>
-				<input type="button" data-dismiss="modal" class="btn btn-default" value="Cancel"/>
-			</modal-footer>
-		</modal>
-		</form>
-
-		<form @submit.prevent="stop" id="stop_form">
-		<modal id="stop-election-modal">
-			<modal-header>Stop Election</modal-header>
-			<modal-body>
-
-				<div class="form-group">
-					<label for="name">Election Name</label>
-					<input type="text" name="name" :value="data.election.name" class="form-control" placeholder="(Optional)"/>
-				</div>
-
-				<div class="form-group">
-					<label for="password">Sahkan Kata Laluan</label>
-					<input type="password" name="password" class="form-control" required/>
-				</div>
-			</modal-body>
-			<modal-footer>
-				<input type="submit" class="btn btn-danger" value="Stop Election"/>
-				<input type="button" class="btn btn-default" data-dismiss="modal" value="Cancel"/>
-			</modal-footer>
-		</modal>
-		</form>
-
 	</div>
-</div>
 </template>
 
 <script>
-export default{
-	data: ()=>({
+export default {
+	data: () => ({
 		start_date: null
 	}),
 	created: function () {
 		this.refreshElection();
 		var vm = this;
-		setInterval(()=>{
+		setInterval(() => {
 			vm.start_date = moment(vm.data.election.start).fromNow();
-		},1000);
+		}, 1000);
 	},
 
 	methods: {
 
 		stop: function () {
 			var vm = this;
-			this.util.hideModal('#stop-election-modal');
+			// this.util.hideModal('#stop-election-modal');
 			this.util.notify('Stopping Election', 'loading');
-			axios.post(config.API+'election/stop', $('#stop_form').serialize())
-				.then(response=>{
+			axios.post(config.API + 'election/stop', $('#stop_form').serialize())
+				.then(response => {
 					$.notifyClose();
-					if (vm.util.showResult(response,'success')) {
+					if (vm.util.showResult(response, 'success')) {
 						vm.refreshElection();
-						vm.data.election =response.data.election;
+						vm.data.election = response.data.election;
 						vm.data.positions = [];
 						vm.data.partylists = [];
 						vm.data.voters = [];
@@ -120,7 +144,7 @@ export default{
 						vm.data.results = [];
 					}
 				})
-				.catch(error=>{
+				.catch(error => {
 					$.notifyClose();
 					vm.util.showResult(error, 'error');
 				})
@@ -128,31 +152,32 @@ export default{
 
 		start: function () {
 			var vm = this;
-			this.util.hideModal('#start-election-modal');
+			// this.util.hideModal('#start-election-modal');
+			console.log('this');
 			this.util.notify('Loading please wait', 'loading');
-			axios.post(config.API+'election/start', $('#start_form').serialize())
-				.then(response=>{
+			axios.post(config.API + 'election/start', $('#start_form').serialize())
+				.then(response => {
 					$.notifyClose();
-					if(vm.util.showResult(response, 'success')){
+					if (vm.util.showResult(response, 'success')) {
 						vm.refreshElection();
 						vm.data.election = response.data.election;
 					}
 				})
-				.catch(error=>{
+				.catch(error => {
 					$.notifyClose();
 					vm.util.showResult(error, 'error');
 				})
 		},
 
-		refreshElection: function(){		
+		refreshElection: function () {
 			this.util.notify('Refreshing Election', 'loading');
 			var vm = this;
-			axios.get(config.API+'election')
-				.then(response=>{
+			axios.get(config.API + 'election')
+				.then(response => {
 					$.notifyClose();
 					vm.data.elections = response.data;
 				})
-				.catch(error=>{
+				.catch(error => {
 					$.notifyClose();
 					vm.util.showResult(error, 'error');
 				})
diff --git a/resources/assets/js/components/demo/admin/index.vue b/resources/assets/js/components/demo/admin/index.vue
index 218966c..cb46a9c 100644
--- a/resources/assets/js/components/demo/admin/index.vue
+++ b/resources/assets/js/components/demo/admin/index.vue
@@ -14,22 +14,21 @@
 				<div class="collapse navbar-collapse" id="myNavbar">
 
 					<ul class="nav navbar-nav">
-
+						<!-- {{ users }} -->
 						<router-link :to="{name: 'Admin Home'}" tag="li" exact><a href="#">Home</a></router-link>
-						
-						<router-link :to="{name: 'Kemaskini Jawatan'}" tag="li">
+						<router-link :to="{name: 'Kemaskini Jawatan'}" v-if="data.user.role==1" tag="li">
 							<a href="#">Jawatan</a>
 						</router-link>
 						
-						<router-link :to="{name: 'Manage Partylist'}" tag="li">
+						<router-link :to="{name: 'Manage Partylist'}"  v-if="data.user.role==1" tag="li">
 							<a href="#">Manage Partylist</a>
 						</router-link>
 
-						<router-link :to="{name: 'Manage Voter'}" tag="li">
+						<router-link :to="{name: 'Manage Voter'}"  v-if="data.user.role==1" tag="li">
 							<a href="#">Anggota Koperasi</a>
 						</router-link>
 
-						<router-link :to="{name: 'Maklumat Calon'}" tag="li">
+						<router-link :to="{name: 'Maklumat Calon'}"  v-if="data.user.role==1" tag="li">
 							<a href="#">Calon</a>
 						</router-link>
 
@@ -75,9 +74,10 @@
 <script>
 export default{
 
-	data: () =>({
-		loading: true
-	}),
+	// data: () =>({
+	// 	loading: true,
+	// 	users:{'roles' : 1},
+	// }),
 
 	created: function () {
 		this.util.setTitle('Voting System - Administrator');
diff --git a/resources/assets/js/components/demo/admin/voter/add.vue b/resources/assets/js/components/demo/admin/voter/add.vue
index 5f4e828..e631ed0 100644
--- a/resources/assets/js/components/demo/admin/voter/add.vue
+++ b/resources/assets/js/components/demo/admin/voter/add.vue
@@ -34,6 +34,16 @@
 				<input type="text" name="telefon" class="form-control" required>
 			</div>
 
+			<div class="form-group">
+				<label for="saham">Saham</label>
+				<input type="text" name="saham" class="form-control" required>
+			</div>
+
+			<div class="form-group">
+				<label for="yuran">Yuran</label>
+				<input type="text" name="yuran" class="form-control" required>
+			</div>
+
 			<div class="form-group">
 				<button type="submit" class="btn btn-success">Submit</button>
 				<router-link :to="{name: 'Manage Voter'}" class="btn btn-default">Back</router-link>
diff --git a/resources/assets/js/components/demo/admin/voter/index.vue b/resources/assets/js/components/demo/admin/voter/index.vue
index b44b86c..ef38799 100644
--- a/resources/assets/js/components/demo/admin/voter/index.vue
+++ b/resources/assets/js/components/demo/admin/voter/index.vue
@@ -20,6 +20,8 @@
 						<th>No. Kad Pengenalan</th>
 						<th>No. Anggota</th>
 						<th>Unit</th>
+						<th>Saham</th>
+						<th>Yuran</th>
 						<th>Action</th>
 					</tr>
 				</thead>
@@ -29,6 +31,8 @@
 						<td>{{ voter.no_kp }}</td>
 						<td>{{ voter.no_anggota }}</td>
 						<td>{{ voter.unit }}</td>
+						<td>{{ voter.saham }}</td>
+						<td>{{ voter.yuran }}</td>
 						<td>
 							<button class="btn btn-info" @click="edit(i)">
 								<i class="fa fa-edit"></i> Edit
diff --git a/resources/assets/js/components/demo/voter/home/index.vue b/resources/assets/js/components/demo/voter/home/index.vue
index 0492a6f..6045a95 100644
--- a/resources/assets/js/components/demo/voter/home/index.vue
+++ b/resources/assets/js/components/demo/voter/home/index.vue
@@ -7,6 +7,8 @@
 			<li class="list-group-item"><b>No. Anggota : </b>{{ data.user.no_anggota }}</li>
 			<li class="list-group-item"><b>Nama : </b>{{ data.user.name }}</li>
 			<li class="list-group-item"><b>Unit : </b>{{ data.user.unit }}</li>
+			<li class="list-group-item"><b>Saham : </b>{{ data.user.saham }}</li>
+			<li class="list-group-item"><b>Yuran : </b>{{ data.user.yuran }}</li>
 			<li class="list-group-item" v-if="data.election.status==1">
 				<center>Undian belum bermula</center>
 			</li>
diff --git a/resources/assets/js/components/demo/voter/home/vote.vue b/resources/assets/js/components/demo/voter/home/vote.vue
index 1724480..210261c 100644
--- a/resources/assets/js/components/demo/voter/home/vote.vue
+++ b/resources/assets/js/components/demo/voter/home/vote.vue
@@ -1,69 +1,89 @@
 <template>
-<div class="row col-md-10 col-md-offset-1">
-	<div class="col-md-4">
-		<h4>Maklumat Undian</h4><hr/>
-		<ul class="list-group">
-			<li class="list-group-item" v-for="position in data.positions">
-				<b>{{ position.name }} : </b>{{ getName(position.id) }}
-			</li>
-			<li class="list-group-item">
-				<center>
-					<button class="btn btn-success" @click="util.showModal('#vote-modal')">Submit Vote</button>
-					<button class="btn btn-default" @click="reset()">Reset</button>
-				</center>
-			</li>
-		</ul>
-	</div>
-	<div class="col-md-8">
-		<h4>Pilih Calon </h4><hr/>
-		<div class="panel panel-info" v-for="position in data.positions">
-			<div class="panel-heading">{{ position.name }}</div>
-			<div class="panel-body table-responsive">
-				<table class="table table-hover">
-					<thead>
-						<tr>
-							<th></th>
-							<th>Nama</th>
-							<th>Partylist</th>
-							<th>Unit</th>
-						</tr>
-					</thead>
-					<tbody>
-						<tr v-for="nominee in data.nominees" v-if="nominee.position_id==position.id" @click="vote(position.id,nominee.id)">
-							<td><input type="radio" :name="position.id" :id="nominee.id"/></td>
-							<td>{{ nominee.name }}</td>
-							<td>{{ getPartylist(nominee.partylist_id) }}</td>
-							<td>{{ nominee.unit }}</td>
-						</tr>
-					</tbody>
-				</table>
+	<div class="row col-md-10 col-md-offset-1">
+		<div class="col-md-4">
+			<h4>Maklumat Undian</h4>
+			<hr />
+			<ul class="list-group">
+				<li class="list-group-item" v-for="position in data.positions">
+					<b>{{ position.name }} : </b>{{ getName(position.id) }}
+				</li>
+
+				<!-- <ul class="list-group">
+					<li class="list-group-item" v-for="result in data.result">
+						<b>{{ getPosition(result.position_id) }} : </b>{{ getNominee(result.nominee_id) }}
+					</li>
+				</ul> -->
+
+				<li class="list-group-item">
+					<center>
+						<button class="btn btn-success" @click="util.showModal('#vote-modal')">Submit Vote</button>
+						<button class="btn btn-default" @click="reset()">Reset</button>
+					</center>
+				</li>
+			</ul>
+		</div>
+		<div class="col-md-8">
+			<h4>Pilih Calon</h4>
+			<hr />
+			<div class="panel panel-info" v-for="position in data.positions">
+				<div class="panel-heading">{{ position.name }}</div>
+				<div class="panel-body table-responsive">
+					<table class="table table-hover">
+						<thead>
+							<tr>
+								<th></th>
+								<th>Name</th>
+								<th>No. Anggota</th>
+								<th>Unit</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(nominee, index) in data.nominees" v-if="nominee.position_id == position.id"
+								:key="nominee.id">
+								<td><input type="checkbox" :id="nominee.id" @change="vote(position.id, nominee.id)" />
+								</td>
+								<td>{{ nominee.name }}</td>
+								<td>{{ nominee.no_anggota }}</td>
+								<td>{{ nominee.unit }}</td>
+							</tr>
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+
+		<div class="modal" id="vote-modal" tabindex="-2" role="dialog" aria-labelledby="exampleModalLabel"
+			aria-hidden="true">
+			<div class="modal-dialog" role="document">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h5 class="modal-title" id="exampleModalLabel">AGM</h5>
+						<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+							<span aria-hidden="true">&times;</span>
+						</button>
+					</div>
+					<div class="modal-body">
+						<h3>Nota: You can only vote once, so vote wisely.</h3>
+					</div>
+					<div class="modal-footer">
+						<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+						<button type="button" class="btn btn-primary" @click="submit()">Submit Vote</button>
+					</div>
+				</div>
 			</div>
 		</div>
 	</div>
-
-	<modal id="vote-modal">
-		<modal-header>UNDIAN</modal-header>
-		<modal-body>
-			<h3>Note: You can only vote once, so vote wisely.</h3>
-		</modal-body>
-		<modal-footer>
-			<button class="btn btn-success" @click="submit()">Submit Vote</button>
-			<button class="btn btn-default" data-dismiss="modal">Cancel</button>
-		</modal-footer>
-	</modal>
-
-</div>
 </template>
 
 <script>
-export default{
+export default {
 	created: function () {
-		if (this.data.result.length > 0 || this.data.election.status != 2) 
-			this.$router.push({name: 'Voter Home'})
+		if (this.data.result.length > 0 || this.data.election.status != 2)
+			this.$router.push({ name: 'Voter Home' })
 		for (var i in this.data.positions) {
 			this.selected.push({
-				position_id: this.data.positions[i]['id'], 
-				nominee_id: null, 
+				position_id: this.data.positions[i]['id'],
+				nominee_id: [],
 			});
 		}
 	},
@@ -71,39 +91,56 @@ export default{
 	data: function () {
 		return {
 			selected: [],
-			name: {}
+			name: {},
+			selectedNominees: {
+			},
 		}
 	},
 
 	methods: {
-
+		test: function () {
+			console.log('tab');
+			this.util.showModal('#vote-modal')
+		},
 		submit: function () {
-			this.util.hideModal('#vote-modal');
-			if (this.hasNullVote()) return;
+			if (Object.keys(this.selected).length === 0) {
+				// No selections made
+				this.util.notify('Please select at least one nominee.', 'error');
+				return;
+			}
+
 			var vm = this;
 			this.util.notify('Submitting your vote, please wait...', 'loading');
-			let data = {};
-			data['vote'] = this.selected;
-			axios.post(config.API+'election/vote', data)
-				.then(response=>{
-					$.notifyClose();
-					if (vm.util.showResult(response, 'success')){
-						vm.data.result = response.data.result;
-						vm.$router.push({name: 'Voter Home'});
-					}
+			console.log(this.selected)
+			// Prepare data to send to the server
+			let data = {
+				vote: this.selected
+			};
 
+			// Log the data to ensure it's correctly formatted
+			console.log(data);
+
+			// Send a POST request to the server
+			axios.post(config.API + 'election/vote', data)
+				.then(response => {
+					$.notifyClose();
+					if (vm.util.showResult(response, 'success')) {
+						vm.data.result = response.data.result;
+						vm.$router.push({ name: 'Voter Home' });
+                        $('.modal').modal('hide');
+					}
 				})
-				.catch(error=>{
+				.catch(error => {
 					$.notifyClose();
 					vm.util.showResult(error, 'error');
-				})
-
+				});
 		},
 
 		hasNullVote: function () {
-			let selected = this.selected;
-			for (var i in selected) 
-				if (selected[i]['nominee_id'] == null){
+			console.log('null' + this.selectedNominees);
+			let selected = this.selectedNominees;
+			for (var i in selected)
+				if (selected[i]['nominee_id'] == null) {
 					this.util.notify('You must vote on all position', 'error');
 					return true;
 				}
@@ -111,42 +148,62 @@ export default{
 		},
 
 		reset: function () {
-			let selected = this.selected;
-			for (var i in selected){
-				$('#'+selected[i]['nominee_id']).selected(false);
+			console.log(this.selectedNominees);
+			let selected = this.selectedNominees;
+			for (var i in selected) {
+				$('#' + selected[i]['nominee_id']).selected(false);
 				selected[i]['nominee_id'] = null;
 			}
 		},
 
 		vote: function (position_id, nominee_id) {
-			$('#'+nominee_id).selected();
-			for (var i in this.selected)
-				if (this.selected[i]['position_id'] == position_id) {
-					this.selected[i]['nominee_id'] = nominee_id;
-				}
+			if (!this.selected[0]['position_id']) {
+				this.$set(this.selected[0], position_id, []);
+			}
+			const index = this.selected[0]['nominee_id'].indexOf(nominee_id);
+			if (index === -1) {
+				// Nominee not found, add it
+				this.selected[0]['nominee_id'].push(nominee_id);
+			} else {
+				// Nominee found, remove it
+				this.selected[0]['nominee_id'].splice(index, 1);
+			}
+			console.log(this.selected[0])
 		},
 
 		getName: function (id) {
 			let positions = this.data.positions;
 			let selected = this.selected;
-			for (var i in selected) 
-				if (selected[i]['position_id'] == id) 
+			for (var i in selected)
+				if (selected[i]['position_id'] == id)
 					return this.getNominee(selected[i]['nominee_id']);
 			return '';
 		},
 
 		getNominee: function (id) {
+			let positions = this.data.positions;
 			let nominees = this.data.nominees;
 			for (var i in nominees)
-				if (nominees[i]['id'] == id) return nominees[i]['name'];
+				if (nominees[i]['id']==id) return nominees[i].name;
+			return '';
 		},
 
+		// getNominee: function (id) {
+		// 	let nominees = this.data.nominees;
+		// 	for (var i in nominees)
+		// 		if (nominees[i]['id'] == id) return nominees[i]['name'];
+		// },
+
 		getPartylist: function (id) {
 			let partylists = this.data.partylists;
 			for (var i in partylists)
-				if (partylists[i]['id']==id) return partylists[i]['name'];
+				if (partylists[i]['id'] == id) return partylists[i]['name'];
 			return 'No Partylist';
-		}
+		},
+
+		// uncheck: function (checkedName) {
+		// 	this.checkedName = this.checkedNames.filter(name => name !== checkedName);
+		// }
 	}
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/assets/js/components/demo/voter/index.vue b/resources/assets/js/components/demo/voter/index.vue
index 61aea34..3ef9650 100644
--- a/resources/assets/js/components/demo/voter/index.vue
+++ b/resources/assets/js/components/demo/voter/index.vue
@@ -27,12 +27,12 @@
 							<a href="#">Pautan Zoom</a>
 						</router-link>
 
-						<router-link :to="{name: 'Vote'}" v-if="data.election.status==2 && !hasVoted()" tag="li" exact>
-							<a href="#">Vote</a>
+						<router-link :to="{name: 'Vote'}" v-if="data.election.status==2 && data.user.saham >= 500 && !hasVoted()" tag="li" exact>
+							<a href="#">Undian</a>
 						</router-link>	
 
 						<router-link :to="{name: 'Result'}" v-if="data.election.status==2 && hasVoted()" tag="li">
-							<a href="#">Results</a>
+							<a href="#">Keputusan</a>
 						</router-link>					
 
 					</ul>
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 2b880b9..8bd92ee 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+
 <head lang="en">
 	<meta charset="UTF-8">
 	<title>MyKoPKB == eVoting System</title>
@@ -10,32 +11,40 @@
 
 
 </head>
+
 <body>
 
-<div id="app">
-	<router-view></router-view>
-</div>
+    <div id="app">
+        <router-view></router-view>
+    </div>
 
-<div id="error"></div>
+    <div id="error"></div>
 
-<script>
-	window.config = {
-		"API":"/api/v1/", //URL OF YOUR API LOCATED
-		"baseURL":"/", //URL OF YOUR WEBSITE
-		"storageURL":"{{ config('app.cloudinary_enabled') ? '' : '/storage/' }}", //URL WHERE YOUR IMAGES and OTHER FILEs stored
-		"debug": {{ env('APP_DEBUG') }}
-	}
-</script>
-<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js" integrity="sha384-aJ21OjlMXNL5UyIl/XNwTMqvzeRMZH2w8c5cRVpzpU8Y5bApTppSuUkhZXN0VxHd" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/vue@2.6.14"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/axios/0.21.1/axios.min.js" integrity="sha512-bZS47S7sPOxkjU/4Bt0zrhEtWx0y0CRkhEp8IckzK+ltifIIE9EMIMTuT/mEzoIMewUINruDBIR/jJnbguonqQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script src="https://cdn.jsdelivr.net/npm/bootstrap-notify@3.1.3/bootstrap-notify.min.js" integrity="sha256-DRllCE/8rrevSAnSMWB4XO3zpr+3WaSuqUSNLD5NAzg=" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/jquery-form@4.3.0/dist/jquery.form.min.js" integrity="sha256-3TKcZElR88BBIA6CeePJAGOsW1yIYf4lP8pI333YuZw=" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/jquery-flot@0.8.3/jquery.flot.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/jquery-flot@0.8.3/jquery.flot.pie.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/moment@2.29.1/moment.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/vue-router@3.4.9/dist/vue-router.min.js"></script>
-<script src="/js/app.js"></script>
+    <script>
+        window.config = {
+            "API": "/api/v1/", //URL OF YOUR API LOCATED
+            "baseURL": "/", //URL OF YOUR WEBSITE
+            "storageURL": "{{ config('app.cloudinary_enabled') ? '' : '/storage/' }}", //URL WHERE YOUR IMAGES and OTHER FILEs stored
+            "debug": {{ env('APP_DEBUG') }}
+        }
+    </script>
+    <script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"
+        integrity="sha384-aJ21OjlMXNL5UyIl/XNwTMqvzeRMZH2w8c5cRVpzpU8Y5bApTppSuUkhZXN0VxHd" crossorigin="anonymous">
+    </script>
+    <script src="https://cdn.jsdelivr.net/npm/vue@2.6.14"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/axios/0.21.1/axios.min.js"
+        integrity="sha512-bZS47S7sPOxkjU/4Bt0zrhEtWx0y0CRkhEp8IckzK+ltifIIE9EMIMTuT/mEzoIMewUINruDBIR/jJnbguonqQ=="
+        crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap-notify@3.1.3/bootstrap-notify.min.js"
+        integrity="sha256-DRllCE/8rrevSAnSMWB4XO3zpr+3WaSuqUSNLD5NAzg=" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jquery-form@4.3.0/dist/jquery.form.min.js"
+        integrity="sha256-3TKcZElR88BBIA6CeePJAGOsW1yIYf4lP8pI333YuZw=" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jquery-flot@0.8.3/jquery.flot.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jquery-flot@0.8.3/jquery.flot.pie.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/moment@2.29.1/moment.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vue-router@3.4.9/dist/vue-router.min.js"></script>
+    <script src="/js/app.js"></script>
 </body>
+
 </html>