diff --git a/.gitignore b/.gitignore
index 180be1db..bca667e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@ bl-themes/mediumish
 bl-themes/clean-blog
 bl-themes/grayscale
 bl-themes/massively
+bl-themes/hyperspace
+bl-themes/striped
diff --git a/bl-kernel/admin/views/edit-user.1.php b/bl-kernel/admin/views/edit-user.1.php
new file mode 100644
index 00000000..e6ede905
--- /dev/null
+++ b/bl-kernel/admin/views/edit-user.1.php
@@ -0,0 +1,277 @@
+<?php defined('BLUDIT') or die('Bludit CMS.');
+
+echo Bootstrap::formOpen(array());
+
+	echo '
+	<div>
+	<div class="float-right">
+		<button type="submit" class="btn btn-primary btn-sm" name="save">'.$L->g('Save').'</button>
+		<a class="btn btn-secondary btn-sm" href="'.HTML_PATH_ADMIN_ROOT.'users" role="button">'.$L->g('Cancel').'</a>
+	</div>
+	<h2 class="mt-0 mb-3">
+		<span class="oi oi-person" style="font-size: 0.7em;"></span> '.$L->g('Edit user').'
+	</h2>
+	</div>
+	';
+
+	echo Bootstrap::formInputHidden(array(
+		'name'=>'tokenCSRF',
+		'value'=>$security->getTokenCSRF()
+	));
+
+	echo Bootstrap::formInputHidden(array(
+		'name'=>'username',
+		'value'=>$user->username()
+	));
+
+	echo Bootstrap::formInputText(array(
+		'name'=>'usernameDisabled',
+		'label'=>$L->g('Username'),
+		'value'=>$user->username(),
+		'class'=>'',
+		'placeholder'=>'',
+		'disabled'=>true,
+		'tip'=>''
+	));
+
+	if ($login->role()==='admin') {
+		echo Bootstrap::formSelect(array(
+			'name'=>'role',
+			'label'=>$L->g('Role'),
+			'options'=>array('editor'=>$L->g('Editor'), 'admin'=>$L->g('Administrator')),
+			'selected'=>$user->role(),
+			'class'=>'',
+			'tip'=>''
+		));
+	}
+
+	echo Bootstrap::formInputText(array(
+		'name'=>'email',
+		'label'=>$L->g('Email'),
+		'value'=>$user->email(),
+		'class'=>'',
+		'placeholder'=>'',
+		'tip'=>''
+	));
+
+	echo Bootstrap::formTitle(array('title'=>$L->g('Profile')));
+
+	echo Bootstrap::formInputText(array(
+		'name'=>'nickname',
+		'label'=>$L->g('Nickname'),
+		'value'=>$user->nickname(),
+		'class'=>'',
+		'placeholder'=>'',
+		'tip'=>$L->g('The nickname is almost used in the themes to display the author of the content')
+	));
+
+	echo Bootstrap::formInputText(array(
+		'name'=>'firstName',
+		'label'=>$L->g('First Name'),
+		'value'=>$user->firstName(),
+		'class'=>'',
+		'placeholder'=>'',
+		'tip'=>''
+	));
+
+	echo Bootstrap::formInputText(array(
+		'name'=>'lastName',
+		'label'=>$L->g('Last Name'),
+		'value'=>$user->lastName(),
+		'class'=>'',
+		'placeholder'=>'',
+		'tip'=>''
+	));
+
+	echo Bootstrap::formTitle(array('title'=>$L->g('Password')));
+
+	echo '
+	<div class="form-group row">
+	<div class="col-sm-2"></div>
+	<div class="col-sm-10">
+		<a href="'.HTML_PATH_ADMIN_ROOT.'user-password/'.$user->username().'" class="btn btn-primary mr-2">'.$L->g('Change password').'</a>
+	</div>
+	</div>
+	';
+
+	echo Bootstrap::formTitle(array('title'=>$L->g('Authentication Token')));
+
+	echo Bootstrap::formInputText(array(
+		'name'=>'tokenAuth',
+		'label'=>$L->g('Token'),
+		'value'=>$user->tokenAuth(),
+		'class'=>'',
+		'tip'=>$L->g('this-token-is-similar-to-a-password-it-should-not-be-shared')
+	));
+
+	echo Bootstrap::formTitle(array('title'=>$L->g('Status')));
+
+	echo Bootstrap::formInputText(array(
+		'name'=>'status',
+		'label'=>$L->g('Current status'),
+		'value'=>$user->enabled()?$L->g('Enabled'):$L->g('Disabled'),
+		'class'=>'',
+		'disabled'=>true,
+		'tip'=>$user->enabled()?'':$L->g('To enable the user you must set a new password')
+	));
+
+	if ($user->enabled()) {
+		echo '
+		<div class="form-group row">
+		<div class="col-sm-2"></div>
+		<div class="col-sm-10">
+			<button type="submit" class="btn btn-primary mr-2" id="jsdisableUser" name="disableUser">'.$L->g('Disable user').'</button>
+			<button type="submit" class="btn btn-danger mr-2" id="jsdeleteUserAndKeepContent" name="deleteUserAndKeepContent">'.$L->g('Delete user and keep content').'</button>
+			<button type="submit" class="btn btn-danger mr-2" id="jsdeleteUserAndDeleteContent" name="deleteUserAndDeleteContent">'.$L->g('Delete user and delete content').'</button>
+		</div>
+		</div>
+		';
+	}
+
+	echo Bootstrap::formTitle(array('title'=>$L->g('Social Networks')));
+
+	echo Bootstrap::formInputText(array(
+		'name'=>'twitter',
+		'label'=>'Twitter',
+		'value'=>$user->twitter(),
+		'class'=>'',
+		'tip'=>''
+	));
+
+	echo Bootstrap::formInputText(array(
+		'name'=>'facebook',
+		'label'=>'Facebook',
+		'value'=>$user->facebook(),
+		'class'=>'',
+		'tip'=>''
+	));
+
+	echo Bootstrap::formInputText(array(
+		'name'=>'googlePlus',
+		'label'=>'Google+',
+		'value'=>$user->googlePlus(),
+		'class'=>'',
+		'tip'=>''
+	));
+
+	echo Bootstrap::formInputText(array(
+		'name'=>'instagram',
+		'label'=>'Instagram',
+		'value'=>$user->instagram(),
+		'class'=>'',
+		'tip'=>''
+	));
+
+	echo Bootstrap::formInputText(array(
+		'name'=>'codepen',
+		'label'=>'Codepen',
+		'value'=>$user->codepen(),
+		'class'=>'',
+		'tip'=>''
+	));
+
+	echo Bootstrap::formInputText(array(
+		'name'=>'linkedin',
+		'label'=>'Linkedin',
+		'value'=>$user->linkedin(),
+		'class'=>'',
+		'tip'=>''
+	));
+
+	echo Bootstrap::formInputText(array(
+		'name'=>'github',
+		'label'=>'Github',
+		'value'=>$user->github(),
+		'class'=>'',
+		'tip'=>''
+	));
+
+	echo Bootstrap::formInputText(array(
+		'name'=>'gitlab',
+		'label'=>'Gitlab',
+		'value'=>$user->gitlab(),
+		'class'=>'',
+		'tip'=>''
+	));
+
+	echo '
+	<div class="form-group mt-4">
+		<button type="submit" class="btn btn-primary mr-2" name="save">'.$L->g('Save').'</button>
+		<a class="btn btn-secondary" href="'.HTML_PATH_ADMIN_ROOT.'users" role="button">'.$L->g('Cancel').'</a>
+	</div>
+	';
+
+echo Bootstrap::formClose();
+
+echo Bootstrap::formTitle(array('title'=>$L->g('Profile picture')));
+
+$src = (Sanitize::pathFile(PATH_UPLOADS_PROFILES.$user->username().'.png')?DOMAIN_UPLOADS_PROFILES.$user->username().'.png':HTML_PATH_ADMIN_THEME_IMG.'default.svg');
+echo '
+<div class="form-group row">
+<div class="col-sm-2"></div>
+<div class="col-sm-10">
+	<img id="jsprofilePictureImg" style="width: 350px; height: 200px;" class="img-thumbnail mb-2" alt="Profile Picture" src="'.$src.'" />
+
+	<form id="jsprofilePictureForm" name="profilePictureForm" enctype="multipart/form-data">
+		<input type="hidden" name="tokenCSRF" value="'.$security->getTokenCSRF().'">
+		<div class="custom-file">
+			<input type="file" class="custom-file-input" id="jsprofilePictureInputFile" name="profilePictureInputFile">
+			<label class="custom-file-label" for="jsprofilePictureInputFile"></label>
+		</div>
+	</form>
+</div>
+</div>
+';
+
+?>
+
+<script>
+$(document).ready(function() {
+
+	$("#jsdeleteUserAndDeleteContent").click(function() {
+		if(confirm("<?php $L->p('Confirm delete this action cannot be undone') ?>")==false) {
+			return false;
+		}
+	});
+
+	$("#jsdeleteUserAndKeepContent").click(function() {
+		if(confirm("<?php $L->p('Confirm delete this action cannot be undone') ?>")==false) {
+			return false;
+		}
+	});
+
+	$("#jsprofilePictureInputFile").on("change", function() {
+
+		// Data to send via AJAX
+		var username = $("#jsusername").val();
+		var formData = new FormData($("#jsprofilePictureForm")[0]);
+		formData.append('username', username);
+		formData.append('tokenCSRF', tokenCSRF);
+
+		$.ajax({
+			url: HTML_PATH_ADMIN_ROOT+"ajax/profile-picture",
+			type: "POST",
+			data: formData,
+			cache: false,
+			contentType: false,
+			processData: false,
+			xhr: function() {
+				var xhr = $.ajaxSettings.xhr();
+				if (xhr.upload) {
+					xhr.upload.addEventListener("progress", function(e) {
+						if (e.lengthComputable) {
+							var percentComplete = (e.loaded / e.total)*100;
+							console.log("Uploading profile picture: "+percentComplete);
+						}
+					}, false);
+				}
+				return xhr;
+			}
+		}).done(function(e) {
+			$("#jsprofilePictureImg").attr('src',e.absoluteURL+"?time="+Math.random());
+		});
+
+	});
+
+});
+</script>
diff --git a/bl-kernel/admin/views/edit-user.php b/bl-kernel/admin/views/edit-user.php
index e6ede905..206e7975 100644
--- a/bl-kernel/admin/views/edit-user.php
+++ b/bl-kernel/admin/views/edit-user.php
@@ -1,277 +1,246 @@
-<?php defined('BLUDIT') or die('Bludit CMS.');
+<?php defined('BLUDIT') or die('Bludit CMS.'); ?>
 
