diff --git a/src/Form/SimplesitemapCustomLinksForm.php b/src/Form/SimplesitemapCustomLinksForm.php
index 82b0599952947715d039237cb31637503e0b367c..6b8c9c4b47a7f8645b8341bb9ad4f787d2674162 100644
--- a/src/Form/SimplesitemapCustomLinksForm.php
+++ b/src/Form/SimplesitemapCustomLinksForm.php
@@ -25,7 +25,7 @@ class SimplesitemapCustomLinksForm extends SimplesitemapFormBase {
     $form['simple_sitemap_custom'] = [
       '#title' => $this->t('Custom links'),
       '#type' => 'fieldset',
-      '#markup' => '<p>' . $this->t('Add custom internal drupal paths to the XML sitemap.') . '</p>',
+      '#markup' => '<div class="description">' . $this->t('Add custom internal drupal paths to the XML sitemap.') . '</div>',
       '#prefix' => $this->getDonationText(),
     ];
 
diff --git a/src/Form/SimplesitemapEntitiesForm.php b/src/Form/SimplesitemapEntitiesForm.php
index 800a2f2beb82b5f669d81af7cc6fc59a728ccde8..8a7bd79f0062ab642d98cb7caef59053cfc962d5 100644
--- a/src/Form/SimplesitemapEntitiesForm.php
+++ b/src/Form/SimplesitemapEntitiesForm.php
@@ -27,7 +27,7 @@ class SimplesitemapEntitiesForm extends SimplesitemapFormBase {
     $form['simple_sitemap_entities']['entities'] = [
       '#title' => $this->t('Sitemap entities'),
       '#type' => 'fieldset',
-      '#markup' => '<p>' . $this->t('Simple XML sitemap settings will be added only to entity forms of entity types enabled here. For all entity types featuring bundles (e.g. <em>node</em>) sitemap settings have to be set on their bundle pages (e.g. <em>page</em>).') . '</p>',
+      '#markup' => '<div class="description">' . $this->t('Simple XML sitemap settings will be added only to entity forms of entity types enabled here. For all entity types featuring bundles (e.g. <em>node</em>) sitemap settings have to be set on their bundle pages (e.g. <em>page</em>).') . '</div>',
     ];
 
     $form['#attached']['library'][] = 'simple_sitemap/sitemapEntities';
diff --git a/src/Form/SimplesitemapSettingsForm.php b/src/Form/SimplesitemapSettingsForm.php
index 06b002eb554bfc0743577e63d341d14d27cd14c1..332f9c0d6df9fb2d289b9c2d2ae7c6639103d286 100644
--- a/src/Form/SimplesitemapSettingsForm.php
+++ b/src/Form/SimplesitemapSettingsForm.php
@@ -4,7 +4,6 @@ namespace Drupal\simple_sitemap\Form;
 
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Component\Utility\UrlHelper;
-use Drupal\simple_sitemap\Plugin\simple_sitemap\SitemapGenerator\SitemapGeneratorBase;
 
 /**
  * Class SimplesitemapSettingsForm
@@ -29,25 +28,30 @@ class SimplesitemapSettingsForm extends SimplesitemapFormBase {
     $form['simple_sitemap_settings']['status'] = [
       '#type' => 'fieldset',
       '#title' => $this->t('Sitemap status'),
-      '#markup' => '<p>' . $this->t('Sitemaps can be regenerated on demand here.') . '</p>',
+      '#markup' => '<div class="description">' . $this->t('Sitemaps can be regenerated on demand here.') . '</div>',
       '#description' => $this->t('Variants can be configured <a href="@url">here</a>.', ['@url' => $GLOBALS['base_url'] . '/admin/config/search/simplesitemap/variants']),
     ];
 
-    $form['simple_sitemap_settings']['status']['regenerate_submit'] = [
+    $form['simple_sitemap_settings']['status']['actions'] = [
+      '#prefix' => '<div class="clearfix"><div class="form-item">',
+      '#suffix' => '</div></div>',
+    ];
+
+    $form['simple_sitemap_settings']['status']['actions']['regenerate_submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Generate from queue'),
       '#submit' => ['::generateSitemap'],
       '#validate' => [],
     ];
 
-//    $form['simple_sitemap_settings']['status']['regenerate_backend_submit'] = [
+//    $form['simple_sitemap_settings']['status']['actions']['regenerate_backend_submit'] = [
 //      '#type' => 'submit',
 //      '#value' => $this->t('Generate from queue (background)'),
 //      '#submit' => ['::generateSitemapBackend'],
 //      '#validate' => [],
 //    ];
 
-    $form['simple_sitemap_settings']['status']['rebuild_queue_submit'] = [
+    $form['simple_sitemap_settings']['status']['actions']['rebuild_queue_submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Rebuild queue'),
       '#submit' => ['::rebuildQueue'],
@@ -55,7 +59,7 @@ class SimplesitemapSettingsForm extends SimplesitemapFormBase {
     ];
 
     $form['simple_sitemap_settings']['status']['progress'] = [
-      '#prefix' => '<div class="simple-sitemap-progress form-item clearfix">',
+      '#prefix' => '<div class="clearfix">',
       '#suffix' => '</div>',
     ];
 
@@ -88,10 +92,12 @@ class SimplesitemapSettingsForm extends SimplesitemapFormBase {
           '#type' => 'details',
           '#title' => '<em>' . $type_definition['label'] . '</em> ' . $this->t('sitemaps'),
           '#open' => !empty($variants) && count($variants) <= 5,
+          '#description' => !empty($type_definition['description']) ? '<div class="description">' . $type_definition['description'] . '</div>' : '',
         ];
         $form['simple_sitemap_settings']['status']['types'][$type_name]['table'] = [
           '#type' => 'table',
           '#header' => [$this->t('Variant'), $this->t('Status'), /*$this->t('Actions')*/],
+          '#attributes' => ['class' => ['form-item', 'clearfix']],
         ];
         foreach ($variants as $variant_name => $variant_definition) {
           $row = [];
diff --git a/src/Form/SimplesitemapVariantsForm.php b/src/Form/SimplesitemapVariantsForm.php
index 59c21e5f8238709c4651f6627612c279e3a2bdfb..ebd81427db0407628a84906e55286b748a26bed5 100644
--- a/src/Form/SimplesitemapVariantsForm.php
+++ b/src/Form/SimplesitemapVariantsForm.php
@@ -26,7 +26,7 @@ class SimplesitemapVariantsForm extends SimplesitemapFormBase {
     $form['simple_sitemap_variants'] = [
       '#title' => $this->t('Sitemap variants'),
       '#type' => 'fieldset',
-      '#markup' => '<p>' . $this->t('Define sitemap variants. A sitemap variant is a sitemap instance of a certain type (specific sitemap generator and URL generators) accessible under a certain URL.<br/>Each variant can have its own entity bundle settings (to be defined on bundle edit pages).') . '</p>',
+      '#markup' => '<div class="description">' . $this->t('Define sitemap variants. A sitemap variant is a sitemap instance of a certain type (specific sitemap generator and URL generators) accessible under a certain URL.<br/>Each variant can have its own entity bundle settings (to be defined on bundle edit pages).') . '</div>',
       '#prefix' => $this->getDonationText(),
     ];