diff --git a/components/article.php b/components/article.php
index 4aef40a..f0899a4 100644
--- a/components/article.php
+++ b/components/article.php
@@ -22,11 +22,12 @@
       <small class="author-date">Le <?php the_time('l j F Y à H:i') ?></small>
     </div>
   </div>
+  <div class="card-body">
+    <?php include(TEMPLATEPATH . '/components/article/description.php'); ?>
 
-  <?php include(TEMPLATEPATH . '/components/article/description.php'); ?>
-
-  <div class="article-category">
-    <?php include(TEMPLATEPATH . '/components/article/terms.php'); ?>
+    <div class="article-category">
+      <?php include(TEMPLATEPATH . '/components/article/terms.php'); ?>
+    </div>
   </div>
 </section>
 
diff --git a/components/article/description.php b/components/article/description.php
index c1aabe1..6940d32 100644
--- a/components/article/description.php
+++ b/components/article/description.php
@@ -3,7 +3,7 @@
   $my_custom_field = $custom_fields['description'];
   if ($my_custom_field != null) {
     foreach ( $my_custom_field as $key => $value ) {
-      echo " <div class='card-body'> " . $value . "</div>";
+      echo " <div> " . $value . "</div>";
     }
   }
 ?>
diff --git a/components/article/terms.php b/components/article/terms.php
index 608c872..5e3dee5 100644
--- a/components/article/terms.php
+++ b/components/article/terms.php
@@ -2,18 +2,18 @@
   if (has_category('chapters')) {
     $romans = get_the_terms($post->ID, 'roman');
     foreach( $romans as $roman ) {
-      echo "<a href= '" . esc_url( get_category_link( $roman->term_id ) ) . "' class='btn-small btn-info'><i class='fa fa-book'></i> " . $roman->name . "</a>";
+      echo "<a href= '" . esc_url( get_category_link( $roman->term_id ) ) . "' class='btn-small btn-info mr-2'><i class='fa fa-book mr-1'></i> " . $roman->name . "</a>";
     }
   } else {
     $categories = get_the_category();
     foreach( $categories as $category ) {
-      echo "<a href= '" . esc_url( get_category_link( $category->term_id ) ) . "' class='btn-small btn-info'><i class='fa fa-folder'></i> " . $category->cat_name . "</a>";
+      echo "<a href= '" . esc_url( get_category_link( $category->term_id ) ) . "' class='btn-small btn-info mr-2'><i class='fa fa-folder mr-1'></i> " . $category->cat_name . "</a>";
     }
   }
   $tags = get_the_tags();
   if ($tags) {
     foreach( $tags as $tag ) {
-      echo "<a href= '" . esc_url( get_tag_link( $tag->term_id ) ) . "' class='btn-small btn-primary'><i class='fa fa-tag'></i> " . $tag->name . "</a> ";
+      echo "<a href= '" . esc_url( get_tag_link( $tag->term_id ) ) . "' class='btn-small btn-primary mr-2'><i class='fa fa-tag mr-1'></i> " . $tag->name . "</a> ";
     }
   }
 ?>
diff --git a/scss/_typography.scss b/scss/_typography.scss
index d79e764..bc5c76a 100644
--- a/scss/_typography.scss
+++ b/scss/_typography.scss
@@ -56,7 +56,7 @@ a, a:visited {
 
 p {
   @include paragraph();
-  &:last-child {
+  .card-body > &:last-child, &.p-img {
     padding-bottom:0;
   }
 }
@@ -83,7 +83,7 @@ ul, ol {
 .container-article, .container-typographic {
   max-width: 800px;
   margin:auto;
-  margin-bottom: 3rem;
+  margin-bottom: 1.5rem;
 }
 
 .container-typographic {
diff --git a/style.css b/style.css
index 7c968b3..42fc06f 100644
--- a/style.css
+++ b/style.css
@@ -323,7 +323,7 @@ p {
   padding: 0;
   padding-bottom: 1.5rem;
   margin: 0; }
-  p:last-child {
+  .card-body > p:last-child, p.p-img {
     padding-bottom: 0; }
 
 ul, ol {
@@ -351,7 +351,7 @@ ul, ol {
 .container-article, .container-typographic {
   max-width: 800px;
   margin: auto;
-  margin-bottom: 3rem; }
+  margin-bottom: 1.5rem; }
 
 .container-typographic p {
   padding: 0;