-echo Bootstrap::formOpen(array());
+<?php echo Bootstrap::pageTitle(array('title'=>$L->g('Edit user'), 'icon'=>'person')); ?>
 
-	echo '
-	<div>
-	<div class="float-right">
-		<button type="submit" class="btn btn-primary btn-sm" name="save">'.$L->g('Save').'</button>
-		<a class="btn btn-secondary btn-sm" href="'.HTML_PATH_ADMIN_ROOT.'users" role="button">'.$L->g('Cancel').'</a>
-	</div>
-	<h2 class="mt-0 mb-3">
-		<span class="oi oi-person" style="font-size: 0.7em;"></span> '.$L->g('Edit user').'
-	</h2>
-	</div>
-	';
+<nav class="mb-3">
+<div class="nav nav-tabs" id="nav-tab" role="tablist">
+	<a class="nav-item nav-link active" id="nav-profile-tab" data-toggle="tab" href="#profile" role="tab" aria-controls="nav-profile" aria-selected="false">Profile</a>
+	<a class="nav-item nav-link" id="nav-picture-tab" data-toggle="tab" href="#picture" role="tab" aria-controls="nav-picture" aria-selected="false">Profile picture</a>
+	<a class="nav-item nav-link" id="nav-security-tab" data-toggle="tab" href="#security" role="tab" aria-controls="nav-security" aria-selected="false">Security</a>
+	<a class="nav-item nav-link" id="nav-social-tab" data-toggle="tab" href="#social" role="tab" aria-controls="nav-social" aria-selected="false">Social Networks</a>
+</div>
+</nav>
 
