diff --git a/resources/assets/js/components/demo/admin/home/final.vue b/resources/assets/js/components/demo/admin/home/final.vue
index 2ad3ea0..9fee8a5 100644
--- a/resources/assets/js/components/demo/admin/home/final.vue
+++ b/resources/assets/js/components/demo/admin/home/final.vue
@@ -11,7 +11,7 @@
 								<th width="10%">No. Anggota</th>
 								<th width="30%">Name</th>
 								<th width="20%">Partylist</th>
-								<th width="20%">Course</th>
+								<th width="20%">Unit</th>
 								<th width="20%">Votes</th>
 							</tr>
 						</thead>
@@ -20,14 +20,14 @@
 								<td>{{ getNominee(result.nominee_id)['student_id'] }}</td>
 								<td>{{ getNominee(result.nominee_id)['name'] }}</td>
 								<td>{{ getPartylist(getNominee(result.nominee_id)['partylist_id']) }}</td>
-								<td>{{ getNominee(result.nominee_id)['course'] }}</td>
+								<td>{{ getNominee(result.nominee_id)['Unit'] }}</td>
 								<td>{{ result.votes}}</td>
 							</tr>
 							<tr v-for="no_vote in no_votes" v-if="no_vote.position_id==position.id">
 								<td>{{ no_vote.student_id }}</td>
 								<td>{{ no_vote.name }}</td>
 								<td>{{ getPartylist(no_vote.partylist_id) }}</td>
-								<td>{{ no_vote.course }}</td>
+								<td>{{ no_vote.unit }}</td>
 								<td>0</td>
 							</tr>
 						</tbody>
diff --git a/resources/assets/js/components/demo/admin/nominee/add.vue b/resources/assets/js/components/demo/admin/nominee/add.vue
index 179e04b..b8dc692 100644
--- a/resources/assets/js/components/demo/admin/nominee/add.vue
+++ b/resources/assets/js/components/demo/admin/nominee/add.vue
@@ -1,76 +1,72 @@
 <template>
-<div class="panel panel-default">
-	<div class="panel-body">
-		<form 
-			class="row" 
-			method="POST" 
-			id="add_form"
-			:action="data.API+'nominee'" 
-			enctype="mutlipart/formdata"
-			@submit.prevent="add()">
-			<div class="col-md-4">
-				<uploader file-name="image" />
-			</div>	
+	<div class="panel panel-default">
+		<div class="panel-body">
+			<form class="row" method="POST" id="add_form" :action="data.API + 'nominee'" enctype="mutlipart/formdata"
+				@submit.prevent="add()">
+				<div class="col-md-8">
 
-			<div class="col-md-8">
+					<div class="form-group">
+						<label for="name">Nama Calon</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 class="form-group">
+						<label for="student_id">No. Anggota</label>
+						<input type="text" name="student_id" class="form-control" required />
+					</div>
+
+					<div class="form-group">
+						<label for="Unit">Unit</label>
+						<input type="text" name="Unit" class="form-control" required />
+					</div>
+
+					<div class="form-group">
+						<label for="motto">Motto</label>
+						<input type="text" name="motto" class="form-control" placeholder="(Optional)" />
+					</div>
+
+					<div class="form-group">
+						<label for="description">Description</label>
+						<textarea name="description" class="form-control" placeholder="(Optional)"></textarea>
+					</div>
+
+					<div class="form-group">
+						<label for="position_id">Position</label>
+						<select class="form-control" v-model="position_id" name="position_id" required>
+							<option value="0" disabled>--- Select Position ---</option>
+							<option v-for="position in data.positions" :value="position.id">{{ position.name }}</option>
+						</select>
+					</div>
+
+					<div class="form-group">
+						<label for="partylist_id">Partylist</label>
+						<select class="form-control" name="partylist_id">
+							<option value="">--- Select Partylist (Optional) ---</option>
+							<option v-for="partylist in data.partylists" :value="partylist.id">{{ partylist.name }}</option>
+						</select>
+					</div>
+
+					<div>
+						<label for="image">Masukkan Gambar</label>
+						<input type="file" accept="image/*" @change="uploadImage($event)" id="file-input">
+					</div>
+
+
+					<div class="form-group pull-right">
+						<input type="submit" value="Submit" class="btn btn-info">
+						<router-link :to="{ name: 'Maklumat Calon', query: { position_id: position_id } }"
+							class="btn btn-default">
+							Submit
+						</router-link>
+					</div>
 				</div>
