diff --git a/.gitignore b/.gitignore
index bca667e1..b0ec503e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ bl-themes/grayscale
 bl-themes/massively
 bl-themes/hyperspace
 bl-themes/striped
+bl-themes/log
diff --git a/bl-kernel/admin/controllers/new-category.php b/bl-kernel/admin/controllers/new-category.php
index 22ac496f..c60220d6 100644
--- a/bl-kernel/admin/controllers/new-category.php
+++ b/bl-kernel/admin/controllers/new-category.php
@@ -19,7 +19,7 @@ checkRole(array('admin'));
 // ============================================================================
 
 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-	if (createCategory($_POST['category'])) {
+	if (createCategory($_POST)) {
 		Redirect::page('categories');
 	}
 }
diff --git a/bl-kernel/admin/themes/booty/init.php b/bl-kernel/admin/themes/booty/init.php
index d3a6f0fb..9ef973f1 100644
--- a/bl-kernel/admin/themes/booty/init.php
+++ b/bl-kernel/admin/themes/booty/init.php
@@ -24,8 +24,8 @@ return <<<EOF
 				<p>$modalText</p>
 			</div>
 			<div class="modal-footer">
-				<button type="button" class="$buttonSecondaryClass btn btn-secondary" data-dismiss="modal">$buttonSecondary</button>
-				<button type="button" class="$buttonPrimaryClass btn btn-primary">$buttonPrimary</button>
+				<button type="button" class="btn $buttonSecondaryClass" data-dismiss="modal">$buttonSecondary</button>
+				<button type="button" class="btn $buttonPrimaryClass">$buttonPrimary</button>
 			</div>
 		</div>
 	</div>
@@ -180,7 +180,7 @@ EOF;
 		}
 
 		$html .= '<div class="col-sm-10">';
-		$html .= '<textarea class="'.$class.'" id="'.$id.'" name="'.$args['name'].'" rows="'.$args['rows'].'" placeholder="'.$args['placeholder'].'"></textarea>';
+		$html .= '<textarea class="'.$class.'" id="'.$id.'" name="'.$args['name'].'" rows="'.$args['rows'].'" placeholder="'.$args['placeholder'].'">'.$args['value'].'</textarea>';
 		if (isset($args['tip'])) {
 			$html .= '<small class="form-text text-muted">'.$args['tip'].'</small>';
 		}