+<?php
+	// Start form
+	echo Bootstrap::formOpen(array(
+		'id'=>'jsform',
+		'class'=>''
+	));
+
+	// Token CSRF
 	echo Bootstrap::formInputHidden(array(
 		'name'=>'tokenCSRF',
 		'value'=>$security->getTokenCSRF()
 	));
 
+	// Username
 	echo Bootstrap::formInputHidden(array(
 		'name'=>'username',
 		'value'=>$user->username()
 	));
+?>
 
-	echo Bootstrap::formInputText(array(
-		'name'=>'usernameDisabled',
-		'label'=>$L->g('Username'),
-		'value'=>$user->username(),
-		'class'=>'',
-		'placeholder'=>'',
-		'disabled'=>true,
-		'tip'=>''
-	));
+<div class="tab-content" id="nav-tabContent">
+	<!-- Profile tab -->
+	<div class="tab-pane fade show active" id="profile" role="tabpanel" aria-labelledby="nav-profile-tab">
+	<?php
+		// Display username but disable the field
+		echo Bootstrap::formInputText(array(
+			'name'=>'usernameDisabled',
+			'label'=>$L->g('Username'),
+			'value'=>$user->username(),
+			'class'=>'',
+			'placeholder'=>'',
+			'disabled'=>true,
+			'tip'=>''
+		));
 