-
-				<div class="form-group">
-					<label for="student_id">No. Anggota</label>
-					<input type="text" name="student_id" class="form-control" required/>
-				</div>
-
-				<div class="form-group">
-					<label for="course">Course</label>
-					<input type="text" name="course" class="form-control" required/>
-				</div>
-
-				<div class="form-group">
-					<label for="motto">Motto</label>
-					<input type="text" name="motto" class="form-control" placeholder="(Optional)" />
-				</div>
-
-				<div class="form-group">
-					<label for="description">Description</label>
-					<textarea name="description" class="form-control" placeholder="(Optional)"></textarea>
-				</div>
-
-				<div class="form-group">
-					<label for="position_id">Position</label>
-					<select class="form-control" v-model="position_id" name="position_id" required>
-						<option value="0" disabled>--- Select Position ---</option>
-						<option v-for="position in data.positions" :value="position.id">{{ position.name }}</option>
-					</select>
-				</div>
-
-				<div class="form-group">
-					<label for="partylist_id">Partylist</label>
-					<select class="form-control" name="partylist_id">
-						<option value="">--- Select Partylist (Optional) ---</option>
-						<option v-for="partylist in data.partylists" :value="partylist.id">{{ partylist.name}}</option>
-					</select>
-				</div>
-
-				<div class="form-group pull-right">
-					<input type="submit" value="Submit" class="btn btn-info">
-					<router-link 
-						:to="{name:'Maklumat Calon', query:{position_id:position_id}}" 
-						class="btn btn-default">
-						Submit
-					</router-link>
-				</div>
-			</div>
-		</form>
+			</form>
+		</div>
 	</div>
-</div>
 </template>
 
 <script>
-export default{
+export default {
 	data: function () {
 		return {
 			loading: false
@@ -87,8 +83,8 @@ export default{
 				success: function (response) {
 					$.notifyClose();
 					vm.loading = false;
-					if (vm.util.showResult(response, 'success', 'ajax')) 
-						vm.$router.push({name: 'Maklumat Calon'});
+					if (vm.util.showResult(response, 'success', 'ajax'))
+						vm.$router.push({ name: 'Maklumat Calon' });
 				},
 				error: function (error) {
 					$.notifyClose();
@@ -99,6 +95,31 @@ export default{
 					vm.util.notify('Adding Nominee', 'progress', progress);
 				}
 			})
+		},
+
+		uploadImage(event) {
+
+			const URL = 'http://foobar.com/upload';
+
+			let data = new FormData();
+			data.append('name', 'my-picture');
+			data.append('file', event.target.files[0]);
+
+			let config = {
+				header: {
+					'Content-Type': 'image/png'
+				}
+			}
+
+			axios.put(
+				URL,
+				data,
+				config
+			).then(
+				response => {
+					console.log('image upload response > ', response)
+				}
+			)
 		}
 	},
 
@@ -109,7 +130,7 @@ export default{
 			},
 
 			set: function (id) {
-				this.$router.replace({query: {position_id: id}});
+				this.$router.replace({ query: { position_id: id } });
 			}
 		}
 	}
diff --git a/resources/assets/js/components/demo/admin/nominee/edit.vue b/resources/assets/js/components/demo/admin/nominee/edit.vue
index 5ce07e1..101a606 100644
--- a/resources/assets/js/components/demo/admin/nominee/edit.vue
+++ b/resources/assets/js/components/demo/admin/nominee/edit.vue
@@ -27,8 +27,8 @@
 				</div>
 
 				<div class="form-group">
-					<label for="course">Course</label>
-					<input type="text" name="course" class="form-control" :value="nominee.course" required/>
+					<label for="Unit">Unit</label>
+					<input type="text" name="unit" class="form-control" :value="nominee.Unit" required/>
 				</div>
 
 				<div class="form-group">
diff --git a/resources/assets/js/components/demo/admin/nominee/index.vue b/resources/assets/js/components/demo/admin/nominee/index.vue
index 0f99edd..a6f6594 100644
--- a/resources/assets/js/components/demo/admin/nominee/index.vue
+++ b/resources/assets/js/components/demo/admin/nominee/index.vue
@@ -34,7 +34,7 @@
 						<th></th>
 						<th>Name</th>
 						<th>No. Anggota</th>
