diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 31004d9..6480119 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -94,7 +94,40 @@ public function updateProfile(Request $request)
 
         $user = Auth::user();
 
-        $user->profile->update($request->all());
+		$picture = $request->file('picture');
+
+		if ($picture)
+		{
+			$newEntry = [
+				'date_of_birth' => $request['date_of_birth'],
+				'first_name' => $request['first_name'], 
+				'last_name' => $request['last_name'], 
+				'picture' => $user->username . '.jpg', 
+				'phone' => $request['phone'],
+				'address' => $request['address'],
+				'gender' => $request['gender'], 
+				'biography' => $request['biography']
+		    ];
+
+        
+			$picture->move(base_path() . '/public/images/users',  $user->username . '.jpg');
+		}
+
+		else
+		{
+			$newEntry = [
+				'date_of_birth' => $request['date_of_birth'],
+				'first_name' => $request['first_name'], 
+				'last_name' => $request['last_name'], 
+				'picture' => $user->profile->picture, 
+				'phone' => $request['phone'],
+				'address' => $request['address'],
+				'gender' => $request['gender'], 
+				'biography' => $request['biography']
+		    ];
+		}
+	
+        $user->profile->update($newEntry);
 
         return redirect('/profile/' . $user->username);
     }
diff --git a/resources/views/profile/edit.blade.php b/resources/views/profile/edit.blade.php
index 6416fe0..44cd22c 100644
--- a/resources/views/profile/edit.blade.php
+++ b/resources/views/profile/edit.blade.php
@@ -16,92 +16,103 @@
         </ul>
         <div class="panel panel-default">
             <div class="panel-body">
-                <form class="form-horizontal" action="{{url('profile/update')}}" method="POST">
+                <form class="form-horizontal" action="{{url('profile/update')}}" method="POST" enctype="multipart/form-data">
                     {!! csrf_field() !!}
+
                     <fieldset>
