diff --git a/lib/refrepo/gen/wiki/generators/oarsub_simplifier_aliases.rb b/lib/refrepo/gen/wiki/generators/oarsub_simplifier_aliases.rb
index 81a94a7b5fe795d9c8dfdddedb8c656b883aa5f6..3ed9e73f686660731dc4824d69f0db510fda3527 100644
--- a/lib/refrepo/gen/wiki/generators/oarsub_simplifier_aliases.rb
+++ b/lib/refrepo/gen/wiki/generators/oarsub_simplifier_aliases.rb
@@ -20,14 +20,14 @@ class OarsubSimplifierAliasesGenerator < WikiGenerator
     @generated_content = "__NOEDITSECTION__\n"
 
     @generated_content += "=== Clusters and nodes ===\n"
-    @generated_content += "<code>%d</code> represent a node's number.\n"
-    @generated_content += "{|class=\"wikitable\"\n"
-    @generated_content += "! style=\"width: 15%\" | Alias\n"
-    @generated_content += "! style=\"width: 30%\" | Description\n"
-    @generated_content += "! style=\"width: 30%\" | Translate to\n"
-    @generated_content += "! style=\"width: 30%\" | Site\n"
+    @generated_content += "<code>%d</code> represent a node's number.<br/><br/>\n"
 
     sites_aliases.each do |site, aliases|
+      @generated_content += "'''#{site.capitalize}'''\n"
+      @generated_content += "{|class=\"wikitable mw-collapsible mw-collapsed\"\n"
+      @generated_content += "! style=\"width: 15%\" | Alias\n"
+      @generated_content += "! style=\"width: 30%\" | Description\n"
+      @generated_content += "! style=\"width: 30%\" | Translate to\n"
       aliases.each do |al, value|
         desc = if al.match(/([a-zA-Z]+)-\%d/)
                  "Select a node from cluster #{$1.capitalize}"
@@ -39,11 +39,10 @@ class OarsubSimplifierAliasesGenerator < WikiGenerator
         @generated_content += "|#{al}\n"
         @generated_content += "|#{desc}\n"
         @generated_content += "|<code>#{value}</code>\n"
-        @generated_content += "|#{site}\n"
       end
+      @generated_content += "|}\n"
+      @generated_content += "\n"
     end
-    @generated_content += "|}\n"
-    @generated_content += "\n"
 
     default_aliases_by_category.sort.each do |cat, data|
       @generated_content += "=== #{cat} ===\n"