-						<th>Course</th>
+						<th>Unit</th>
 						<th>Position</th>
 						<th>Partylist</th>
 						<th>Action</th>
@@ -47,7 +47,7 @@
 						</td>
 						<td>{{ nominee.name}}</td>
 						<td>{{ nominee.student_id}}</td>
-						<td>{{ nominee.course}}</td>
+						<td>{{ nominee.unit}}</td>
 						<td>{{ nominee.position}}</td>
 						<td>{{ nominee.partylist}}</td>
 						<td>
diff --git a/resources/assets/js/components/demo/admin/voter/add.vue b/resources/assets/js/components/demo/admin/voter/add.vue
index 62df52d..5f4e828 100644
--- a/resources/assets/js/components/demo/admin/voter/add.vue
+++ b/resources/assets/js/components/demo/admin/voter/add.vue
@@ -4,18 +4,34 @@
 		<h4>Tambah Pengundi</h4>
 		<form @submit.prevent="add()" id="add-form">
 			<div class="form-group">
-				<label for="name">Nama</label>
+				<label for="name">Nama Anggota</label>
 				<input type="text" name="name" class="form-control" required>
 			</div>
 
 			<div class="form-group">
-				<label for="student_id">No. Anggota</label>
-				<input type="text" name="student_id" class="form-control" required>
+				<label for="no_kp">No. Kad Pengenalan</label>
+				<input type="text" name="no_kp" class="form-control" required>
 			</div>
 
 			<div class="form-group">
-				<label for="course">Course</label>
-				<input type="text" name="course" class="form-control" required>
+				<label for="no_anggota">No. Anggota</label>
+				<input type="text" name="no_anggota" class="form-control" required>
+			</div>
+
+
+			<div class="form-group">
+				<label for="unit">Unit</label>
+				<input type="text" name="unit" class="form-control" required>
+			</div>
+
+			<div class="form-group">
+				<label for="alamat">Alamat</label>
+				<input type="text" name="alamat" class="form-control" required>
+			</div>
+
+			<div class="form-group">
+				<label for="telefon">No. Telefon</label>
+				<input type="text" name="telefon" class="form-control" required>
 			</div>
 
 			<div class="form-group">
diff --git a/resources/assets/js/components/demo/admin/voter/edit.vue b/resources/assets/js/components/demo/admin/voter/edit.vue
index 7f39251..e79e6eb 100644
--- a/resources/assets/js/components/demo/admin/voter/edit.vue
+++ b/resources/assets/js/components/demo/admin/voter/edit.vue
@@ -9,13 +9,13 @@
 			</div>
 
 			<div class="form-group">
-				<label for="student_id">No. Anggota</label>
-				<input type="text" name="student_id" class="form-control" :value="data.voter.student_id" required/>
+				<label for="no_kp">No. Kad Pengenalan</label>
+				<input type="text" name="no_kp" class="form-control" :value="data.voter.no_kp" required/>
 			</div>
 
 			<div class="form-group">
-				<label for="course">Course</label>
-				<input type="text" name="course" class="form-control" :value="data.voter.course" required/>
+				<label for="Unit">Unit</label>
+				<input type="text" name="unit" class="form-control" :value="data.voter.unit" required/>
 			</div>
 
 			<div class="form-group">
diff --git a/resources/assets/js/components/demo/admin/voter/index.vue b/resources/assets/js/components/demo/admin/voter/index.vue
index e880f0f..b44b86c 100644
--- a/resources/assets/js/components/demo/admin/voter/index.vue
+++ b/resources/assets/js/components/demo/admin/voter/index.vue
@@ -16,17 +16,19 @@
 			<table class="table table-hover" id="position_table">
 				<thead>
 					<tr>
-						<th>Nama</th>
+						<th>Nama Anggota</th>
+						<th>No. Kad Pengenalan</th>
 						<th>No. Anggota</th>
-						<th>Course</th>
+						<th>Unit</th>
 						<th>Action</th>
 					</tr>
 				</thead>
 				<tbody>
 					<tr v-for="(voter,i) in data.voters.data">
 						<td>{{ voter.name }}</td>
