diff --git a/_includes/explorer/documents.html b/_includes/explorer/documents.html
index 53f1896ed..ce280f033 100644
--- a/_includes/explorer/documents.html
+++ b/_includes/explorer/documents.html
@@ -52,13 +52,20 @@
{%- if instance[0] contains '@' -%}{%- continue -%}{%- endif -%}
{%- capture docs_path4 -%}{%- endcapture -%}
{%- if instance[0] != "" -%}{%- capture docs_path4 -%}/{{ instance[0] }}{%- endcapture %}{%- endif -%}
- {%- capture docs_url -%}{{ docs_path1 }}{{ docs_path2 }}{{ docs_path3 }}{{ docs_path4 }}{%- endcapture -%}
- {%- capture docs_link -%}{% if instance[1]['@permalink'] %}{{ instance[1]['@permalink'] }}{% else %}/documents{{ docs_url }}/{% endif %}{%- endcapture -%}
+ {% if instance[1]['@permalink'] %}
+ {%- capture docs_link -%}{{ instance[1]['@permalink'] }}{%- endcapture -%}
+ {%- capture docs_url -%}{{ docs_link | replace: "/documents","" | append: "@" | replace: "/@","" }}{%- endcapture -%}
+ {% else %}
+ {%- capture docs_url -%}{{ docs_path1 }}{{ docs_path2 }}{{ docs_path3 }}{{ docs_path4 }}{%- endcapture -%}
+ {%- capture docs_link -%}/documents{{ docs_url }}/{%- endcapture -%}
+ {% endif %}
{%- assign docs_item = instance[1]['@title'] -%}
{%- if instance[1]['@permalink'] or instance[1]['@documents'] -%}
{%- capture docs_item -%}{{ docs_item }}{%- endcapture -%}
{%- endif %}
- {%- capture attrs -%}id="documents-{{ docs_url | remove_first: "/" | replace: "/", "-" }}" class="pcjs-explorer-item"{%- if instance[1]['@desc'] %} title="{{ instance[1]['@desc'] }}"{%- endif -%}{%- endcapture %}
+ {%- capture docs_id -%}documents{{ docs_url | replace: "/", "-" }}{%- endcapture -%}
+ {%- if docs_id == "documents" -%}{%- assign docs_id = "library" -%}{%- endif -%}
+ {%- capture attrs -%}id="{{ docs_id }}" class="pcjs-explorer-item"{%- if instance[1]['@desc'] %} title="{{ instance[1]['@desc'] }}"{%- endif -%}{%- endcapture %}
{{ docs_item }}
{%- endfor -%}
{%- if subcategory[0] != "@instances" %}
diff --git a/_includes/explorer/scripts.html b/_includes/explorer/scripts.html
index aea1c01e5..0fcc5996f 100644
--- a/_includes/explorer/scripts.html
+++ b/_includes/explorer/scripts.html
@@ -26,6 +26,7 @@
let element;
if (prefix) path = prefix + path;
let id = path.substr(1).replace(/\//g, '-').replace(/-$/, '');
+ if (id == "documents") id = "library";
do {
element = document.getElementById(id);
if (element) break;
diff --git a/_includes/gallery/alldocs.html b/_includes/gallery/alldocs.html
index e9fd54223..c33d6fc1d 100644
--- a/_includes/gallery/alldocs.html
+++ b/_includes/gallery/alldocs.html
@@ -37,7 +37,7 @@ {{ include.title | default: "All Documents" }}
{%- capture target %}/{{ root | replace: "hardware","machines" }}{% endcapture %}
{%- assign title = data['@title'] | default: item['@title'] %}
{%- capture link %}{{ target }}/{% endcapture %}
- {%- include gallery/documents.html target=target title=title link=link %}
+ {%- include gallery/documents.html target=target title=title link=link style="left" %}
{%- assign alldocs_exist = true %}
{%- endif %}
{%- endif %}
diff --git a/_includes/gallery/documents.html b/_includes/gallery/documents.html
index 93e7fdd65..e8c983f10 100644
--- a/_includes/gallery/documents.html
+++ b/_includes/gallery/documents.html
@@ -1,7 +1,7 @@
{% assign title = include.title | default: "Documents" %}
{% assign group = include.group | default: "@documents" %}
{% assign group_link = include.link %}
-{% assign group_id = title | replace: "@", "" | replace: " ", "-" | downcase %}
+{% assign group_id = title | slugify %}
{% assign cover_width = include.width | default: "200" %}
{% assign cover_height = include.height | default: "" %}
{% assign path = include.path | default: include.target | default: page.permalink %}
@@ -70,7 +70,7 @@