-	if ($login->role()==='admin') {
-		echo Bootstrap::formSelect(array(
-			'name'=>'role',
-			'label'=>$L->g('Role'),
-			'options'=>array('editor'=>$L->g('Editor'), 'admin'=>$L->g('Administrator')),
-			'selected'=>$user->role(),
+		if ($login->role()==='admin') {
+			echo Bootstrap::formSelect(array(
+				'name'=>'role',
+				'label'=>$L->g('Role'),
+				'options'=>array('editor'=>$L->g('Editor'), 'admin'=>$L->g('Administrator')),
+				'selected'=>$user->role(),
+				'class'=>'',
+				'tip'=>''
+			));
+		}
+
+		echo Bootstrap::formInputText(array(
+			'name'=>'email',
+			'label'=>$L->g('Email'),
+			'value'=>$user->email(),
+			'class'=>'',
+			'placeholder'=>'',
+			'tip'=>''
+		));
+
+		echo Bootstrap::formInputText(array(
+			'name'=>'nickname',
+			'label'=>$L->g('Nickname'),
+			'value'=>$user->nickname(),
+			'class'=>'',
+			'placeholder'=>'',
+			'tip'=>$L->g('The nickname is almost used in the themes to display the author of the content')
+		));
+
+		echo Bootstrap::formInputText(array(
+			'name'=>'firstName',
+			'label'=>$L->g('First Name'),
+			'value'=>$user->firstName(),
+			'class'=>'',
+			'placeholder'=>'',
+			'tip'=>''
+		));
+
+		echo Bootstrap::formInputText(array(
+			'name'=>'lastName',
+			'label'=>$L->g('Last Name'),
+			'value'=>$user->lastName(),
+			'class'=>'',
+			'placeholder'=>'',
+			'tip'=>''
+		));
+
+		echo '
+		<div class="form-group mt-4">
+			<button type="submit" class="btn btn-primary mr-2" name="save">'.$L->g('Save').'</button>
+			<a class="btn btn-secondary" href="'.HTML_PATH_ADMIN_ROOT.'dashboard" role="button">'.$L->g('Cancel').'</a>
+		</div>
+		';
+	?>
+	</div>
+
+	<!-- Profile picture tab -->
+	<div class="tab-pane fade" id="picture" role="tabpanel" aria-labelledby="nav-picture-tab">
+		<div>
+			<img id="jscoverImagePreview" class="d-block w-50" alt="Profile picture preview" src="<?php echo HTML_PATH_ADMIN_THEME_IMG ?>default.svg" />
+		</div>
+		<div class="mt-2">
+			<button type="button" id="jsbuttonSelectCoverImage" class="btn btn-primary btn-sm"><?php echo $L->g('Select cover image') ?></button>
+			<button type="button" id="jsbuttonRemoveCoverImage" class="btn btn-secondary btn-sm"><?php echo $L->g('Remove cover image') ?></button>
+		</div>
+		<script>
+			$(document).ready(function() {
+				$("#jscoverImagePreview").on("click", function() {
+					openMediaManager();
+				});
+
+				$("#jsbuttonSelectCoverImage").on("click", function() {
+					openMediaManager();
+				});
+
+				$("#jsbuttonRemoveCoverImage").on("click", function() {
+					$("#jscoverImage").val('');
+					$("#jscoverImagePreview").attr('src', HTML_PATH_ADMIN_THEME_IMG+'default.svg');
+				});
+			});
+		</script>
+	</div>
+
+	<!-- Security tab -->
+	<div class="tab-pane fade" id="security" role="tabpanel" aria-labelledby="nav-security-tab">
+	<?php
+		echo Bootstrap::formTitle(array('title'=>$L->g('Password')));
+
+		echo '
+		<div class="form-group">
+			<a href="'.HTML_PATH_ADMIN_ROOT.'user-password/'.$user->username().'" class="btn btn-primary mr-2">'.$L->g('Change password').'</a>
+		</div>
+		';
+
+		echo Bootstrap::formTitle(array('title'=>$L->g('Authentication Token')));
+
+		echo Bootstrap::formInputText(array(
+			'name'=>'tokenAuth',
+			'label'=>$L->g('Token'),
+			'value'=>$user->tokenAuth(),
+			'class'=>'',
+			'tip'=>$L->g('this-token-is-similar-to-a-password-it-should-not-be-shared')
+		));
+
+		echo Bootstrap::formTitle(array('title'=>$L->g('Status')));
+
+		echo Bootstrap::formInputText(array(
+			'name'=>'status',
+			'label'=>$L->g('Current status'),
+			'value'=>$user->enabled()?$L->g('Enabled'):$L->g('Disabled'),
+			'class'=>'',
+			'disabled'=>true,
+			'tip'=>$user->enabled()?'':$L->g('To enable the user you must set a new password')
+		));
+
+		if ($user->enabled()) {
+			echo '
+			<div class="form-group row">
+			<div class="col-sm-2"></div>
+			<div class="col-sm-10">
+				<button type="submit" class="btn btn-warning mr-2" id="jsdisableUser" name="disableUser">'.$L->g('Disable user').'</button>
+				<button type="submit" class="btn btn-danger mr-2" id="jsdeleteUserAndKeepContent" name="deleteUserAndKeepContent">'.$L->g('Delete user and keep content').'</button>
+				<button type="submit" class="btn btn-danger mr-2" id="jsdeleteUserAndDeleteContent" name="deleteUserAndDeleteContent">'.$L->g('Delete user and delete content').'</button>
+			</div>
+			</div>
+			';
+		}
+	?>
+	</div>
+
+	<!-- Social Networks tab -->
+	<div class="tab-pane fade" id="social" role="tabpanel" aria-labelledby="nav-social-tab">
+	<?php
+		echo Bootstrap::formInputText(array(
+			'name'=>'twitter',
+			'label'=>'Twitter',
+			'value'=>$user->twitter(),
 			'class'=>'',
 			'tip'=>''
 		));
-	}
 
-	echo Bootstrap::formInputText(array(
-		'name'=>'email',
-		'label'=>$L->g('Email'),
-		'value'=>$user->email(),
-		'class'=>'',
-		'placeholder'=>'',
-		'tip'=>''
-	));
+		echo Bootstrap::formInputText(array(
+			'name'=>'facebook',
+			'label'=>'Facebook',
+			'value'=>$user->facebook(),
+			'class'=>'',
+			'tip'=>''
+		));
 
-	echo Bootstrap::formTitle(array('title'=>$L->g('Profile')));
+		echo Bootstrap::formInputText(array(
+			'name'=>'instagram',
+			'label'=>'Instagram',
+			'value'=>$user->instagram(),
+			'class'=>'',
+			'tip'=>''
+		));
 
-	echo Bootstrap::formInputText(array(
-		'name'=>'nickname',
-		'label'=>$L->g('Nickname'),
-		'value'=>$user->nickname(),
-		'class'=>'',
-		'placeholder'=>'',
-		'tip'=>$L->g('The nickname is almost used in the themes to display the author of the content')
-	));
+		echo Bootstrap::formInputText(array(
+			'name'=>'codepen',
+			'label'=>'Codepen',
+			'value'=>$user->codepen(),
+			'class'=>'',
+			'tip'=>''
+		));
 
-	echo Bootstrap::formInputText(array(
-		'name'=>'firstName',
-		'label'=>$L->g('First Name'),
-		'value'=>$user->firstName(),
-		'class'=>'',
-		'placeholder'=>'',
-		'tip'=>''
-	));
+		echo Bootstrap::formInputText(array(
+			'name'=>'linkedin',
+			'label'=>'Linkedin',
+			'value'=>$user->linkedin(),
+			'class'=>'',
+			'tip'=>''
+		));
 
-	echo Bootstrap::formInputText(array(
-		'name'=>'lastName',
-		'label'=>$L->g('Last Name'),
-		'value'=>$user->lastName(),
-		'class'=>'',
-		'placeholder'=>'',
-		'tip'=>''
-	));
+		echo Bootstrap::formInputText(array(
+			'name'=>'github',
+			'label'=>'Github',
+			'value'=>$user->github(),
+			'class'=>'',
+			'tip'=>''
+		));
 
-	echo Bootstrap::formTitle(array('title'=>$L->g('Password')));
+		echo Bootstrap::formInputText(array(
+			'name'=>'gitlab',
+			'label'=>'Gitlab',
+			'value'=>$user->gitlab(),
+			'class'=>'',
+			'tip'=>''
+		));
 
-	echo '
-	<div class="form-group row">
-	<div class="col-sm-2"></div>
-	<div class="col-sm-10">
-		<a href="'.HTML_PATH_ADMIN_ROOT.'user-password/'.$user->username().'" class="btn btn-primary mr-2">'.$L->g('Change password').'</a>
-	</div>
-	</div>
-	';
-
-	echo Bootstrap::formTitle(array('title'=>$L->g('Authentication Token')));
-
-	echo Bootstrap::formInputText(array(
-		'name'=>'tokenAuth',
-		'label'=>$L->g('Token'),
-		'value'=>$user->tokenAuth(),
-		'class'=>'',
-		'tip'=>$L->g('this-token-is-similar-to-a-password-it-should-not-be-shared')
-	));
-
-	echo Bootstrap::formTitle(array('title'=>$L->g('Status')));
-
-	echo Bootstrap::formInputText(array(
-		'name'=>'status',
-		'label'=>$L->g('Current status'),
-		'value'=>$user->enabled()?$L->g('Enabled'):$L->g('Disabled'),
-		'class'=>'',
-		'disabled'=>true,
-		'tip'=>$user->enabled()?'':$L->g('To enable the user you must set a new password')
-	));
-
-	if ($user->enabled()) {
 		echo '
-		<div class="form-group row">
-		<div class="col-sm-2"></div>
-		<div class="col-sm-10">
-			<button type="submit" class="btn btn-primary mr-2" id="jsdisableUser" name="disableUser">'.$L->g('Disable user').'</button>
-			<button type="submit" class="btn btn-danger mr-2" id="jsdeleteUserAndKeepContent" name="deleteUserAndKeepContent">'.$L->g('Delete user and keep content').'</button>
-			<button type="submit" class="btn btn-danger mr-2" id="jsdeleteUserAndDeleteContent" name="deleteUserAndDeleteContent">'.$L->g('Delete user and delete content').'</button>
-		</div>
+		<div class="form-group mt-4">
+			<button type="submit" class="btn btn-primary mr-2" name="save">'.$L->g('Save').'</button>
+			<a class="btn btn-secondary" href="'.HTML_PATH_ADMIN_ROOT.'dashboard" role="button">'.$L->g('Cancel').'</a>
 		</div>
 		';
-	}
-
-	echo Bootstrap::formTitle(array('title'=>$L->g('Social Networks')));
-
-	echo Bootstrap::formInputText(array(
-		'name'=>'twitter',
-		'label'=>'Twitter',
-		'value'=>$user->twitter(),
-		'class'=>'',
-		'tip'=>''
-	));
-
-	echo Bootstrap::formInputText(array(
-		'name'=>'facebook',
-		'label'=>'Facebook',
-		'value'=>$user->facebook(),
-		'class'=>'',
-		'tip'=>''
-	));
-
-	echo Bootstrap::formInputText(array(
-		'name'=>'googlePlus',
-		'label'=>'Google+',
-		'value'=>$user->googlePlus(),
-		'class'=>'',
-		'tip'=>''
-	));
-
-	echo Bootstrap::formInputText(array(
-		'name'=>'instagram',
-		'label'=>'Instagram',
-		'value'=>$user->instagram(),
-		'class'=>'',
-		'tip'=>''
-	));
-
-	echo Bootstrap::formInputText(array(
-		'name'=>'codepen',
-		'label'=>'Codepen',
-		'value'=>$user->codepen(),
-		'class'=>'',
-		'tip'=>''
-	));
-
-	echo Bootstrap::formInputText(array(
-		'name'=>'linkedin',
-		'label'=>'Linkedin',
-		'value'=>$user->linkedin(),
-		'class'=>'',
-		'tip'=>''
-	));
-
-	echo Bootstrap::formInputText(array(
-		'name'=>'github',
-		'label'=>'Github',
-		'value'=>$user->github(),
-		'class'=>'',
-		'tip'=>''
-	));
-
-	echo Bootstrap::formInputText(array(
-		'name'=>'gitlab',
-		'label'=>'Gitlab',
-		'value'=>$user->gitlab(),
-		'class'=>'',
-		'tip'=>''
-	));
-
-	echo '
-	<div class="form-group mt-4">
-		<button type="submit" class="btn btn-primary mr-2" name="save">'.$L->g('Save').'</button>
-		<a class="btn btn-secondary" href="'.HTML_PATH_ADMIN_ROOT.'users" role="button">'.$L->g('Cancel').'</a>
+	?>
 	</div>
-	';
-
-echo Bootstrap::formClose();
-
-echo Bootstrap::formTitle(array('title'=>$L->g('Profile picture')));
-
-$src = (Sanitize::pathFile(PATH_UPLOADS_PROFILES.$user->username().'.png')?DOMAIN_UPLOADS_PROFILES.$user->username().'.png':HTML_PATH_ADMIN_THEME_IMG.'default.svg');
-echo '
-<div class="form-group row">
-<div class="col-sm-2"></div>
-<div class="col-sm-10">
-	<img id="jsprofilePictureImg" style="width: 350px; height: 200px;" class="img-thumbnail mb-2" alt="Profile Picture" src="'.$src.'" />
-
-	<form id="jsprofilePictureForm" name="profilePictureForm" enctype="multipart/form-data">
-		<input type="hidden" name="tokenCSRF" value="'.$security->getTokenCSRF().'">
-		<div class="custom-file">
-			<input type="file" class="custom-file-input" id="jsprofilePictureInputFile" name="profilePictureInputFile">
-			<label class="custom-file-label" for="jsprofilePictureInputFile"></label>
-		</div>
-	</form>
-</div>
-</div>
-';
-
-?>
-
-<script>
-$(document).ready(function() {
-
-	$("#jsdeleteUserAndDeleteContent").click(function() {
-		if(confirm("<?php $L->p('Confirm delete this action cannot be undone') ?>")==false) {
-			return false;
-		}
-	});
-
-	$("#jsdeleteUserAndKeepContent").click(function() {
-		if(confirm("<?php $L->p('Confirm delete this action cannot be undone') ?>")==false) {
-			return false;
-		}
-	});
-
-	$("#jsprofilePictureInputFile").on("change", function() {
-
-		// Data to send via AJAX
-		var username = $("#jsusername").val();
-		var formData = new FormData($("#jsprofilePictureForm")[0]);
-		formData.append('username', username);
-		formData.append('tokenCSRF', tokenCSRF);
-
-		$.ajax({
-			url: HTML_PATH_ADMIN_ROOT+"ajax/profile-picture",
-			type: "POST",
-			data: formData,
-			cache: false,
-			contentType: false,
-			processData: false,
-			xhr: function() {
-				var xhr = $.ajaxSettings.xhr();
-				if (xhr.upload) {
-					xhr.upload.addEventListener("progress", function(e) {
-						if (e.lengthComputable) {
-							var percentComplete = (e.loaded / e.total)*100;
-							console.log("Uploading profile picture: "+percentComplete);
-						}
-					}, false);
-				}
-				return xhr;
-			}
-		}).done(function(e) {
-			$("#jsprofilePictureImg").attr('src',e.absoluteURL+"?time="+Math.random());
-		});
-
-	});
-
-});
-</script>
+</div>
\ No newline at end of file
diff --git a/bl-kernel/admin/views/new-content.php b/bl-kernel/admin/views/new-content.php
index cc969ee3..9bc0eea8 100644
--- a/bl-kernel/admin/views/new-content.php
+++ b/bl-kernel/admin/views/new-content.php
@@ -2,7 +2,7 @@
 
 <?php
 
-// FORM START
+// Start form
 echo Bootstrap::formOpen(array(
 	'id'=>'jsform',
 	'class'=>'d-flex flex-column h-100'
diff --git a/bl-kernel/admin/views/user-password.php b/bl-kernel/admin/views/user-password.php
index e22b9811..35235fcc 100644
--- a/bl-kernel/admin/views/user-password.php
+++ b/bl-kernel/admin/views/user-password.php
@@ -47,7 +47,7 @@ echo Bootstrap::formOpen(array());
 	echo '
 	<div class="form-group mt-4">
 		<button type="submit" class="btn btn-primary mr-2" name="save">'.$L->g('Save').'</button>
-		<a class="btn btn-secondary" href="'.HTML_PATH_ADMIN_ROOT.'edit-user/'.$user->username().'" role="button">'.$L->g('Cancel').'</a>
+		<a class="btn btn-secondary" href="'.HTML_PATH_ADMIN_ROOT.'edit-user/'.$user->username().'#security" role="button">'.$L->g('Cancel').'</a>
 	</div>
 	';
 
diff --git a/bl-languages/en.json b/bl-languages/en.json
index 945f8dc6..0f5320c3 100644
--- a/bl-languages/en.json
+++ b/bl-languages/en.json
@@ -365,5 +365,6 @@
     "there-are-no-images-for-the-page": "There are no images for the page.",
     "select-cover-image": "Select cover image",
     "this-plugin-depends-on-the-following-plugins": "This plugin depends on the following plugins.",
-    "no-pages-found": "No pages found"
+    "no-pages-found": "No pages found",
+    "system-updated": "System updated"
 }
\ No newline at end of file