diff --git a/bl-kernel/admin/views/content.php b/bl-kernel/admin/views/content.php
index f11bea79..4d46bf61 100644
--- a/bl-kernel/admin/views/content.php
+++ b/bl-kernel/admin/views/content.php
@@ -236,15 +236,16 @@ function table($type) {
 </div>
 
 <!-- Modal for delete page -->
-<?php echo Bootstrap::modal(array(
-	'modalId'=>'jsdeletePageModal',
-	'modalTitle'=>$L->g('Delete content'),
-	'modalText'=>$L->g('Are you sure you want to delete this page'),
-	'buttonPrimary'=>$L->g('Delete'),
-	'buttonPrimaryClass'=>'deletePageModalAcceptButton',
-	'buttonSecondary'=>$L->g('Cancel'),
-	'buttonSecondaryClass'=>''
-));
+<?php
+	echo Bootstrap::modal(array(
+		'buttonPrimary'=>$L->g('Delete'),
+		'buttonPrimaryClass'=>'btn-danger jsbuttonDeleteAccept',
+		'buttonSecondary'=>$L->g('Cancel'),
+		'buttonSecondaryClass'=>'btn-secondary',
+		'modalTitle'=>$L->g('Delete content'),
+		'modalText'=>$L->g('Are you sure you want to delete this page'),
+		'modalId'=>'jsdeletePageModal'
+	));
 ?>
 <script>
 $(document).ready(function() {
diff --git a/bl-kernel/admin/views/edit-category.php b/bl-kernel/admin/views/edit-category.php
index 3635c589..9840aa81 100644
--- a/bl-kernel/admin/views/edit-category.php
+++ b/bl-kernel/admin/views/edit-category.php
@@ -1,9 +1,18 @@
-<?php defined('BLUDIT') or die('Bludit CMS.');
+<?php defined('BLUDIT') or die('Bludit CMS.'); ?>
 
-echo Bootstrap::pageTitle(array('title'=>$L->g('Edit Category'), 'icon'=>'tags'));
+<?php echo Bootstrap::formOpen(array('id'=>'jsform')); ?>
 
-echo Bootstrap::formOpen(array('id'=>'jsform'));
+<div class="align-middle">
+	<div class="float-right mt-1">
+		<button type="submit" class="btn btn-primary btn-sm" name="save"><?php $L->p('Save') ?></button>
+		<button type="button" class="btn btn-danger btn-sm" data-toggle="modal" data-target="#jsdeleteModal"><?php $L->p('Delete') ?></button>
+		<a class="btn btn-secondary btn-sm" href="<?php echo HTML_PATH_ADMIN_ROOT.'dashboard' ?>" role="button"><?php $L->p('Cancel') ?></a>
+	</div>
+	<?php echo Bootstrap::pageTitle(array('title'=>$L->g('Edit Category'), 'icon'=>'cog')); ?>
+</div>
 
+<?php
+	// Token CSRF
 	echo Bootstrap::formInputHidden(array(
 		'name'=>'tokenCSRF',
 		'value'=>$security->getTokenCSRF()
@@ -56,14 +65,6 @@ echo Bootstrap::formOpen(array('id'=>'jsform'));
 		'tip'=>DOMAIN_CATEGORIES.$categoryMap['key']
 	));
 
-	echo '
-	<div class="form-group mt-4">
-		<button type="submit" class="btn btn-primary">'.$L->g('Save').'</button>
-		<button type="button" class="btn btn-danger" data-toggle="modal" data-target="#jsdeleteModal">'.$L->g('Delete').'</button>
-		<a class="btn btn-secondary" href="'.HTML_PATH_ADMIN_ROOT.'categories" role="button">'.$L->g('Cancel').'</a>
-	</div>
-	';
-
 echo Bootstrap::formClose();
 
 ?>
@@ -72,9 +73,9 @@ echo Bootstrap::formClose();
 <?php
 	echo Bootstrap::modal(array(
 		'buttonPrimary'=>$L->g('Delete'),
-		'buttonPrimaryClass'=>'jsbuttonDeleteAccept',
+		'buttonPrimaryClass'=>'btn-danger jsbuttonDeleteAccept',
 		'buttonSecondary'=>$L->g('Cancel'),
-		'buttonSecondaryClass'=>'',
+		'buttonSecondaryClass'=>'btn-secondary',
 		'modalTitle'=>$L->g('Delete category'),
 		'modalText'=>$L->g('Are you sure you want to delete this category?'),
 		'modalId'=>'jsdeleteModal'
diff --git a/bl-kernel/admin/views/edit-content.php b/bl-kernel/admin/views/edit-content.php
index 71a62a27..d34fb745 100644
--- a/bl-kernel/admin/views/edit-content.php
+++ b/bl-kernel/admin/views/edit-content.php
@@ -54,23 +54,23 @@ echo Bootstrap::formOpen(array(
 
 <!-- TOOLBAR -->
 <div id="jseditorToolbar">
-	<div id="jseditorToolbarRight" class="btn-group btn-group-sm float-right" role="group" aria-label="Basic example">
+	<div id="jseditorToolbarRight" class="btn-group btn-group-sm float-right" role="group" aria-label="Toolbar right">
 		<button type="button" class="btn btn-light" id="jsmediaManagerOpenModal" data-toggle="modal" data-target="#jsmediaManagerModal"><span class="oi oi-image"></span> <?php $L->p('Images') ?></button>
 		<button type="button" class="btn btn-light" id="jsoptionsSidebar" style="z-index:30"><span class="oi oi-cog"></span> <?php $L->p('Options') ?></button>
 	</div>
 
-	<div id="jseditorToolbarLeft" class="btn-group btn-group-sm" role="group" aria-label="Basic example">
-		<button type="button" class="btn btn-primary" id="jsbuttonSave"><?php echo ($page->draft()?$L->g('Publish'):$L->g('Save')) ?></button>
+	<div id="jseditorToolbarLeft">
+		<button type="button" class="btn btn-sm btn-primary" id="jsbuttonSave"><?php echo ($page->draft()?$L->g('Publish'):$L->g('Save')) ?></button>
 
 		<?php if($page->draft()): ?>
-		<button type="button" class="btn btn-secondary" id="jsbuttonDraft"><?php $L->p('Save as draft') ?></button>
+		<button type="button" class="btn btn-sm btn-secondary" id="jsbuttonDraft"><?php $L->p('Save as draft') ?></button>
 		<?php endif; ?>
 
 		<?php if (count($page->children())==0): ?>
-		<button type="button" class="btn btn-danger" id="jsbuttonDelete" data-toggle="modal" data-target="#jsdeletePageModal"><?php $L->p('Delete') ?></button>
+		<button type="button" class="btn btn-sm btn-danger" id="jsbuttonDelete" data-toggle="modal" data-target="#jsdeletePageModal"><?php $L->p('Delete') ?></button>
 		<?php endif; ?>
 
-		<a href="<?php echo HTML_PATH_ADMIN_ROOT ?>dashboard" class="btn btn-secondary"><?php $L->p('Cancel') ?></a>
+		<a href="<?php echo HTML_PATH_ADMIN_ROOT ?>dashboard" class="btn btn-sm btn-secondary"><?php $L->p('Cancel') ?></a>
 	</div>
 	<?php if($page->draft()): ?>
 	<div class="alert alert-warning p-1 mt-1 mb-0"><?php $L->p('the-content-is-saved-as-a-draft-to-publish-it') ?></div>
diff --git a/bl-kernel/admin/views/edit-user.1.php b/bl-kernel/admin/views/edit-user.1.php
deleted file mode 100644
index e6ede905..00000000
--- a/bl-kernel/admin/views/edit-user.1.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?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 206e7975..68a9b94f 100644
--- a/bl-kernel/admin/views/edit-user.php
+++ b/bl-kernel/admin/views/edit-user.php
@@ -1,23 +1,26 @@
 <?php defined('BLUDIT') or die('Bludit CMS.'); ?>
 
-<?php echo Bootstrap::pageTitle(array('title'=>$L->g('Edit user'), 'icon'=>'person')); ?>
+<?php echo Bootstrap::formOpen(array('id'=>'jsform', 'class'=>'tab-content')); ?>
 
-<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 class="align-middle">
+	<div class="float-right mt-1">
+		<button type="submit" class="btn btn-primary btn-sm" name="save"><?php $L->p('Save') ?></button>
+		<a class="btn btn-secondary btn-sm" href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>" role="button"><?php $L->p('Cancel') ?></a>
+	</div>
+	<?php echo Bootstrap::pageTitle(array('title'=>$L->g('Edit user'), 'icon'=>'person')); ?>
 </div>
+
+<!-- TABS -->
+<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',
@@ -92,40 +95,36 @@
 			'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 class="custom-file mb-2">
+			<input type="file" class="custom-file-input" id="jsprofilePictureInputFile" name="profilePictureInputFile">
+			<label class="custom-file-label" for="jsprofilePictureInputFile"><?php $L->p('Choose images to upload'); ?></label>
 		</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>
+			<img id="jsprofilePicturePreview" class="img-fluid img-thumbnail" alt="Profile picture preview" src="<?php echo (Sanitize::pathFile(PATH_UPLOADS_PROFILES.$user->username().'.png')?DOMAIN_UPLOADS_PROFILES.$user->username().'.png':HTML_PATH_ADMIN_THEME_IMG.'default.svg') ?>" />
 		</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');
-				});
+		$("#jsprofilePictureInputFile").on("change", function() {
+			var formData = new FormData();
+			formData.append('tokenCSRF', tokenCSRF);
+			formData.append('profilePictureInputFile', $(this)[0].files[0]);
+			formData.append('username', $("#jsusername").val());
+			$.ajax({
+				url: HTML_PATH_ADMIN_ROOT+"ajax/profile-picture",
+				type: "POST",
+				data: formData,
+				cache: false,
+				contentType: false,
+				processData: false
+			}).done(function(json) {
+				console.log(json);
+				$("#jsprofilePicturePreview").attr('src',json.absoluteURL+"?time="+Math.random());
 			});
+		});
 		</script>
 	</div>
 
@@ -184,6 +183,7 @@
 			'label'=>'Twitter',
 			'value'=>$user->twitter(),
 			'class'=>'',
+			'placeholder'=>'',
 			'tip'=>''
 		));
 
@@ -192,6 +192,16 @@
 			'label'=>'Facebook',
 			'value'=>$user->facebook(),
 			'class'=>'',
+			'placeholder'=>'',
+			'tip'=>''
+		));
+
+		echo Bootstrap::formInputText(array(
+			'name'=>'codepen',
+			'label'=>'CodePen',
+			'value'=>$user->codepen(),
+			'class'=>'',
+			'placeholder'=>'',
 			'tip'=>''
 		));
 
@@ -200,47 +210,47 @@
 			'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'=>'',
+			'placeholder'=>'',
 			'tip'=>''
 		));
 
 		echo Bootstrap::formInputText(array(
 			'name'=>'gitlab',
-			'label'=>'Gitlab',
+			'label'=>'GitLab',
 			'value'=>$user->gitlab(),
 			'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>
-		';
+		echo Bootstrap::formInputText(array(
+			'name'=>'github',
+			'label'=>'GitHub',
+			'value'=>$user->github(),
+			'class'=>'',
+			'placeholder'=>'',
+			'tip'=>''
+		));
+
+		echo Bootstrap::formInputText(array(
+			'name'=>'linkedin',
+			'label'=>'LinkedIn',
+			'value'=>$user->linkedin(),
+			'class'=>'',
+			'placeholder'=>'',
+			'tip'=>''
+		));
+
+		echo Bootstrap::formInputText(array(
+			'name'=>'mastodon',
+			'label'=>'Mastodon',
+			'value'=>$user->mastodon(),
+			'class'=>'',
+			'placeholder'=>'',
+			'tip'=>''
+		));
 	?>
 	</div>
-</div>
\ No newline at end of file
+</div>
+
+<?php echo Bootstrap::formClose(); ?>
\ No newline at end of file
diff --git a/bl-kernel/admin/views/new-category.php b/bl-kernel/admin/views/new-category.php
index 72b08233..f02bdc71 100644
--- a/bl-kernel/admin/views/new-category.php
+++ b/bl-kernel/admin/views/new-category.php
@@ -1,16 +1,23 @@
-<?php defined('BLUDIT') or die('Bludit CMS.');
+<?php defined('BLUDIT') or die('Bludit CMS.'); ?>
 
-echo Bootstrap::pageTitle(array('title'=>$L->g('New Category'), 'icon'=>'grid-three-up'));
+<?php echo Bootstrap::formOpen(array('id'=>'jsform', 'class'=>'tab-content')); ?>
 
-echo Bootstrap::formOpen(array());
+<div class="align-middle">
+	<div class="float-right mt-1">
+		<button type="submit" class="btn btn-primary btn-sm" name="save"><?php $L->p('Save') ?></button>
+		<a class="btn btn-secondary btn-sm" href="<?php echo HTML_PATH_ADMIN_ROOT.'categories' ?>" role="button"><?php $L->p('Cancel') ?></a>
+	</div>
+	<?php echo Bootstrap::pageTitle(array('title'=>$L->g('New category'), 'icon'=>'tag')); ?>
+</div>
 
+<?php
 	echo Bootstrap::formInputHidden(array(
 		'name'=>'tokenCSRF',
 		'value'=>$security->getTokenCSRF()
 	));
 
-	echo Bootstrap::formInputTextBlock(array(
-		'name'=>'category',
+	echo Bootstrap::formInputText(array(
+		'name'=>'name',
 		'label'=>$L->g('Name'),
 		'value'=>isset($_POST['category'])?$_POST['category']:'',
 		'class'=>'',
@@ -18,11 +25,15 @@ echo Bootstrap::formOpen(array());
 		'tip'=>''
 	));
 
-	echo '
-	<div class="form-group mt-4">
-		<button type="submit" class="btn btn-primary mr-2">'.$L->g('Save').'</button>
-		<a class="btn btn-secondary" href="'.HTML_PATH_ADMIN_ROOT.'categories" role="button">'.$L->g('Cancel').'</a>
-	</div>
-	';
+	echo Bootstrap::formTextarea(array(
+		'name'=>'description',
+		'label'=>$L->g('Description'),
+		'value'=>isset($_POST['description'])?$_POST['description']:'',
+		'class'=>'',
+		'placeholder'=>'',
+		'tip'=>'',
+		'rows'=>3
+	));
+?>
 
-echo Bootstrap::formClose();
+<?php echo Bootstrap::formClose(); ?>
diff --git a/bl-kernel/admin/views/new-content.php b/bl-kernel/admin/views/new-content.php
index 9bc0eea8..0f7bd51b 100644
--- a/bl-kernel/admin/views/new-content.php
+++ b/bl-kernel/admin/views/new-content.php
@@ -48,15 +48,15 @@ echo Bootstrap::formOpen(array(
 
 <!-- TOOLBAR -->
 <div id="jseditorToolbar">
-	<div id="jseditorToolbarRight" class="btn-group btn-group-sm float-right" role="group" aria-label="Basic example">
+	<div id="jseditorToolbarRight" class="btn-group btn-group-sm float-right" role="group" aria-label="Toolbar right">
 		<button type="button" class="btn btn-light" id="jsmediaManagerOpenModal" data-toggle="modal" data-target="#jsmediaManagerModal"><span class="oi oi-image"></span> <?php $L->p('Images') ?></button>
 		<button type="button" class="btn btn-light" id="jsoptionsSidebar" style="z-index:30"><span class="oi oi-cog"></span> <?php $L->p('Options') ?></button>
 	</div>
 
-	<div id="jseditorToolbarLeft" class="btn-group btn-group-sm" role="group" aria-label="Basic example">
-		<button type="button" class="btn btn-primary" id="jsbuttonSave"><?php $L->p('Publish') ?></button>
-		<button type="button" class="btn btn-secondary" id="jsbuttonDraft"><?php $L->p('Save as draft') ?></button>
-		<a href="<?php echo HTML_PATH_ADMIN_ROOT ?>dashboard" class="btn btn-secondary"><?php $L->p('Cancel') ?></a>
+	<div id="jseditorToolbarLeft">
+		<button type="button" class="btn btn-sm btn-primary" id="jsbuttonSave"><?php $L->p('Publish') ?></button>
+		<button type="button" class="btn btn-sm btn-secondary" id="jsbuttonDraft"><?php $L->p('Save as draft') ?></button>
+		<a href="<?php echo HTML_PATH_ADMIN_ROOT ?>dashboard" class="btn btn-sm btn-secondary"><?php $L->p('Cancel') ?></a>
 	</div>
 </div>
 <script>
diff --git a/bl-kernel/admin/views/new-user.php b/bl-kernel/admin/views/new-user.php
index 16126eb4..07f0ea70 100644
--- a/bl-kernel/admin/views/new-user.php
+++ b/bl-kernel/admin/views/new-user.php
@@ -1,9 +1,16 @@
-<?php defined('BLUDIT') or die('Bludit CMS.');
+<?php defined('BLUDIT') or die('Bludit CMS.'); ?>
 
-echo Bootstrap::pageTitle(array('title'=>$L->g('Add a new user'), 'icon'=>'person'));
+<?php echo Bootstrap::formOpen(array('id'=>'jsform', 'class'=>'tab-content')); ?>
 
-echo Bootstrap::formOpen(array());
+<div class="align-middle">
+	<div class="float-right mt-1">
+		<button type="submit" class="btn btn-primary btn-sm" name="save"><?php $L->p('Save') ?></button>
+		<a class="btn btn-secondary btn-sm" href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>" role="button"><?php $L->p('Cancel') ?></a>
+	</div>
+	<?php echo Bootstrap::pageTitle(array('title'=>$L->g('Add a new user'), 'icon'=>'person')); ?>
+</div>
 
+<?php
 	echo Bootstrap::formInputHidden(array(
 		'name'=>'tokenCSRF',
 		'value'=>$security->getTokenCSRF()
@@ -55,12 +62,6 @@ echo Bootstrap::formOpen(array());
 		'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.'users" role="button">'.$L->g('Cancel').'</a>
-	</div>
-	';
-
-echo Bootstrap::formClose();
\ No newline at end of file
+<?php echo Bootstrap::formClose(); ?>
\ No newline at end of file
diff --git a/bl-kernel/admin/views/plugins-position.php b/bl-kernel/admin/views/plugins-position.php
index 2fb49064..dd43dda6 100644
--- a/bl-kernel/admin/views/plugins-position.php
+++ b/bl-kernel/admin/views/plugins-position.php
@@ -1,11 +1,18 @@
-<?php defined('BLUDIT') or die('Bludit CMS.');
+<?php defined('BLUDIT') or die('Bludit CMS.'); ?>
 
-echo Bootstrap::pageTitle(array('title'=>$L->g('Plugins position'), 'icon'=>'tags'));
+<?php echo Bootstrap::formOpen(array('id'=>'jsform', 'class'=>'tab-content')); ?>
 
-echo Bootstrap::alert(array('class'=>'alert-primary', 'text'=>$L->g('Drag and Drop to sort the plugins')));
+<div class="align-middle">
+	<div class="float-right mt-1">
+		<button type="button" class="btn btn-primary btn-sm jsbuttonSave" name="save"><?php $L->p('Save') ?></button>
+		<a class="btn btn-secondary btn-sm" href="<?php echo HTML_PATH_ADMIN_ROOT.'plugins' ?>" role="button"><?php $L->p('Cancel') ?></a>
+	</div>
+	<?php echo Bootstrap::pageTitle(array('title'=>$L->g('Plugins position'), 'icon'=>'tags')); ?>
+</div>
 
-echo Bootstrap::formOpen(array('id'=>'jsform'));
+<div class="alert alert-primary"><?php $L->p('Drag and Drop to sort the plugins') ?></div>
 
+<?php
 	// Token CSRF
 	echo Bootstrap::formInputHidden(array(
 		'name'=>'tokenCSRF',
@@ -22,21 +29,12 @@ echo Bootstrap::formOpen(array('id'=>'jsform'));
 		echo '<li class="list-group-item" data-plugin="'.$Plugin->className().'"><span class="oi oi-move"></span> '.$Plugin->name().'</li>';
 	}
 	echo '</ul>';
-
-	echo '
-	<div class="form-group mt-3">
-		<button type="button" class="jsbuttonSave btn btn-primary">'.$L->g('Save').'</button>
-		<a href="'.HTML_PATH_ADMIN_ROOT.'plugins" class="btn btn-secondary">'.$L->g('Cancel').'</a>
-	</div>
-	';
-
-echo Bootstrap::formClose();
-
 ?>
 
+<?php echo Bootstrap::formClose(); ?>
+
 <script>
 $(document).ready(function() {
-
 	$('.list-group-sortable').sortable({
 		placeholderClass: 'list-group-item'
 	});
diff --git a/bl-kernel/admin/views/users.php b/bl-kernel/admin/views/users.php
index 3aeffa32..e5e7a999 100644
--- a/bl-kernel/admin/views/users.php
+++ b/bl-kernel/admin/views/users.php
@@ -1,3 +1,5 @@
+<?php defined('BLUDIT') or die('Bludit CMS.'); ?>
+
 <?php
 
 echo Bootstrap::pageTitle(array('title'=>$L->g('Users'), 'icon'=>'people'));
diff --git a/bl-kernel/functions.php b/bl-kernel/functions.php
index 89952054..f531cdee 100644
--- a/bl-kernel/functions.php
+++ b/bl-kernel/functions.php
@@ -668,21 +668,21 @@ function checkRole($allowRoles, $redirect=true) {
 
 // Add a new category to the system
 // Returns TRUE is successfully added, FALSE otherwise
-function createCategory($category) {
+function createCategory($args) {
 	global $categories;
 	global $L;
 	global $syslog;
 
-	if (Text::isEmpty($category)) {
+	if (Text::isEmpty($args['name'])) {
 		Alert::set($L->g('Category name is empty'), ALERT_STATUS_FAIL);
 		return false;
 	}
 
-	if ($categories->add(array('name'=>$category))) {
+	if ($categories->add(array('name'=>$args['name'], 'description'=>$args['description']))) {
 		// Add to syslog
 		$syslog->add(array(
 			'dictionaryKey'=>'new-category-created',
-			'notes'=>$category
+			'notes'=>$args['name']
 		));
 
 		Alert::set($L->g('Category added'), ALERT_STATUS_OK);
diff --git a/bl-kernel/user.class.php b/bl-kernel/user.class.php
index b64b64c7..e5734671 100644
--- a/bl-kernel/user.class.php
+++ b/bl-kernel/user.class.php
@@ -140,6 +140,11 @@ class User {
 		return $this->getValue('linkedin');
 	}
 
+	public function mastodon()
+	{
+		return $this->getValue('mastodon');
+	}
+
 	public function profilePicture()
 	{
 		$filename = $this->getValue('username').'.png';