diff --git a/app/models/concerns/with_blocks.rb b/app/models/concerns/with_blocks.rb
index 3ba12f3e3db4e6b1449926b7306b4ef9c8b27990..a710e06fbb736c612fb74cb2e607910f6cf877e3 100644
--- a/app/models/concerns/with_blocks.rb
+++ b/app/models/concerns/with_blocks.rb
@@ -11,6 +11,8 @@ module WithBlocks
 
   # Basic rule is: TOC if 2 titles or more
   def show_toc?
-    (blocks.collect(&:title) - ['']).many?
+    blocks.collect(&:title)
+          .reject(&:blank?)
+          .many?
   end
 end
diff --git a/app/views/admin/application/static/_layout.html.erb b/app/views/admin/application/static/_design.html.erb
similarity index 98%
rename from app/views/admin/application/static/_layout.html.erb
rename to app/views/admin/application/static/_design.html.erb
index ef995a8c545a4f16db6bc975d6771b47bddb8c0c..c6212a7be51b4b94ee4b9b0af6c2cadacdcf6ea8 100644
--- a/app/views/admin/application/static/_layout.html.erb
+++ b/app/views/admin/application/static/_design.html.erb
@@ -6,7 +6,7 @@ toc_offcanvas = local_assigns.has_key?(:toc_offcanvas)  ? local_assigns[:toc_off
 toc_present = local_assigns.has_key?(:toc_present)      ? local_assigns[:toc_present]
                                                         : @about.show_toc?
 %>
-layout:
+design:
   full_width: <%= full_width %>
   toc:
     present: <%= toc_present %>
diff --git a/app/views/admin/communication/websites/categories/static.html.erb b/app/views/admin/communication/websites/categories/static.html.erb
index e2ce17432638c097c66b4f84b3a930cd87152d41..a48ec0c9851cd15865c8484572e88e42031ee0ef 100644
--- a/app/views/admin/communication/websites/categories/static.html.erb
+++ b/app/views/admin/communication/websites/categories/static.html.erb
@@ -1,7 +1,7 @@
 ---
 title: "<%= @about.name %>"
 <%= render 'admin/application/static/permalink', forced_slug: @about.slug_with_ancestors_slugs %>
-<%= render 'admin/application/static/layout', full_width: true, toc_present: false, toc_offcanvas: false %>
+<%= render 'admin/application/static/design', full_width: true, toc_present: false, toc_offcanvas: false %>
 <% if @about.parent %>
 parent: "<%= @about.parent.path %>"
 <% end %>
diff --git a/app/views/admin/communication/websites/pages/static.html.erb b/app/views/admin/communication/websites/pages/static.html.erb
index c8a35e39e41ab8d8ecefc206a3b6adce547aecb4..05742e3f09c71d853a7ed68b7766654b5fb23a62 100644
--- a/app/views/admin/communication/websites/pages/static.html.erb
+++ b/app/views/admin/communication/websites/pages/static.html.erb
@@ -3,7 +3,7 @@ title: >
   <%= @about.title %>
 breadcrumb_title: "<%= @about.breadcrumb_title.blank? ? @about.title : @about.breadcrumb_title  %>"
 <%= render 'admin/application/static/permalink' %>
-<%= render 'admin/application/static/layout' %>
+<%= render 'admin/application/static/design' %>
 <% if @about.kind_persons? %>
 has:
   administrators: <%= @website.has_administrators? %>
diff --git a/app/views/admin/communication/websites/posts/static.html.erb b/app/views/admin/communication/websites/posts/static.html.erb
index dc3b5b46aa56a8feef77ec153c3ed869402822f3..f354bcfa1fdd79422f5f39898226daa939fa3e6d 100644
--- a/app/views/admin/communication/websites/posts/static.html.erb
+++ b/app/views/admin/communication/websites/posts/static.html.erb
@@ -2,7 +2,7 @@
 title: "<%= @about.title %>"
 date: "<%= @about.published_at.iso8601 %>"
 <%= render 'admin/application/static/permalink' %>
-<%= render 'admin/application/static/layout', full_width: false, toc_offcanvas: false %>
+<%= render 'admin/application/static/design', full_width: false, toc_offcanvas: false %>
 <% if @about.pinned %>
 weight: 1
 <% end %>
diff --git a/app/views/admin/education/diplomas/static.html.erb b/app/views/admin/education/diplomas/static.html.erb
index 41377cb4e8dfe8a896b8daabb02410869854c6b3..ee3fad817e0b7ce1bb05ad0d671b753f895da64e 100644
--- a/app/views/admin/education/diplomas/static.html.erb
+++ b/app/views/admin/education/diplomas/static.html.erb
@@ -2,7 +2,7 @@
 title: >
   <%= prepare_text_for_static @about.name %>
 <%= render 'admin/application/static/permalink' %>
-<%= render 'admin/application/static/layout', full_width: true, toc_offcanvas: true %>
+<%= render 'admin/application/static/design', full_width: true, toc_offcanvas: true %>
 short_name: >
   <%= prepare_text_for_static @about.short_name %>
 <%= render 'admin/application/chapo/static' %>
diff --git a/app/views/admin/education/programs/static.html.erb b/app/views/admin/education/programs/static.html.erb
index d678dfd7784a693cb3eca1efba31c6b9ded8ffeb..0ae9a9b2e7a16f573daa44bb0af66f8ce4651261 100644
--- a/app/views/admin/education/programs/static.html.erb
+++ b/app/views/admin/education/programs/static.html.erb
@@ -10,7 +10,7 @@ administrator_involvements = @about.involvements_through_roles
 title: >
   <%= @about.name %>
 url: <%= @about.path_in_website(@website) %>
-<%= render 'admin/application/static/layout', full_width: false, toc_offcanvas: true %>
+<%= render 'admin/application/static/design', full_width: false, toc_offcanvas: true %>
 <% if @about.downloadable_summary.attached? %>
 downloadable_summary: <%= @about.downloadable_summary.blob_id %>
 <% end %>
diff --git a/app/views/admin/university/people/administrators/static.html.erb b/app/views/admin/university/people/administrators/static.html.erb
index 7e0b6949d5df4ee239e213df31a69d39cd31ae91..a9c89c3f8f5748c5a06e6cc1702e2b3228b58470 100644
--- a/app/views/admin/university/people/administrators/static.html.erb
+++ b/app/views/admin/university/people/administrators/static.html.erb
@@ -2,7 +2,7 @@
 title: >
   Responsabilités de <%= @about.to_s %>
 <%= render 'admin/application/static/permalink' %>
-<%= render 'admin/application/static/layout', full_width: true, toc_offcanvas: true %>
+<%= render 'admin/application/static/design', full_width: true, toc_offcanvas: true %>
 person: >
   <%= @about.to_s %>
 first_name: >
diff --git a/app/views/admin/university/people/authors/static.html.erb b/app/views/admin/university/people/authors/static.html.erb
index f8a22b4a17cad6298fb7dc7bd56572ac53d6892c..7551467dd9db87c3d875ee4971b625b811ac4d89 100644
--- a/app/views/admin/university/people/authors/static.html.erb
+++ b/app/views/admin/university/people/authors/static.html.erb
@@ -2,7 +2,7 @@
 title: >
   Actualités de <%= @about.to_s %>
 <%= render 'admin/application/static/permalink' %>
-<%= render 'admin/application/static/layout', full_width: true, toc_offcanvas: true %>
+<%= render 'admin/application/static/design', full_width: true, toc_offcanvas: true %>
 person: >
   <%= @about.to_s %>
 first_name: >
diff --git a/app/views/admin/university/people/researchers/static.html.erb b/app/views/admin/university/people/researchers/static.html.erb
index 43775e7fbb17efe34ede568fe5ecff3ece106b2b..a18df13be078a9bbac0ee5605e6757b9597d54cd 100644
--- a/app/views/admin/university/people/researchers/static.html.erb
+++ b/app/views/admin/university/people/researchers/static.html.erb
@@ -2,7 +2,7 @@
 title: >
   Publications de <%= @about.to_s %>
 <%= render 'admin/application/static/permalink' %>
-<%= render 'admin/application/static/layout', full_width: true, toc_offcanvas: true %>
+<%= render 'admin/application/static/design', full_width: true, toc_offcanvas: true %>
 person: >
   <%= @about.to_s %>
 first_name: >
diff --git a/app/views/admin/university/people/static.html.erb b/app/views/admin/university/people/static.html.erb
index 2d2c0672d8353f561af396cb829c0fd882ecc5fb..8b28e9fa43a4e8981042cc7a70a5dc3f5b5d5d45 100644
--- a/app/views/admin/university/people/static.html.erb
+++ b/app/views/admin/university/people/static.html.erb
@@ -2,7 +2,7 @@
 title: >
   <%= @about.to_s %>
 <%= render 'admin/application/static/permalink' %>
-<%= render 'admin/application/static/layout', full_width: true, toc_offcanvas: true %>
+<%= render 'admin/application/static/design', full_width: true, toc_offcanvas: true %>
 first_name: >
   <%= @about.first_name %>
 last_name: >
diff --git a/app/views/admin/university/people/teachers/static.html.erb b/app/views/admin/university/people/teachers/static.html.erb
index b6fa59cbd79ab9257c6525482d06c94026b30483..5d5d5d01f305515b3c5b9c5666d6318bbcad2ef6 100644
--- a/app/views/admin/university/people/teachers/static.html.erb
+++ b/app/views/admin/university/people/teachers/static.html.erb
@@ -2,7 +2,7 @@
 title: >
   Enseignements de <%= @about.to_s %>
 <%= render 'admin/application/static/permalink' %>
-<%= render 'admin/application/static/layout', full_width: true, toc_offcanvas: true %>
+<%= render 'admin/application/static/design', full_width: true, toc_offcanvas: true %>
 person: >
   <%= @about.to_s %>
 first_name: >