-                        <div class="form-group row">
-                            <label for="first_name" class="col-md-1 control-label">First Name</label>
-                            <div class="col-md-4">
-                                <input type="text" class="form-control" id="first_name" name="first_name"
-                                       value="{{$user->profile->first_name}}">
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="last_name" class="col-md-1 control-label">Last Name</label>
-                            <div class="col-md-4">
-                                <input type="text" class="form-control" id="last_name" name="last_name"
-                                       value="{{$user->profile->last_name}}">
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="date_of_birth" class="col-md-1 control-label">Birth Date</label>
-                            <div class="col-md-4">
-                                <input type="text" class="form-control" id="date_of_birth" name="date_of_birth"
-                                       value="{{$user->profile->date_of_birth}}">
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="phone" class="col-md-1 control-label">Phone</label>
-                            <div class="col-md-4">
-                                <input type="text" class="form-control" id="phone" name="phone"
-                                       value="{{$user->profile->phone}}">
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="address" class="col-md-1 control-label">Address</label>
-                            <div class="col-md-4">
-                                <input type="text" class="form-control" id="address" name="address"
-                                       value="{{$user->profile->address}}">
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label class="col-md-1 control-label">Gender</label>
-                            <div class="col-md-4">
-                                @if ($user->profile->gender)
-                                    <div class="row">
-                                        <div class="col-md-1"><label class="control-label" for="male">Male</label></div>
-                                        <div class="col-md-1"><input class="radio" type="radio" name="gender" id="male"
-                                                                     value="1" checked=""></div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="col-md-1"><label class="control-label" for="female">Female</label>
-                                        </div>
-                                        <div class="col-md-1"><input class="radio" type="radio" name="gender"
-                                                                     id="female" value="0"></div>
-                                    </div>
-                                @else
-                                    <div class="row">
-                                        <div class="col-md-1"><label class="control-label" for="male">Male</label></div>
-                                        <div class="col-md-1"><input class="radio" type="radio" name="gender" id="male"
-                                                                     value="1"></div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="col-md-1"><label class="control-label" for="female">Female</label>
-                                        </div>
-                                        <div class="col-md-1"><input class="radio" type="radio" name="gender"
-                                                                     id="female" value="0" checked=""></div>
-                                    </div>
-                                @endif
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label for="biography" class="col-md-1 control-label">About Me</label>
-                            <div class="col-md-4">
-                                <textarea class="form-control" rows="3" id="biography" name="biography"
-                                          placeholder="{{$user->profile->biography}}"></textarea>
-                                <grammarly-btn>
-                                    <div style="z-index: 2; opacity: 1; transform: translate(409px, 50px);"
-                                         class="_9b5ef6-textarea_btn _9b5ef6-not_focused" data-grammarly-reactid=".0">
-                                        <div class="_9b5ef6-transform_wrap" data-grammarly-reactid=".0.0">
-                                            <div title="Protected by Grammarly" class="_9b5ef6-status"
-                                                 data-grammarly-reactid=".0.0.0">
-                                                &nbsp;
-                                            </div>
-                                        </div>
-                                    </div>
-                                </grammarly-btn>
-                            </div>
-                        </div>
+						<div class="row"> 
+							<div class="col-md-3">
+								<div class="row">
+									<div class="col-md-12 well-lg">
+										<div class="center-block project-image"
+                             		 		style="background-image: url({{$user->profile->getProfileImagePath()}});">
+										</div>
+									</div>
+								</div>
+								<div class="row well-lg">
+									<div class="col-md-12">
+										<label for="thumbnail" class="col-md-4 control-label">Change Photo</label>
+				                		<div class="col-md-8">
+				                    		<input class="" type="file" id="picture" name="picture">
+				                		</div>
+									</div>
+								</div>
+							</div>
+					
+							<div class="col-md-9">
+				                <div class="form-group row">
+				                    <label for="first_name" class="col-md-1 control-label">First Name</label>
+				                    <div class="col-md-4">
+				                        <input type="text" class="form-control" id="first_name" name="first_name"
+				                               value="{{$user->profile->first_name}}">
+				                    </div>
+				                </div>
+				                <div class="form-group row">
+				                    <label for="last_name" class="col-md-1 control-label">Last Name</label>
+				                    <div class="col-md-4">
+				                        <input type="text" class="form-control" id="last_name" name="last_name"
+				                               value="{{$user->profile->last_name}}">
+				                    </div>
+				                </div>
+				                <div class="form-group row">
+				                    <label for="date_of_birth" class="col-md-1 control-label">Birth Date</label>
+				                    <div class="col-md-4">
+				                        <input type="text" class="form-control" id="date_of_birth" name="date_of_birth"
+				                               value="{{$user->profile->date_of_birth}}">
+				                    </div>
+				                </div>
+				                <div class="form-group row">
+				                    <label for="phone" class="col-md-1 control-label">Phone</label>
+				                    <div class="col-md-4">
+				                        <input type="text" class="form-control" id="phone" name="phone"
+				                               value="{{$user->profile->phone}}">
+				                    </div>
+				                </div>
+				                <div class="form-group row">
+				                    <label for="address" class="col-md-1 control-label">Address</label>
+				                    <div class="col-md-4">
+				                        <input type="text" class="form-control" id="address" name="address"
+				                               value="{{$user->profile->address}}">
+				                    </div>
+				                </div>
+				                <div class="form-group row">
+				                    <label class="col-md-1 control-label">Gender</label>
+				                    <div class="col-md-4">
+				                        @if ($user->profile->gender)
+				                            <div class="row">
+				                                <div class="col-md-2"><label class="control-label" for="male">Male</label></div>
+				                                <div class="col-md-1"><input class="radio" type="radio" name="gender" id="male"
+				                                                             value="1" checked=""></div>
+				                            </div>
+				                            <div class="row">
+				                                <div class="col-md-2"><label class="control-label" for="female">Female</label></div>
+				                                <div class="col-md-1"><input class="radio" type="radio" name="gender"
+				                                                             id="female" value="0"></div>
+				                            </div>
+				                        @else
+				                            <div class="row">
+				                                <div class="col-md-2"><label class="control-label" for="male">Male</label></div>
+				                                <div class="col-md-1"><input class="radio" type="radio" name="gender" id="male"
+				                                                             value="1"></div>
+				                            </div>
+				                            <div class="row">
+				                                <div class="col-md-2"><label class="control-label" for="female">Female</label>
+				                                </div>
+				                                <div class="col-md-1"><input class="radio" type="radio" name="gender"
+				                                                             id="female" value="0" checked=""></div>
+				                            </div>
+				                        @endif
+				                    </div>
+				                </div>
+				                <div class="form-group row">
+				                    <label for="biography" class="col-md-1 control-label">About Me</label>
+				                    <div class="col-md-4">
+				                        <textarea class="form-control" rows="3" id="biography" name="biography"
+				                                  placeholder="{{$user->profile->biography}}"></textarea>
+				                    </div>
+				                </div>
+							</div>
+						</div>
                         <button type="submit" id="submit" class="btn btn-default">Submit</button>
                     </fieldset>
                 </form>
diff --git a/resources/views/profile/view.blade.php b/resources/views/profile/view.blade.php
index e9885d1..935e5ca 100644
--- a/resources/views/profile/view.blade.php
+++ b/resources/views/profile/view.blade.php
@@ -67,10 +67,10 @@
                                 <div class="panel-heading">About Me</div>
                                 <div class="panel-body"><p>{{$user->profile->biography}}</p></div>
                             </div>
-                            <div/>
-                            <div/>
-                            <div/>
                         </div>
                     </div>
                 </div>
+            </div>
+        </div>
+    </div>
 @stop