diff --git a/bl-kernel/admin/themes/koblog/css/koblog.css b/bl-kernel/admin/themes/koblog/css/koblog.css
index de382c95..493ac11d 100644
--- a/bl-kernel/admin/themes/koblog/css/koblog.css
+++ b/bl-kernel/admin/themes/koblog/css/koblog.css
@@ -219,7 +219,8 @@ body.login {
 	PLUGINS
 */
 
-.plugin-form label {
+.plugin-form label:not(:first-child),
+.plugin-form > div:not(:first-child) > label {
 	display: block;
 	margin-top: 1rem !important;
 }
@@ -359,4 +360,4 @@ img.profilePicture {
 
 .switch-icon-publish {
 	color: #1cb11c;
-}
+}
\ No newline at end of file
diff --git a/bl-kernel/admin/views/configure-plugin.php b/bl-kernel/admin/views/configure-plugin.php
index 189f6001..417d319a 100644
--- a/bl-kernel/admin/views/configure-plugin.php
+++ b/bl-kernel/admin/views/configure-plugin.php
@@ -27,14 +27,23 @@
 	<?php endif; ?>
 </div>
 
-<div class="card">
-	<div class="card-body">
-	<?php
+<?php if ($plugin->description()): ?>
+	<p class="alert alert-primary">
+	<?php echo $plugin->description(); ?>
+	</p>
+<?php endif; ?>
+
+<?php
 		// Token CSRF
 		echo Bootstrap::formInputHidden(array(
 			'name'=>'tokenCSRF',
 			'value'=>$security->getTokenCSRF()
 		));
+?>
+
+<div class="card">
+	<div class="card-body plugin-form">
+	<?php
 
 		// Print the plugin form
 		echo $plugin->form();
diff --git a/bl-plugins/about/plugin.php b/bl-plugins/about/plugin.php
index 7d787b08..82959103 100644
--- a/bl-plugins/about/plugin.php
+++ b/bl-plugins/about/plugin.php
@@ -15,11 +15,7 @@ class pluginAbout extends Plugin
 	{
 		global $L;
 
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
-		$html .= '<div>';
+		$html = '<div>';
 		$html .= '<label>' . $L->get('Label') . '</label>';
 		$html .= '<input name="label" type="text" dir="auto" value="' . $this->getValue('label') . '">';
 		$html .= '<span class="tip">' . $L->get('This title is almost always used in the sidebar of the site') . '</span>';
diff --git a/bl-plugins/categories/plugin.php b/bl-plugins/categories/plugin.php
index dc68a941..f7f78f5a 100644
--- a/bl-plugins/categories/plugin.php
+++ b/bl-plugins/categories/plugin.php
@@ -17,11 +17,7 @@ class pluginCategories extends Plugin
 	{
 		global $L;
 
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
-		$html .= '<div>';
+		$html = '<div>';
 		$html .= '<label>' . $L->get('Label') . '</label>';
 		$html .= '<input name="label" type="text" dir="auto" value="' . $this->getValue('label') . '">';
 		$html .= '<span class="tip">' . $L->get('This title is almost always used in the sidebar of the site') . '</span>';
diff --git a/bl-plugins/custom-fields-parser/plugin.php b/bl-plugins/custom-fields-parser/plugin.php
index 1d5e7e20..5bd87873 100644
--- a/bl-plugins/custom-fields-parser/plugin.php
+++ b/bl-plugins/custom-fields-parser/plugin.php
@@ -15,10 +15,8 @@ class pluginCustomFieldsParser extends Plugin {
 		global $L;
 		global $site;
 
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
+		$html  = '';
+		
 		$jsondb = $this->getValue('jsondb', false);
 		$database = json_decode($jsondb, true);
 
diff --git a/bl-plugins/disqus/plugin.php b/bl-plugins/disqus/plugin.php
index 0da9eb0e..9045eb75 100644
--- a/bl-plugins/disqus/plugin.php
+++ b/bl-plugins/disqus/plugin.php
@@ -17,11 +17,7 @@ class pluginDisqus extends Plugin
 	{
 		global $L;
 
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
-		$html .= '<div>';
+		$html = '<div>';
 		$html .= '<label>' . $L->get('disqus-shortname') . '</label>';
 		$html .= '<input name="shortname" id="jsshortname" type="text" dir="auto" value="' . $this->getValue('shortname') . '">';
 		$html .= '<span class="tip">' . $L->get('Get the shortname from the Disqus general settings') . '</span>';
diff --git a/bl-plugins/hit-counter/plugin.php b/bl-plugins/hit-counter/plugin.php
index c0fe7a97..3ebfc96c 100644
--- a/bl-plugins/hit-counter/plugin.php
+++ b/bl-plugins/hit-counter/plugin.php
@@ -28,13 +28,8 @@ class pluginHitCounter extends Plugin
 			return $html;
 		}
 
-		// Show the description of the plugin in the settings
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
 		// Label of the plugin to show in the sidebar
-		$html .= '<div>';
+		$html = '<div>';
 		$html .= '<label>' . $L->get('Label') . '</label>';
 		$html .= '<input name="label" type="text" dir="auto" value="' . $this->getValue('label') . '">';
 		$html .= '<span class="tip">' . $L->get('This title is almost always used in the sidebar of the site') . '</span>';
diff --git a/bl-plugins/html-code/plugin.php b/bl-plugins/html-code/plugin.php
index b476f04e..8eb1d136 100644
--- a/bl-plugins/html-code/plugin.php
+++ b/bl-plugins/html-code/plugin.php
@@ -18,11 +18,7 @@ class pluginHTMLCode extends Plugin {
 	{
 		global $L;
 
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
-		$html .= '<h2>'.$L->g('Website').'</h2>';
+		$html = '<h2>'.$L->g('Website').'</h2>';
 
 		$html .= '<div>';
 		$html .= '<label>Head</label>';
diff --git a/bl-plugins/links/plugin.php b/bl-plugins/links/plugin.php
index 3dd2d32e..113f3d9c 100644
--- a/bl-plugins/links/plugin.php
+++ b/bl-plugins/links/plugin.php
@@ -65,11 +65,7 @@ class pluginLinks extends Plugin
 	{
 		global $L;
 
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
-		$html .= '<div>';
+		$html = '<div>';
 		$html .= '<label>' . $L->get('Label') . '</label>';
 		$html .= '<input name="label" class="form-control" type="text" dir="auto" value="' . $this->getValue('label') . '">';
 		$html .= '<span class="tip">' . $L->get('This title is almost always used in the sidebar of the site') . '</span>';
diff --git a/bl-plugins/maintenance-mode/plugin.php b/bl-plugins/maintenance-mode/plugin.php
index d51a6930..4004afe9 100644
--- a/bl-plugins/maintenance-mode/plugin.php
+++ b/bl-plugins/maintenance-mode/plugin.php
@@ -15,11 +15,7 @@ class pluginMaintenanceMode extends Plugin
 	{
 		global $L;
 
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
-		$html .= '<div>';
+		$html = '<div>';
 		$html .= '<label>' . $L->get('Enable maintenance mode') . '</label>';
 		$html .= '<select name="enable">';
 		$html .= '<option value="true" ' . ($this->getValue('enable') === true ? 'selected' : '') . '>Enabled</option>';
diff --git a/bl-plugins/navigation/plugin.php b/bl-plugins/navigation/plugin.php
index 78b74515..2f5a0a1a 100644
--- a/bl-plugins/navigation/plugin.php
+++ b/bl-plugins/navigation/plugin.php
@@ -18,11 +18,7 @@ class pluginNavigation extends Plugin
 	{
 		global $L;
 
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
-		$html .= '<div>';
+		$html = '<div>';
 		$html .= '<label>' . $L->get('Label') . '</label>';
 		$html .= '<input id="jslabel" name="label" type="text" dir="auto" value="' . $this->getValue('label') . '">';
 		$html .= '<span class="tip">' . $L->get('This title is almost always used in the sidebar of the site') . '</span>';
diff --git a/bl-plugins/opengraph/plugin.php b/bl-plugins/opengraph/plugin.php
index b0a297d7..4c3b877c 100644
--- a/bl-plugins/opengraph/plugin.php
+++ b/bl-plugins/opengraph/plugin.php
@@ -16,11 +16,7 @@ class pluginOpenGraph extends Plugin
 	{
 		global $L;
 
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
-		$html .= '<div>';
+		$html = '<div>';
 		$html .= '<label>' . $L->get('Default image') . '</label>';
 		$html .= '<input id="jsdefaultImage" name="defaultImage" type="text" dir="auto" value="' . $this->getValue('defaultImage') . '" placeholder="https://">';
 		$html .= '<span class="tip">' . $L->g('set-a-default-image-for-content') . '</span>';
diff --git a/bl-plugins/remote-content/plugin.php b/bl-plugins/remote-content/plugin.php
index 94c98669..98d9259b 100644
--- a/bl-plugins/remote-content/plugin.php
+++ b/bl-plugins/remote-content/plugin.php
@@ -24,11 +24,7 @@ class pluginRemoteContent extends Plugin
 			return '<div class="alert alert-success">' . $language->get('the-extension-zip-is-not-installed') . '</div>';
 		}
 
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
-		$html .= '<div>';
+		$html = '<div>';
 		$html .= '<label>' . $language->get('Webhook') . '</label>';
 		$html .= '<input id="jswebhook" name="webhook" type="text" dir="auto" value="' . $this->getValue('webhook') . '">';
 		$html .= '<span class="tip">' . DOMAIN_BASE . $this->getValue('webhook') . '</span>';
diff --git a/bl-plugins/robots/plugin.php b/bl-plugins/robots/plugin.php
index 3f6c14ed..13991f81 100644
--- a/bl-plugins/robots/plugin.php
+++ b/bl-plugins/robots/plugin.php
@@ -11,11 +11,7 @@ class pluginRobots extends Plugin {
 
 	public function form()
 	{
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
-		$html .= '<div>';
+		$html = '<div>';
 		$html .= '<label>'.DOMAIN.'/robots.txt</label>';
 		$html .= '<textarea name="robotstxt" id="jsrobotstxt">'.$this->getValue('robotstxt').'</textarea>';
 		$html .= '</div>';
diff --git a/bl-plugins/rss/plugin.php b/bl-plugins/rss/plugin.php
index 56d50302..0482f997 100644
--- a/bl-plugins/rss/plugin.php
+++ b/bl-plugins/rss/plugin.php
@@ -16,11 +16,7 @@ class pluginRSS extends Plugin
 	{
 		global $L;
 
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
-		$html .= '<div>';
+		$html = '<div>';
 		$html .= '<label>' . $L->get('RSS URL') . '</label>';
 		$html .= '<a href="' . Theme::rssUrl() . '">' . Theme::rssUrl() . '</a>';
 		$html .= '</div>';
diff --git a/bl-plugins/search/plugin.php b/bl-plugins/search/plugin.php
index 46b29720..5e3d1c9b 100644
--- a/bl-plugins/search/plugin.php
+++ b/bl-plugins/search/plugin.php
@@ -21,11 +21,7 @@ class pluginSearch extends Plugin
 	{
 		global $L;
 
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
-		$html .= '<div>';
+		$html = '<div>';
 		$html .= '<label>' . $L->get('Label') . '</label>';
 		$html .= '<input name="label" type="text" dir="auto" value="' . $this->getValue('label') . '">';
 		$html .= '<span class="tip">' . $L->get('This title is almost always used in the sidebar of the site') . '</span>';
diff --git a/bl-plugins/sitemap/plugin.php b/bl-plugins/sitemap/plugin.php
index dfb1bee8..753264bd 100644
--- a/bl-plugins/sitemap/plugin.php
+++ b/bl-plugins/sitemap/plugin.php
@@ -15,11 +15,7 @@ class pluginSitemap extends Plugin {
 	{
 		global $L;
 
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
-		$html .= '<div>';
+		$html = '<div>';
 		$html .= '<label>'.$L->get('Sitemap URL').'</label>';
 		$html .= '<a href="'.Theme::sitemapUrl().'">'.Theme::sitemapUrl().'</a>';
 		$html .= '</div>';
diff --git a/bl-plugins/static-pages/plugin.php b/bl-plugins/static-pages/plugin.php
index 5745f0aa..7f2e424a 100644
--- a/bl-plugins/static-pages/plugin.php
+++ b/bl-plugins/static-pages/plugin.php
@@ -17,11 +17,7 @@ class pluginStaticPages extends Plugin
 	{
 		global $L;
 
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
-		$html .= '<div>';
+		$html = '<div>';
 		$html .= '<label>' . $L->get('Label') . '</label>';
 		$html .= '<input id="jslabel" name="label" type="text" dir="auto" value="' . $this->getValue('label') . '">';
 		$html .= '<span class="tip">' . $L->get('This title is almost always used in the sidebar of the site') . '</span>';
diff --git a/bl-plugins/tags/plugin.php b/bl-plugins/tags/plugin.php
index 873488bb..7f599e99 100644
--- a/bl-plugins/tags/plugin.php
+++ b/bl-plugins/tags/plugin.php
@@ -14,11 +14,7 @@ class pluginTags extends Plugin
 	{
 		global $L;
 
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
-		$html .= '<div>';
+		$html = '<div>';
 		$html .= '<label>' . $L->get('Label') . '</label>';
 		$html .= '<input id="jslabel" name="label" type="text" dir="auto" value="' . $this->getValue('label') . '">';
 		$html .= '<span class="tip">' . $L->get('This title is almost always used in the sidebar of the site') . '</span>';
diff --git a/bl-plugins/tinymce/plugin.php b/bl-plugins/tinymce/plugin.php
index eb5ad476..678b482b 100644
--- a/bl-plugins/tinymce/plugin.php
+++ b/bl-plugins/tinymce/plugin.php
@@ -22,11 +22,7 @@ class pluginTinymce extends Plugin
 	{
 		global $L;
 
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
-		$html .= '<div>';
+		$html = '<div>';
 		$html .= '<label>' . $L->get('toolbar-top') . '</label>';
 		$html .= '<input name="toolbar1" id="jstoolbar1" type="text" dir="auto" value="' . $this->getValue('toolbar1') . '">';
 		$html .= '</div>';
diff --git a/bl-plugins/twitter-cards/plugin.php b/bl-plugins/twitter-cards/plugin.php
index 77c04a03..fde7af92 100644
--- a/bl-plugins/twitter-cards/plugin.php
+++ b/bl-plugins/twitter-cards/plugin.php
@@ -15,11 +15,7 @@ class pluginTwitterCards extends Plugin
 	{
 		global $L;
 
-		$html  = '<div class="alert alert-primary" role="alert">';
-		$html .= $this->description();
-		$html .= '</div>';
-
-		$html .= '<div>';
+		$html = '<div>';
 		$html .= '<label>' . $L->get('Default image') . '</label>';
 		$html .= '<input id="jsdefaultImage" name="defaultImage" type="text" dir="auto" value="' . $this->getValue('defaultImage') . '" placeholder="https://">';
 		$html .= '</div>';