-						<td>{{ voter.student_id }}</td>
-						<td>{{ voter.course }}</td>
+						<td>{{ voter.no_kp }}</td>
+						<td>{{ voter.no_anggota }}</td>
+						<td>{{ voter.unit }}</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 f8f0ad0..af24af8 100644
--- a/resources/assets/js/components/demo/voter/home/index.vue
+++ b/resources/assets/js/components/demo/voter/home/index.vue
@@ -1,13 +1,14 @@
 <template>
 <div class="row col-md-10 col-md-offset-1">
 	<div class="col-md-4">
-		<h4>Voter's Information</h4><hr/>
+		<h4>Maklumat Anggota</h4><hr/>
 		<ul class="list-group">
-			<li class="list-group-item"><b>No. Anggota : </b>{{ data.user.student_id }}</li>
+			<li class="list-group-item"><b>No. Kad Pengenalan : </b>{{ data.user.no_kp }}</li>
+			<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>Course : </b>{{ data.user.course }}</li>
+			<li class="list-group-item"><b>Unit : </b>{{ data.user.unit }}</li>
 			<li class="list-group-item" v-if="data.election.status==1">
-				<center>Election hasn't started yet</center>
+				<center>Undian belum bermula</center>
 			</li>
 			<li class="list-group-item" v-if="data.election.status==2">
 				<center>
@@ -32,7 +33,7 @@
 	</div>
 
 	<div class="col-md-8">
-		<h4>Candidates Information</h4><hr/>
+		<h4>Maklumat Calon</h4><hr/>
 		<small>Click Picture to see details</small>
 		<div class="panel panel-primary" v-for="position in data.positions">
 			<div class="panel-heading">{{ position.name }}</div>
@@ -43,7 +44,7 @@
 							<th></th>
 							<th>Name</th>
 							<th>Partylist</th>
-							<th>Course</th>
+							<th>Unit</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -56,7 +57,7 @@
 							</td>
 							<td>{{ nominee.name }}</td>
 							<td>{{ getPartylist(nominee.partylist_id) }}</td>
-							<td>{{ nominee.course }}</td>
+							<td>{{ nominee.unit }}</td>
 						</tr>
 					</tbody>
 				</table>
@@ -73,7 +74,7 @@
 					<div class="col-md-9" style="margin-left: 5px;">
 						<h3><strong><em>"{{ x.motto }}"</em></strong></h3>
 						<b> Name : </b>{{ x.name }}<br/>
-						<b> Course : </b>{{ x.course }}<br/>
+						<b> Unit : </b>{{ x.unit }}<br/>
 						<b> Partylist : </b>{{ getPartylist(x.partylist_id) }}<br/><hr/>
 						{{ x.description }}
 					</div>
diff --git a/resources/assets/js/components/demo/voter/home/vote.vue b/resources/assets/js/components/demo/voter/home/vote.vue
index 9bb06a3..c18812e 100644
--- a/resources/assets/js/components/demo/voter/home/vote.vue
+++ b/resources/assets/js/components/demo/voter/home/vote.vue
@@ -33,7 +33,7 @@
 							<td><input type="radio" :name="position.id" :id="nominee.id"/></td>
 							<td>{{ nominee.name }}</td>
 							<td>{{ getPartylist(nominee.partylist_id) }}</td>
-							<td>{{ nominee.course }}</td>
+							<td>{{ nominee.unit }}</td>
 						</tr>
 					</tbody>
 				</table>
diff --git a/resources/assets/js/components/demo/voter/login.vue b/resources/assets/js/components/demo/voter/login.vue
index 3266afd..5265750 100644
--- a/resources/assets/js/components/demo/voter/login.vue
+++ b/resources/assets/js/components/demo/voter/login.vue
@@ -2,15 +2,15 @@
 <div class="col-md-5 col-md-offset-3">
 	<div class="panel panel-default">
 		<div class="panel-heading">
-			<h4>Voter Login</h4>
+			<h4>Selamat Datang!</h4>
 		</div>
 
 		<div class="panel-body">
 			<form @submit.prevent="login" id="login_form">
 
 				<div class="form-group">
-					<label for="email">Masukkan No. Anggota</label>
-					<input type="text" name="student_id" class="form-control" required/>
+					<label for="no_kp">Masukkan No. Kad Pengenalan</label>
+					<input type="text" name="no_kp" class="form-control" required/>
 				</div>
 
 				<div class="form-group">