diff --git a/comments/templates/comments/_comment_voting_form.html b/comments/templates/comments/_comment_voting_form.html
index 4a794714f1594be031e235f3efca2c223b7f8905..c57be693c8daaa84d651478623b08017d8249c72 100644
--- a/comments/templates/comments/_comment_voting_form.html
+++ b/comments/templates/comments/_comment_voting_form.html
@@ -1,7 +1,7 @@
 
 {% if user.is_authenticated and perms.scipost.can_express_opinion_on_comments %}
     {% if user.contributor != comment.author %}
-    <div class="voting-group {{class}}">
+    <div class="voting-group d-inline-block {{class}}">
         <form action="{% url 'comments:express_opinion' comment_id=comment.id opinion='A' %}" method="post">
             {% csrf_token %}
             <input type="submit" class="btn agree" value="Agree {{ comment.nr_A }}"/>
diff --git a/comments/templates/comments/_comment_voting_summary.html b/comments/templates/comments/_comment_voting_summary.html
index af7744a0d4bccb3ce402404b21d51780ff812429..ca50ff33339ab18fd9868a62e5b0649d81ee8483 100644
--- a/comments/templates/comments/_comment_voting_summary.html
+++ b/comments/templates/comments/_comment_voting_summary.html
@@ -1,4 +1,4 @@
-<div class="voting-group {{class}}">
+<div class="voting-group d-inline-block {{class}}">
   <label class="btn agree">Agree {{ comment.nr_A }}</label>
   <label class="btn neutral">Not sure {{ comment.nr_N }}</label>
   <label class="btn disagree">Disagree {{ comment.nr_D }}</label>
diff --git a/comments/templates/comments/new_comment.html b/comments/templates/comments/new_comment.html
index 8a59f3240486bf5d157ad6217ec57a4e1ad81471..59865219786dc0e0b42e2a3fdd89f16136815881 100644
--- a/comments/templates/comments/new_comment.html
+++ b/comments/templates/comments/new_comment.html
@@ -11,6 +11,6 @@
 
 {% elif not user.is_authenticated %}
 
-<h3  class="text-center"><a href="{% url 'scipost:login' %}?next={{request.path}}" class="btns btxn-info mt-3 px-4">Login to comment</a></h3>
+    <h3 class="text-center my-3"><a href="{% url 'scipost:login' %}?next={{request.path}}">Login to comment</a></h3>
 
 {% endif %}
diff --git a/journals/templates/journals/crossmark_policy.html b/journals/templates/journals/crossmark_policy.html
index 504ad53e1f00cc2aa172895bddf6ba2b557e6cbe..a90fe2080f05d4723c6a099a022ae6f58aec526a 100644
--- a/journals/templates/journals/crossmark_policy.html
+++ b/journals/templates/journals/crossmark_policy.html
@@ -2,16 +2,21 @@
 
 {% block pagetitle %}: SciPost Journals: Crossmark Policy{% endblock pagetitle %}
 
-{% load staticfiles %}
+{% block breadcrumb %}
+    <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+        <div class="container">
+            <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
+            <span class="breadcrumb-item">Crossmark Policy</span>
+        </div>
+    </nav>
+{% endblock %}
 
 {% block content %}
 
-
-<hr>
 <div class="row">
   <div class="col-12">
       <h2 id="Crossmark Policy">Crossmark Policy</h2>
-      <p><a href="https://www.crossref.org/services/crossmark/">Crossmark</a> is a multi-publisher initiative from Crossref to provide a standard way for readers to locate the current version of a piece of content.</p>
+      <p><a target="_blank" href="//www.crossref.org/services/crossmark/">Crossmark</a> is a multi-publisher initiative from Crossref to provide a standard way for readers to locate the current version of a piece of content.</p>
       <p>By applying the Crossmark logo SciPost is committing to maintaining the content it publishes and to alerting readers to changes if and when they occur. Clicking on the Crossmark logo will tell you the current status of a document and may also give you additional publication record information about the document.</p>
       <p>Please refer to our <a href="{% url 'journals:journals_terms_and_conditions' %}">Journals Terms and Conditions</a> for details about our Corrections and Retractions policy.</p>
   </div>
diff --git a/journals/templates/journals/journals_terms_and_conditions.html b/journals/templates/journals/journals_terms_and_conditions.html
index 840fdd57a922bf39548766a8c21f9e0a07d9d291..b740e95b915637d56bb505435d3c0520a386a3c1 100644
--- a/journals/templates/journals/journals_terms_and_conditions.html
+++ b/journals/templates/journals/journals_terms_and_conditions.html
@@ -2,7 +2,15 @@
 
 {% block pagetitle %}: SciPost Journals: terms and conditions{% endblock pagetitle %}
 
-{% load staticfiles %}
+
+{% block breadcrumb %}
+    <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+        <div class="container">
+            <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
+            <span class="breadcrumb-item">Terms and Conditions</span>
+        </div>
+    </nav>
+{% endblock %}
 
 {% block content %}
 
diff --git a/scipost/static/scipost/assets/css/_about.scss b/scipost/static/scipost/assets/css/_about.scss
index 0ed307a0191279d4e1ddaecb3551976a3cac4d0a..eadba7604a83dc152502d97955524be88511748e 100644
--- a/scipost/static/scipost/assets/css/_about.scss
+++ b/scipost/static/scipost/assets/css/_about.scss
@@ -19,12 +19,6 @@
     }
 }
 
-.all-specializations {
-    border: 1px solid $scipost-darkblue;
-    border-radius: 0.15rem;
-    padding: 1rem;
-}
-
 .specialization {
     &.active-search,
     &:hover {
diff --git a/scipost/static/scipost/assets/css/_type.scss b/scipost/static/scipost/assets/css/_type.scss
index b977a46b47376d351398b5b1eb5263cee18a4de4..d8e15d958672c0a5a5dcc1c2ddc3f569f7f050d5 100644
--- a/scipost/static/scipost/assets/css/_type.scss
+++ b/scipost/static/scipost/assets/css/_type.scss
@@ -107,19 +107,25 @@ hr.hr12 {
     margin-bottom: 0;
 }
 
+.circle,
 .circle-clickable {
     display: inline-block;
-    cursor: pointer;
     background: #fff;
-    border: 2px solid #bbb;
+    border: 2px solid #333;
+    color: #333;
     border-radius: 100%;
-    color: #bbb;
     width: 17px;
     height: 17px;
     line-height: 16px;
     text-align: center;
     font-size: 9px;
     transition: 0.1s;
+}
+
+.circle-clickable {
+    cursor: pointer;
+    color: #bbb;
+    border-color: #bbb;
 
     &:hover {
         border-color: #333;
diff --git a/scipost/templates/scipost/EdCol_by-laws.html b/scipost/templates/scipost/EdCol_by-laws.html
index 900240e4c719b11962c6052d84b172dd8b93c3a3..ef6e2be5820209bb2d319526df4f1e7c975d53e0 100644
--- a/scipost/templates/scipost/EdCol_by-laws.html
+++ b/scipost/templates/scipost/EdCol_by-laws.html
@@ -2,12 +2,19 @@
 
 {% block pagetitle %}: Editorial College By-laws{% endblock pagetitle %}
 
+{% block breadcrumb %}
+    <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+        <div class="container">
+            <a href="{% url 'scipost:about' %}" class="breadcrumb-item">About SciPost</a>
+            <span class="breadcrumb-item">Editorial College By-laws</span>
+        </div>
+    </nav>
+{% endblock %}
+
 {% block content %}
 
 {% load scipost_extras %}
 
-
-
 <div class="row">
     <div class="col-12">
         <h1 class="highlight">SciPost Editorial College By-laws</h1>
@@ -16,7 +23,7 @@
   <p>These complement and are subsidiary to the legal statutes of Stichting SciPost (hereafter: the Foundation).</p>
   <ol>
     <hr>
-    <li>Composition of the Editorial College <a href="javascript:;" class="btn btn-secondary" data-toggle="toggle" data-target="#Composition">view/hide</a>
+    <li>Composition of the Editorial College <a href="javascript:;" class="btn btn-default" data-toggle="toggle" data-target="#Composition">view/hide</a>
       <div id="Composition" class="py-2" style="display: none;">
 	<ol>
 	  <li>Eligibility
@@ -84,7 +91,7 @@
     </li>
 
     <hr>
-    <li>Meetings <a href="javascript:;" class="btn btn-secondary" data-toggle="toggle" data-target="#Meetings">view/hide</a>
+    <li>Meetings <a href="javascript:;" class="btn btn-default" data-toggle="toggle" data-target="#Meetings">view/hide</a>
       <div id="Meetings" class="py-2" style="display: none;">
 	<p>The Editorial College, consisting of internationally-renowned scientists with a broad
 	  geographic distribution, does not physically meet. Meetings are instead organized
@@ -120,7 +127,7 @@
     </li>
 
     <hr>
-    <li>Submissions processing <a href="javascript:;" class="btn btn-secondary" data-toggle="toggle" data-target="#SubmissionsProcessing">view/hide</a>
+    <li>Submissions processing <a href="javascript:;" class="btn btn-default" data-toggle="toggle" data-target="#SubmissionsProcessing">view/hide</a>
       <div id="SubmissionsProcessing" class="py-2" style="display: none;">
 	<p>The primary responsibility of the Editorial College is to run the editorial process
 	  for all SciPost Journals. The College shall strive for the very highest standards of
@@ -328,7 +335,7 @@
     </li>
 
     <hr>
-    <li>Amendments <a href="javascript:;" class="btn btn-secondary" data-toggle="toggle" data-target="#Amendments">view/hide</a>
+    <li>Amendments <a href="javascript:;" class="btn btn-default" data-toggle="toggle" data-target="#Amendments">view/hide</a>
       <div id="Amendments" class="py-2" style="display: none;">
 	<p>The present By-laws can be amended by:
 	  <ul>
diff --git a/scipost/templates/scipost/FAQ.html b/scipost/templates/scipost/FAQ.html
index 3c6d8e5b7f7c607bd293755115fad5d2498d3b4d..2ea3aab198538ac2c82a4b5ab38e51235ad1331d 100644
--- a/scipost/templates/scipost/FAQ.html
+++ b/scipost/templates/scipost/FAQ.html
@@ -2,168 +2,294 @@
 
 {% block pagetitle %}: Frequently asked questions{% endblock pagetitle %}
 
-{% load staticfiles %}
+
+{% block breadcrumb %}
+    <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+        <div class="container">
+            <a href="{% url 'scipost:about' %}" class="breadcrumb-item">About SciPost</a>
+            <span class="breadcrumb-item">Frequently asked questions</span>
+        </div>
+    </nav>
+{% endblock %}
 
 {% block content %}
 
-<div class="row">
-    <div class="col-12">
-        <h1 class="highlight">Frequently asked questions</h1>
+<h1 class="highlight-x">Frequently asked questions</h1>
+
+<!-- SciPost -->
+<h2 class="highlight">SciPost</h2>
+<h3>What is SciPost?</h3>
+<p>SciPost is a complete online publication portal managed by and for scientists.</p>
+<p>
+    Preprint handling and circulation occurs through the well-established arXiv;
+    the rest of the publication process, from peer refereeing through publication
+    all the way to post-publication commenting, is offered by SciPost.
+</p>
+<p>
+    Thus, simply stated: share your preprint on <a target="_blank" href="http://www.arxiv.org">arXiv</a>, publish it in <a href="https://scipost.org">SciPost</a>.
+</p><!-- End SciPost -->
+
+<!-- SciPost Journals -->
+<h2 class="highlight">SciPost Journals</h2>
+<div id="journals" data-children=".item">
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#journals" href="#journals_journals" aria-expanded="true" aria-controls="journals_journals">
+            <h3>Which Journals does SciPost publish?</h3>
+        </a>
+        <div id="journals_journals" class="collapse" role="tabpanel">
+            <p>In the startup phase, two Journals are being offered:</p>
+              <ul>
+                <li>SciPost Physics</li>
+                <li>SciPost Physics Lecture Notes</li>
+              </ul>
+            <p>Both Journals cover all domains and subject areas within the field of Physics.</p>
+            <p>SciPost Physics Select, the editorially-selected highlights Journal, will be introduced in the near future.</p>
+        </div>
+    </div>
+
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#journals" href="#journals_distinguish" aria-expanded="true" aria-controls="journals_distinguish">
+            <h3>What are the distinguishing features of SciPost Journals?</h3>
+        </a>
+        <div id="journals_distinguish" class="collapse" role="tabpanel">
+            <p>All SciPost Journals are subscription-free, two-way open access (free for readers, free for authors) online journals.</p>
+            <p>Manuscripts submitted to SciPost undergo the extremely stringent <a href="#pwr">peer-witnessed refereeing</a> process, guaranteeing that papers published in SciPost Journals meet the highest possible academic standards.</p>
+
+        </div>
+    </div>
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#journals" href="#journals_why_submit" aria-expanded="true" aria-controls="journals_why_submit">
+            <h3>Why should I submit my manuscripts to SciPost?</h3>
+        </a>
+        <div id="journals_why_submit" class="collapse" role="tabpanel">
+            <p>Because:</p>
+            <ul>
+                <li>you think your work can withstand the strictest form of pre-publication scrutiny: <a href="#pwr">peer-witnessed refereeing</a></li>
+                <li>you want your referees to have to adhere to the same standards of professionalism which are expected of you as an author</li>
+                <li>you want the editorial process to be handled by professional scientists</li>
+                <li>you think that copyright should be held by authors, not publishers</li>
+                <li>you want your published work to be openly accessible and not hidden behind a paywall</li>
+                <li>you do not think publishers should exploit your work for profit-making</li>
+                <li>you do not think that author(s) should be paying publication costs</li>
+            </ul>
+        </div>
+    </div>
+
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#journals" href="#journals_how_submit" aria-expanded="true" aria-controls="journals_how_submit">
+            <h3>How do I submit my manuscript to SciPost?</h3>
+        </a>
+        <div id="journals_how_submit" class="collapse" role="tabpanel">
+            <p>After registering as a Contributor, simply follow the <a href="{% url 'submissions:sub_and_ref_procedure' %}">submission procedure</a>.</p>
+        </div>
+    </div>
+
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#journals" href="#journals_refereeing" aria-expanded="true" aria-controls="journals_refereeing">
+            <h3 id="pwr">How does peer-witnessed refereeing work?</h3>
+        </a>
+        <div id="journals_refereeing" class="collapse" role="journals_refereeing">
+            <p>This is a short summary; for a more detailed description, see our <a href="{% url 'submissions:sub_and_ref_procedure' %}">submission and refereeing procedure</a>.</p>
+            <ul>
+                <li>Reports are gathered from editorially-invited referees, but can also be volunteered by registered SciPost Contributors during refereeing rounds.</li>
+                <li>Reports are posted online (after rapid editorial vetting) on the Submission's Page, and can be replied to (privilege of Authors only) or commented on by all Contributors.</li>
+                <li>Anonymity can be preserved at all meaningful stages if desired (as a referee, you can choose to remain anonymous on a particular Report, but named on another).</li>
+            </ul>
+            <p>Contributors thus have additional incentives to actively participate and provide not only high-quality Submissions,
+            but also Reports and Comments of the highest achievable professional caliber.
+            Quality is moreover promoted by Editorial vetting of all Reports, Replies and Comments before public posting.</p>
+        </div>
+    </div>
+
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#journals" href="#journals_citable" aria-expanded="true" aria-controls="journals_citable">
+            <h3>Will my SciPost publications be citable?</h3>
+        </a>
+        <div id="journals_citable" class="collapse" role="journals_citable">
+            <p>Yes. All SciPost publications will obtain a unique DOI, enabling citations and metrics as per other journals.
+            Membership of <a target="_blank" href="//crossref.org">Crossref</a> means that SciPost papers directly benefit from a set of citation metrics.</p>
+        </div>
+    </div>
+
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#journals" href="#journals_cite_db" aria-expanded="true" aria-controls="journals_cite_db">
+            <h3>Will SciPost papers be listed in citation databases?</h3>
+        </a>
+        <div id="journals_cite_db" class="collapse" role="journals_cite_db">
+            <p>Inclusion in standard citation databases can be applied for once the Journals have been operating for a short while (at least 3 months). Past experience with other new journals shows that listing typically occurs within a year of launch. Search engine-based listings are expected to pick our Journals up on a shorter timescale.</p>
+        </div>
+    </div>
+
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#journals" href="#journals_else" aria-expanded="true" aria-controls="journals_else">
+            <h3>Can I also submit my papers somewhere else?</h3>
+        </a>
+        <div id="journals_else" class="collapse" role="journals_else">
+            <p>No. SciPost publications or submissions under consideration for publication in SciPost Journals must not be submitted elsewhere.</p>
+        </div>
+    </div>
+
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#journals" href="#journals_license" aria-expanded="true" aria-controls="journals_license">
+            <h3>Under what license do SciPost Journals publish articles?</h3>
+        </a>
+        <div id="journals_license" class="collapse" role="journals_license">
+            <p>All SciPost contents are licensed under the <a target="_blank" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International (CC BY 4.0) License</a>. Under this license, the copyright remains the property of the authors, who then agree to make their articles available for reuse without permission or fees, for virtually any purpose. Anyone may copy, distribute or reuse these articles as long as the author(s) and original source are properly cited. This is the standard license used worldwide in open access journals. You can read more about the details in the <a href="{% url 'journals:journals_terms_and_conditions' %}">SciPost Journals Terms and Conditions</a>.</p>
+        </div>
+    </div>
+
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#journals" href="#journals_availability" aria-expanded="true" aria-controls="journals_availability">
+            <h3>Will my papers always be available?</h3>
+        </a>
+        <div id="journals_availability" class="collapse" role="journals_availability">
+            <p>Yes. SciPost is here to stay, and authors should not worry that their SciPost publications could potentially disappear.
+            SciPost has institutional backing guaranteeing perpetuity of access to its journals database.</p>
+        </div>
     </div>
+
 </div>
 
-<div class="row">
-    <div class="col-md-6">
-    	<h2 class="highlight">SciPost</h2>
-        <h3>What is SciPost?</h3>
-        <p>SciPost is a complete online publication portal managed by and for scientists.</p>
-        <p>
-            Preprint handling and circulation occurs through the well-established arXiv;
-            the rest of the publication process, from peer refereeing through publication
-            all the way to post-publication commenting, is offered by SciPost.
-        </p>
-        <p>
-            Thus, simply stated: share your preprint on <a target="_blank" href="http://www.arxiv.org">arXiv</a>, publish it in <a href="https://scipost.org">SciPost</a>.
-        </p>
-
-        <!-- SciPost Journals -->
-        <h2 class="highlight">SciPost Journals</h2>
-        <h3>Which Journals does SciPost publish?</h3>
-        <p>In the startup phase, two Journals are being offered:</p>
-          <ul>
-    	<li>SciPost Physics</li>
-    	<li>SciPost Physics Lecture Notes</li>
-          </ul>
-        <p>Both Journals cover all domains and subject areas within the field of Physics.</p>
-        <p>SciPost Physics Select, the editorially-selected highlights Journal, will be introduced
-        in the near future.</p>
-
-        <hr>
-        <h3>What are the distinguishing features of SciPost Journals?</h3>
-        <p>All SciPost Journals are subscription-free, two-way open access (free for readers, free for authors) online journals.</p>
-        <p>Manuscripts submitted to SciPost undergo the extremely stringent <a href="#pwr">peer-witnessed refereeing</a> process, guaranteeing that papers published in SciPost Journals meet the highest possible academic standards.</p>
-
-        <hr>
-        <h3>Why should I submit my manuscripts to SciPost?</h3>
-        <p>Because:</p>
-        <ul>
-            <li>you think your work can withstand the strictest form of pre-publication scrutiny: <a href="#pwr">peer-witnessed refereeing</a></li>
-            <li>you want your referees to have to adhere to the same standards of professionalism which are expected of you as an author</li>
-            <li>you want the editorial process to be handled by professional scientists</li>
-            <li>you think that copyright should be held by authors, not publishers</li>
-            <li>you want your published work to be openly accessible and not hidden behind a paywall</li>
-            <li>you do not think publishers should exploit your work for profit-making</li>
-            <li>you do not think that author(s) should be paying publication costs</li>
-        </ul>
-
-        <hr>
-        <h3>How do I submit my manuscript to SciPost?</h3>
-        <p>After registering as a Contributor, simply follow the <a href="{% url 'submissions:sub_and_ref_procedure' %}">submission procedure</a>.</p>
-
-        <hr>
-        <h3 id="pwr">How does peer-witnessed refereeing work?</h3>
-        <p>This is a short summary; for a more detailed description, see our <a href="{% url 'submissions:sub_and_ref_procedure' %}">submission and refereeing procedure</a>.</p>
-        <ul>
-            <li>Reports are gathered from editorially-invited referees, but can also be volunteered by registered SciPost Contributors during refereeing rounds.</li>
-            <li>Reports are posted online (after rapid editorial vetting) on the Submission's Page, and can be replied to (privilege of Authors only) or commented on by all Contributors.</li>
-            <li>Anonymity can be preserved at all meaningful stages if desired (as a referee, you can choose to remain anonymous on a particular Report, but named on another).</li>
-        </ul>
-        <p>Contributors thus have additional incentives to actively participate and provide not only high-quality Submissions,
-        but also Reports and Comments of the highest achievable professional caliber.
-        Quality is moreover promoted by Editorial vetting of all Reports, Replies and Comments before public posting.</p>
-
-        <hr>
-        <h3>Will my SciPost publications be citable?</h3>
-        <p>Yes. All SciPost publications will obtain a unique DOI, enabling citations and metrics as per other journals.
-        Membership of <a target="_blank" href="http://crossref.org">Crossref</a> means that SciPost papers directly benefit from a set of citation metrics.</p>
-
-        <hr>
-        <h3>Will SciPost papers be listed in citation databases?</h3>
-        <p>
-        Inclusion in standard citation databases can be applied for once the Journals have been operating for a short while (at least 3 months). Past experience with other new journals shows that listing typically occurs within a year of launch. Search engine-based listings are expected to pick our Journals up on a shorter timescale.
-        </p>
-
-        <hr>
-        <h3>Can I also submit my papers somewhere else?</h3>
-        <p>No. SciPost publications or submissions under consideration for publication in SciPost Journals must not be submitted elsewhere.</p>
-
-        <hr>
-        <h3>Under what license do SciPost Journals publish articles?</h3>
-        <p>All SciPost contents are licensed under the <a target="_blank" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International (CC BY 4.0) License</a>. Under this license, the copyright remains the property of the authors, who then agree to make their articles available for reuse without permission or fees, for virtually any purpose. Anyone may copy, distribute or reuse these articles as long as the author(s) and original source are properly cited. This is the standard license used worldwide in open access journals. You can read more about the details in the <a href="{% url 'journals:journals_terms_and_conditions' %}">SciPost Journals Terms and Conditions</a>.</p>
-
-        <hr>
-        <h3>Will my papers always be available?</h3>
-        <p>Yes. SciPost is here to stay, and authors should not worry that their SciPost publications could potentially disappear.
-        SciPost has institutional backing guaranteeing perpetuity of access to its journals database.
-        </p>
-
-    </div>
-    <div class="col-md-6">
-    	<h2 class="highlight">SciPost Commentaries</h2>
-
-        <h3>What are Commentaries?</h3>
-        <p>SciPost Commentaries is a searchable repository of Commentary Pages on scientific publications. Each Commentary Page contains some relevant summary info about the publication (such as Title, Author(s), DOI link to published version, abstract, ...), followed by Comments from Contributors and Author and Contributor Replies. </p>
-
-        <hr>
-        <h3>How are Commentary Pages activated?</h3>
-        <p>Any registered Contributor can request the activation of a Commentary Page by filling in the <a href="{% url 'commentaries:request_commentary' %}">Commentary request page</a>.</p>
-
-        <h2 class="highlight">SciPost Theses</h2>
+<h2 class="highlight">SciPost Commentaries</h2>
+
+<div id="commentaries" data-children=".item">
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#commentaries" href="#commentaries_commentaries" aria-expanded="true" aria-controls="commentaries_commentaries">
+            <h3>What are Commentaries?</h3>
+        </a>
+        <div id="commentaries_commentaries" class="collapse" role="tabpanel">
+            <p>SciPost Commentaries is a searchable repository of Commentary Pages on scientific publications. Each Commentary Page contains some relevant summary info about the publication (such as Title, Author(s), DOI link to published version, abstract, ...), followed by Comments from Contributors and Author and Contributor Replies. </p>
+        </div>
+    </div>
+
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#commentaries" href="#commentaries_activation" aria-expanded="true" aria-controls="commentaries_activation">
+            <h3>How are Commentary Pages activated?</h3>
+        </a>
+        <div id="commentaries_activation" class="collapse" role="tabpanel">
+            <p>Any registered Contributor can request the activation of a Commentary Page by filling in the <a href="{% url 'commentaries:request_commentary' %}">Commentary request page</a>.</p>
+        </div>
+    </div>
+</div>
+
+<h2 class="highlight">SciPost Theses</h2>
+
+<div id="theses" data-children=".item">
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#theses" href="#theses_theses" aria-expanded="true" aria-controls="theses_theses">
             <h3>What are Theses?</h3>
+        </a>
+        <div id="theses_theses" class="collapse" role="tabpanel">
             <p>SciPost Theses is a searchable repository of external links to Master's, Ph.D. and Habilitation theses. Besides a validated URL pointing to the original document, each Thesis Link page contains some relevant summary info (such as title, author, degree granting institution, abstract, ...), followed by Comments from Contributors and Author and Contributor Replies. </p>
+        </div>
+    </div>
 
-            <hr>
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#theses" href="#theses_activation" aria-expanded="true" aria-controls="theses_activation">
             <h3>How are Thesis Link pages activated?</h3>
+        </a>
+        <div id="theses_activation" class="collapse" role="tabpanel">
             <p>As a registered Contributor, the author of the thesis (or, if unavailable, the supervisor or a colleague) can request the activation of a Thesis Link by filling in the <a href="{% url 'theses:request_thesislink' %}">Thesis Link request page</a>.</p>
+        </div>
+    </div>
+</div>
 
-        <h2 class="highlight">SciPost Contributors</h2>
+<h2 class="highlight">SciPost Contributors</h2>
 
-            <h3>Why should I become an active Contributor?</h3>
-            <p>Because:</p>
-            <ul>
-                <li>you subscribe to the values underlining SciPost's <a href="{% url 'scipost:about' %}">guiding principles</a></li>
-                <li>you would like the quantity and quality of your refereeing and commenting work to be recognized and credited</li>
-                <li>you would like to be entitled to report on submissions, even if you haven't been explicitly invited to do so by an editor</li>
-                <li>you are interested in building useful extra content (comments, rederivations, etc) on existing literature</li>
-                <li>you are willing to make your contributions as author and (anonymously) as reviewer and commenter openly accessible</li>
-            </ul>
+<h3>Why should I become an active Contributor?</h3>
+<p>Because:</p>
+<ul>
+    <li>you subscribe to the values underlining SciPost's <a href="{% url 'scipost:about' %}">guiding principles</a></li>
+    <li>you would like the quantity and quality of your refereeing and commenting work to be recognized and credited</li>
+    <li>you would like to be entitled to report on submissions, even if you haven't been explicitly invited to do so by an editor</li>
+    <li>you are interested in building useful extra content (comments, rederivations, etc) on existing literature</li>
+    <li>you are willing to make your contributions as author and (anonymously) as reviewer and commenter openly accessible</li>
+</ul>
 
-        <h2 class="highlight">SciPost Comments</h2>
+<h2 class="highlight">SciPost Comments</h2>
 
+<div id="comments" data-children=".item">
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#comments" href="#comments_comments" aria-expanded="true" aria-controls="comments_comments">
             <h3>What can be commented on?</h3>
+        </a>
+        <div id="comments_comments" class="collapse" role="tabpanel">
             <p>All categories of contents can be commented on: Publications, Submissions, Commentaries and Thesis Links. In addition, Comments themselves can be replied to.</p>
+        </div>
+    </div>
+
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#comments" href="#commentaries_who" aria-expanded="true" aria-controls="commentaries_who">
             <h3>Who can submit Comments?</h3>
+        </a>
+        <div id="commentaries_who" class="collapse" role="tabpanel">
             <p>Only registered Contributors can submit Comments.</p>
+        </div>
+    </div>
+
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#comments" href="#commentaries_privacy" aria-expanded="true" aria-controls="commentaries_privacy">
             <h3>What about privacy?</h3>
+        </a>
+        <div id="commentaries_privacy" class="collapse" role="tabpanel">
             <p>Comments posted on SciPost carry an identifier including the Contributor's full name.</p>
             <p>Reports on Submissions are anonymous by default. If the Contributor providing the Report wishes it, anonymity can be waived.</p>
             <p>More details can be found in our <a href="{% url 'scipost:privacy_policy' %}">Privacy Policy</a>.</p>
+        </div>
+    </div>
+</div>
 
-        <h2 class="highlight">About SciPost</h2>
+<h2 class="highlight">About SciPost</h2>
 
+<div id="scipost" data-children=".item">
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#scipost" href="#scipost_who" aria-expanded="true" aria-controls="scipost_who">
             <h3>Who is behind SciPost?</h3>
+        </a>
+        <div id="scipost_who" class="collapse" role="tabpanel">
             <ul>
                 <li>SciPost was founded by <a target="_blank" href="//jscaux.org/">J.-S. Caux</a>, Professor of Theoretical Physics at the University of Amsterdam.</li>
                 <li>The legal entity behind SciPost is <a href="{% url 'scipost:foundation' %}">Stichting SciPost</a>, a not-for-profit Foundation established in Amsterdam. Its (non-remunerated) personnel consists in Prof. J.-S. Caux (chairman), Dr J. van Mameren (secretary) and Dr J. van Wezel (treasurer). The portal is run by a team of volunteer officers coordinated by the Foundation.</li>
             </ul>
+        </div>
+    </div>
 
-            <hr>
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#scipost" href="#scipost_why" aria-expanded="true" aria-controls="scipost_why">
             <h3>Why was SciPost started?</h3>
+        </a>
+        <div id="scipost_why" class="collapse" role="tabpanel">
             <p>The publishing landscape is evolving rapidly, and it is not clear that the best interests of science and scientists are being represented. SciPost offers a grassroots solution to the problem of scientific publishing, designed and implemented by scientists in the best interests of science itself.</p>
+        </div>
+    </div>
 
-            <hr>
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#scipost" href="#scipost_fields" aria-expanded="true" aria-controls="scipost_fields">
             <h3>Which fields of science does SciPost cater to?</h3>
+        </a>
+        <div id="scipost_fields" class="collapse" role="tabpanel">
             <p>The initial rollout of SciPost offers a Physics portal.</p>
             <p>Portals in other disciplines will be opened if the SciPost model proves to be successful.</p>
+        </div>
+    </div>
 
-            <hr>
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#scipost" href="#scipost_moderation" aria-expanded="true" aria-controls="scipost_moderation">
             <h3>Is SciPost moderated?</h3>
+        </a>
+        <div id="scipost_moderation" class="collapse" role="tabpanel">
             <p>Yes. All content is vetted by the editorial team before being made public. Only meaningful, professional-level scientific content is accepted. SciPost does not take any responsibility for the actual contents of postings.</p>
+        </div>
+    </div>
 
-            <hr>
+    <div class="item">
+        <a data-toggle="collapse" data-parent="#scipost" href="#scipost_funded" aria-expanded="true" aria-controls="scipost_funded">
             <h3>How is SciPost funded?</h3>
+        </a>
+        <div id="scipost_funded" class="collapse" role="tabpanel">
             <p>SciPost operates non-commercially, incurring minimal costs. Contributors, who are by definition all academically employed, provide all the content and perform all editorial tasks as part of their normal institutional academic duties. Operations are kept running by a team of volunteer officers, themselves academically employed.</p>
             <p>Support for operational costs is initially provided by the <a target="_blank" href="http://www.nwo.nl/en">NWO</a> in the Netherlands. Long-term operations will be financed by donations from national funding agencies, universities, societies, foundations and individuals. If you are interested in financially supporting SciPost, <a href="mailto:jscaux@scipost.org">contact us</a>.</p>
+        </div>
     </div>
 </div>
 
diff --git a/scipost/templates/scipost/_contributor_short.html b/scipost/templates/scipost/_contributor_short.html
index dfefa44ad42803c839122e3df554739f0d886e66..153b4f8e545069c85318e73dbb023e82858af5bf 100644
--- a/scipost/templates/scipost/_contributor_short.html
+++ b/scipost/templates/scipost/_contributor_short.html
@@ -2,7 +2,7 @@
 
 {% load static %}
 
-<h3 class="mb-0 pb-0 d-block">
+<p class="mb-0 pb-0">
     {% if fellowship.contributor.personalwebpage %}
         <a target="_blank" href="{{fellowship.contributor.personalwebpage}}">
     {% endif %}
@@ -10,12 +10,12 @@
     {% if fellowship.contributor.personalwebpage %}
         </a>
     {% endif %}
-</h3>
+</p>
 
 {% if fellowship.affiliation %}
     <span class="text-muted">({{fellowship.affiliation}})</span>
 {% endif %}
-<div class="d-block">
+<div>
     {% for expertise in fellowship.contributor.expertises %}
         <div class="single d-inline" data-specialization="{{expertise|lower}}" data-toggle="tooltip" data-placement="bottom" title="{{expertise|get_specialization_display}}">{{expertise|get_specialization_code}}</div>
     {% endfor %}
diff --git a/scipost/templates/scipost/about.html b/scipost/templates/scipost/about.html
index bedfaadba0a6a0c582874b4131334dd0770ac3ee..9619d274fc35b73665b963e0ac5ed605b84fed55 100644
--- a/scipost/templates/scipost/about.html
+++ b/scipost/templates/scipost/about.html
@@ -12,12 +12,13 @@
 <div class="row">
     <div class="col-md-6">
         <h2 class="highlight">About SciPost</h2>
-        <a href="{% url 'scipost:FAQ' %}">Frequently asked questions</a>
+
 
         <p>SciPost is a complete scientific publication portal.</p>
         <p>It is purely online-based, and offers freely, openly, globally and perpetually accessible science.</p>
         <p>Being managed by professional scientists, and making use of editor-solicited and contributed reviews, its Journals aim at the highest achievable standards of refereeing.</p>
         <p>SciPost Commentaries allow Contributors to seamlessly comment on all existing literature.</p>
+        <h4><a href="{% url 'scipost:FAQ' %}">Frequently asked questions</a></h4>
     </div>
     <div class="col-md-6">
         <h2 class="highlight">Acknowledgements</h2>
@@ -121,62 +122,53 @@
 <hr>
 
 {% for college, codes in object_list %}
+    <h2 class="highlight" id="editorial_college_{{ college|lower }}">Editorial College ({{ college }})</h2>
 
+    {% if codes %}
     <div class="row">
         <div class="col-12">
-              <h2 class="highlight" id="editorial_college_{{ college|lower }}">Editorial College ({{ college }})</h2>
-        </div>
-    </div>
-
-
-{% if codes %}
-<div class="row">
-    <div class="col-12">
-        <a href="#editorial_college_{{ college|lower }}" data-toggle="toggle-show" data-target="#specializations-{{college|lower}}">Show Fellows by specialization</a>
-        <a href="#editorial_college_{{ college|lower }}" style="display: none;" data-toggle="toggle-show" data-target="#specializations-{{college|lower}}">Show full list of Fellows</a>
-        <div id="specializations-{{college|lower}}" class="all-specializations mt-2" style="border: 1px solid; display: none;">
-            <div class="row">
-                <div class="col-12">
-                    <p class="text-muted">Hover to highlight or click to select</p>
-                </div>
-                <div class="col-md-6">
-                    {% with total_count=codes|length %}
-                        {% for code in codes %}
-                            <div class="specialization" data-specialization="{{code.0|lower}}">{{code.0}} - {{code.1}}</div>
-                            {% if forloop.counter|is_modulo_one_half:total_count %}
-                                </div>
-                                <div class="col-md-6">
-                            {% endif %}
-                        {% endfor %}
-                    {% endwith %}
+            <a href="#editorial_college_{{ college|lower }}" class="mx-2" data-toggle="toggle-show" data-target="#specializations-{{college|lower}}">Show Fellows by specialization</a>
+            <a href="#editorial_college_{{ college|lower }}" class="mx-2" style="display: none;" data-toggle="toggle-show" data-target="#specializations-{{college|lower}}">Show full list of Fellows</a>
+            <div id="specializations-{{college|lower}}" class="card border-default all-specializations mt-2" style="display: none">
+                <div class="card-body">
+                    <p class="text-muted mt-2">Hover to highlight or click to select</p>
+
+                    <div class="row">
+                        <div class="col-md-6">
+                            {% with total_count=codes|length %}
+                                {% for code in codes %}
+                                    <div class="specialization" data-specialization="{{code.0|lower}}">{{code.0}} - {{code.1}}</div>
+                                    {% if forloop.counter|is_modulo_one_half:total_count %}
+                                        </div>
+                                        <div class="col-md-6">
+                                    {% endif %}
+                                {% endfor %}
+                            {% endwith %}
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
-{% endif %}
+    {% endif %}
 
-<div class="row search-contributors" data-contributors="{{ college|lower }}">
-    <div class="col-12">
-        <div class="card-columns">
-            {% for fellowship in college.current_fellows %}
-                <div class="card contributor">
-                    {% include 'scipost/_contributor_short.html' with contributor=fellowship.contributor %}
-                </div>
-            {% endfor %}
+    <div class="row search-contributors" data-contributors="{{ college|lower }}">
+        <div class="col-12">
+            <div class="card-columns">
+                {% for fellowship in college.current_fellows %}
+                    <div class="card contributor mb-1">
+                        {% include 'scipost/_contributor_short.html' with contributor=fellowship.contributor %}
+                    </div>
+                {% endfor %}
+            </div>
         </div>
     </div>
-</div>
 
 {% endfor %}
 
 <br/>
-<div class="row">
-    <div class="col-12">
-        <h2 style="color: red">We are currently building our Editorial College</h2>
-        <h3 style="color: red">We welcome your nominations for Editorial Fellows in all fields of Physics</h3>
-    </div>
-</div>
+<h2 class="text-danger">We are currently building our Editorial College</h2>
+<h3 class="text-danger">We welcome your nominations for Editorial Fellows in all fields of Physics</h3>
 
 {% endblock content %}
 
diff --git a/scipost/templates/scipost/foundation.html b/scipost/templates/scipost/foundation.html
index a331482fe4e8ac5aa2f5984995045cc6d569e4d3..4fd490282d77f24db8399d02957c53b7025f8771 100644
--- a/scipost/templates/scipost/foundation.html
+++ b/scipost/templates/scipost/foundation.html
@@ -4,6 +4,16 @@
 
 {% load staticfiles %}
 
+{% block breadcrumb %}
+    <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+        <div class="container">
+            <a href="{% url 'scipost:about' %}" class="breadcrumb-item">About SciPost</a>
+            {# <a  href="{% url 'scipost:FAQ' %}" class="breadcrumb-item">Frequently asked questions</a>#}
+            <span class="breadcrumb-item">Foundation</span>
+        </div>
+    </nav>
+{% endblock %}
+
 {% block content %}
 
 <div class="row">
diff --git a/scipost/templates/scipost/privacy_policy.html b/scipost/templates/scipost/privacy_policy.html
index 839fd1ae51abdac5713cb0f5369734f012cdfeeb..397810bba8579f293f339f300ed57b48ac5b2293 100644
--- a/scipost/templates/scipost/privacy_policy.html
+++ b/scipost/templates/scipost/privacy_policy.html
@@ -2,7 +2,15 @@
 
 {% block pagetitle %}: privacy policy{% endblock pagetitle %}
 
-{% load staticfiles %}
+{% block breadcrumb %}
+    <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+        <div class="container">
+            <a href="{% url 'scipost:about' %}" class="breadcrumb-item">About SciPost</a>
+            <a  href="{% url 'scipost:FAQ' %}" class="breadcrumb-item">Frequently asked questions</a>
+            <span class="breadcrumb-item">Privacy Policy</span>
+        </div>
+    </nav>
+{% endblock %}
 
 {% block content %}
 
diff --git a/scipost/templates/scipost/terms_and_conditions.html b/scipost/templates/scipost/terms_and_conditions.html
index 4eb254ad31ab070549e517bdb4841c3b3a319b12..9f658c26a8e80831c9241dff1505f19c96eca7b1 100644
--- a/scipost/templates/scipost/terms_and_conditions.html
+++ b/scipost/templates/scipost/terms_and_conditions.html
@@ -2,7 +2,14 @@
 
 {% block pagetitle %}: terms and conditions{% endblock pagetitle %}
 
-{% load staticfiles %}
+{% block breadcrumb %}
+    <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+        <div class="container">
+            <a href="{% url 'scipost:about' %}" class="breadcrumb-item">About SciPost</a>
+            <span class="breadcrumb-item">Terms and Conditions</span>
+        </div>
+    </nav>
+{% endblock %}
 
 {% block content %}
 
diff --git a/submissions/templates/partials/submissions/admin/editorial_admin_summary.html b/submissions/templates/partials/submissions/admin/editorial_admin_summary.html
index 2429f5cc7208e226770ba7dd419ca6ab483c9f1c..65fdf4c9c44de594f708607afe66a71fbed717ca 100644
--- a/submissions/templates/partials/submissions/admin/editorial_admin_summary.html
+++ b/submissions/templates/partials/submissions/admin/editorial_admin_summary.html
@@ -77,7 +77,7 @@
         <td>Plagiarism score</td>
         <td>
             {% if submission.plagiarism_report %}
-                {{ submission.plagiarism_report.score }}
+                {{ submission.plagiarism_report.score }}%
             {% else %}
                 <a href="{% url 'submissions:plagiarism' submission.arxiv_identifier_w_vn_nr %}">Run plagiarism check</a>
             {% endif %}
@@ -107,7 +107,7 @@
     {% endif %}
 
     {# Plagiarism #}
-    <li><a href="{% url 'submissions:plagiarism' submission.arxiv_identifier_w_vn_nr %}">Run plagiarism check</a></li>
+    <li><a href="{% url 'submissions:plagiarism' submission.arxiv_identifier_w_vn_nr %}">Manage plagiarism report</a></li>
 
     {# Compile pdfs #}
     {% if submission.reports.accepted.exists %}
diff --git a/submissions/templates/submissions/_submission_status_block.html b/submissions/templates/submissions/_submission_status_block.html
index 4f867a6503f8931468a64258b397a959f1aa3d1d..f4812d1d3a9a41215a6f8d8c637707088e4d4e41 100644
--- a/submissions/templates/submissions/_submission_status_block.html
+++ b/submissions/templates/submissions/_submission_status_block.html
@@ -1,4 +1,4 @@
-<h4 class="d-inline-block">Current status:</h4>&nbsp;&nbsp;
+<h4 class="d-inline-block">Current status:</h4>
 <div class="d-inline">
     <span class="label label-secondary">{{submission.get_status_display}}</span>
     {% if submission.publication %}
diff --git a/submissions/templates/submissions/_submission_version.html b/submissions/templates/submissions/_submission_version.html
index 9bb1c6e240fc2b77895a9bed0bc9ce28cfdabff1..f32d7c5f22928d60fcdd2a22371be9f32671b782 100644
--- a/submissions/templates/submissions/_submission_version.html
+++ b/submissions/templates/submissions/_submission_version.html
@@ -1,5 +1,9 @@
 <div class="py-1">
-    <a href="{% url 'submissions:submission' submission.arxiv_identifier_w_vn_nr %}" class="pubtitleli">version {{submission.arxiv_vn_nr}}</a>
+    {% if editorial_page %}
+        <a href="{% url 'submissions:editorial_page' submission.arxiv_identifier_w_vn_nr %}" class="pubtitleli">version {{submission.arxiv_vn_nr}}</a>
+    {% else %}
+        <a href="{{submission.get_absolute_url}}" class="pubtitleli">version {{submission.arxiv_vn_nr}}</a>
+    {% endif %}
     <span class="version-suffix">
         {% if submission.is_current %}
             (current version)
diff --git a/submissions/templates/submissions/admin/plagiarism_report.html b/submissions/templates/submissions/admin/plagiarism_report.html
index 99769fe704065a68501f6326b178923b8af84f62..2b13c4fb62ec96eb757ffee4a64fbf7416a45963 100644
--- a/submissions/templates/submissions/admin/plagiarism_report.html
+++ b/submissions/templates/submissions/admin/plagiarism_report.html
@@ -22,7 +22,7 @@
             </tr>
             <tr>
                 <td>Percent match</td>
-                <td>{{submission.plagiarism_report.percent_match}}</td>
+                <td>{{submission.plagiarism_report.percent_match}}%</td>
             </tr>
             <tr>
                 <td>Processed</td>
@@ -45,6 +45,9 @@
         {% csrf_token %}
         {{form|bootstrap}}
         <input type="submit" class="btn btn-primary" value="{% if submission.plagiarism_report %}Update report status{% else %}Submit submission for plagiarism check{% endif %}">
+        {% if submission.plagiarism_report %}
+            <a href="{% url 'submissions:plagiarism_report' submission.arxiv_identifier_w_vn_nr %}" class="ml-2 btn btn-default">Download report pdf</a>
+        {% endif %}
     </form>
 
 {% endblock content %}
diff --git a/submissions/templates/submissions/author_guidelines.html b/submissions/templates/submissions/author_guidelines.html
index 4363952e027225cc19122bd0769ad45989b95cbf..94ec25ae3149ac5450fb32672b301b0512e26fc6 100644
--- a/submissions/templates/submissions/author_guidelines.html
+++ b/submissions/templates/submissions/author_guidelines.html
@@ -2,7 +2,16 @@
 
 {% block pagetitle %}: author guidelines{% endblock pagetitle %}
 
-{% block headsup %} {% load staticfiles %} {% endblock headsup %}
+{% load staticfiles %}
+
+{% block breadcrumb %}
+    <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+        <div class="container">
+            <a href="{% url 'submissions:submissions' %}" class="breadcrumb-item">Submissions</a>
+            <span class="breadcrumb-item">Author guidelines</span>
+        </div>
+    </nav>
+{% endblock %}
 
 {% block content %}
 
diff --git a/submissions/templates/submissions/editorial_page.html b/submissions/templates/submissions/editorial_page.html
index b8582ec3c6c42bbf74d10413966c7d2fc92592ec..1119bd13ff47ac7c57b18b65061083199f156c80 100644
--- a/submissions/templates/submissions/editorial_page.html
+++ b/submissions/templates/submissions/editorial_page.html
@@ -17,21 +17,28 @@
 <h1 class="text-primary">{{submission.title}}</h1>
 <h3>by {{submission.author_list}}</h3>
 
-{% if not submission.is_current %}
-    <h4 class="text-danger"><b>This is not the editorial page for the current version.</b></h4>
-    <p>Please go to the current version's page.</p>
-{% endif %}
-
-<p class="card-text">(go to the <a href="{% url 'submissions:submission' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Submissions Page</a> to view Reports and Comments)</p>
-
-{% if submission.other_versions %}
-    <h4>Other versions of this Submission exist:</h4>
-    <div>
-        {% for vn in submission.other_versions %}
-            {% include 'submissions/_submission_version.html' with submission=vn %}
-        {% endfor %}
-    </div>
-{% endif %}
+<div class="ml-2 mt-2">
+    <h3>- Go to the <a href="{% url 'submissions:submission' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Submissions Page</a> to view Reports and Comments</h3>
+
+    {% if submission.other_versions or not submission.is_current %}
+        <ul class="mt-3 mb-1 list-unstyled pl-4">
+            {% if not submission.is_current %}
+                <li>
+                    <h4><span class="text-danger"><b>This is not the editorial page for the current version.</b> Please go to the current version's page.</span></h4>
+                </li>
+            {% endif %}
+
+            {% if submission.other_versions %}
+                <li>Other versions of this Submission exist:</li>
+                <ul class="list-unstyled">
+                    {% for vn in submission.other_versions %}
+                        <li>{% include 'submissions/_submission_version.html' with submission=vn editorial_page=1 %}</li>
+                    {% endfor %}
+                </ul>
+            {% endif %}
+        </ul>
+    {% endif %}
+</div>
 
 
 <div class="row">
@@ -89,6 +96,9 @@
 <div class="row"><!-- Status -->
     <div class="col-md-12">
         {% include 'submissions/_submission_status_block.html' with submission=submission %}
+        {% if submission.plagiarism_report %}
+            <h4>Plagiarism report status: {% if submission.plagiarism_report.percent_match %}<b>{{submission.plagiarism_report.percent_match}}%</b>{% else %}<em>Scan in progress</em>{% endif %}</h4>
+        {% endif %}
     </div>
 </div><!-- End status -->
 
@@ -126,9 +136,9 @@
     {% if not submission.is_current %}
     <div class="row">
         <div class="col-12">
-            <div class="card card-outline-warning">
+            <div class="card mt-3 border-warning bg-light">
                 <div class="card-body">
-                    <h3 class="mb-3 font-weight-bold">BEWARE: This is not the editorial page for the current version!</h3>
+                    <h3 class="mb-3"><strong>BEWARE: This is not the editorial page for the current version!</strong></h3>
                     <p class="mb-0">
                         The tools here are thus available only for exceptional circumstances (e.g. vetting a late report on a deprecated version).
                         <br>Please go to the current version's page using the link at the top.
diff --git a/submissions/templates/submissions/sub_and_ref_procedure.html b/submissions/templates/submissions/sub_and_ref_procedure.html
index d23b5e1b3cd15a665d618e87e52757c2bb6f5275..3471208851309ce3e53589897273ef9be5af682a 100644
--- a/submissions/templates/submissions/sub_and_ref_procedure.html
+++ b/submissions/templates/submissions/sub_and_ref_procedure.html
@@ -2,7 +2,14 @@
 
 {% block pagetitle %}: submission and refereeing procedure{% endblock pagetitle %}
 
-{% load staticfiles %}
+{% block breadcrumb %}
+    <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+        <div class="container">
+            <a href="{% url 'submissions:submissions' %}" class="breadcrumb-item">Submissions</a>
+            <span class="breadcrumb-item">Submission and refereeing procedure</span>
+        </div>
+    </nav>
+{% endblock %}
 
 {% block content %}
 
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 629aa552b5d98eb21c3806056e0eefa12e6a013c..cbbb82ef2c4546e204fab752315193c2b10a7d52 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -34,36 +34,46 @@
     <div class="col-12">
         <h2>SciPost Submission Page</h2>
         <h1 class="text-primary">{{submission.title}}</h1>
-        <h3>by {{submission.author_list}}</h3>
+        <h3 class="mb-3">by {{submission.author_list}}</h3>
 
-        {% if not submission.is_current %}
-            <h4 class="text-danger"><b>This is not the current version.</b></h4>
-        {% endif %}
+        <div class="pl-2">
+            {% if submission.publication %}
+                <h3>- Published as <a href="{{submission.publication.get_absolute_url}}">{{submission.publication.in_issue.in_volume.in_journal.get_abbreviation_citation}} <strong>{{submission.publication.in_issue.in_volume.number}}</strong>, {{submission.publication.get_paper_nr}} ({{submission.publication.publication_date|date:'Y'}})</a></h3>
+            {% endif %}
 
-        {% if submission.editor_in_charge and request.user.contributor == submission.editor_in_charge %}
-            <h4>(You are the Editor-in-charge, go to the <a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Editorial Page</a> to take editorial actions)</h4>
-        {% endif %}
 
-        {% if submission.other_versions %}
-            <h4>Other versions of this Submission (with Reports) exist:</h4>
-            <div>
-                {% for vn in submission.other_versions %}
-                    {% include 'submissions/_submission_version.html' with submission=vn %}
-                {% endfor %}
-            </div>
-        {% endif %}
+            {% if submission.editor_in_charge and request.user.contributor == submission.editor_in_charge %}
+                <h3>- You are the Editor-in-charge, go to the <a href="{% url 'submissions:editorial_page' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Editorial Page</a> to take editorial actions</h3>
+            {% endif %}
+
+            {% if unfinished_report_for_user %}
+                <h3 class="mt-0">- <span class="circle text-danger border-danger">!</span> You have an unfinished report for this submission, <a href="{% url 'submissions:submit_report' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">finish your report here.</a></h3>
+            {% endif %}
+
+            {% if submission.other_versions or not submission.is_current %}
+                <ul class="mt-3 mb-1 list-unstyled pl-4">
+                    {% if not submission.is_current %}
+                        <li><h3 class="text-danger">This is not the current version.</h3></li>
+                    {% endif %}
+
+                    {% if submission.other_versions %}
+                        <li>Other versions of this Submission (with Reports) exist:</li>
+                        <ul class="list-unstyled">
+                            {% for vn in submission.other_versions %}
+                                <li>{% include 'submissions/_submission_version.html' with submission=vn %}</li>
+                            {% endfor %}
+                        </ul>
+                    {% endif %}
+                </ul>
+            {% endif %}
+        </div>
 
-        {% if unfinished_report_for_user %}
-            <blockquote class="blockquote">
-              <h4>You have an unfinished report for this submission, <a href="{% url 'submissions:submit_report' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">finish your report here.</a></h4>
-            </blockquote>
-        {% endif %}
     </div>
 </div>
 
 <div class="row">
     <div class="col-12">
-        <h3 class="mt-3">Submission summary</h3>
+        <h3>Submission summary</h3>
         {% include 'submissions/_submission_summary.html' with submission=submission hide_title=1 %}
 
         {% include 'submissions/_submission_status_block.html' with submission=submission %}
@@ -148,13 +158,11 @@
         {% endif %}
     </div>
 </div>
-{% elif not user.is_authenticated %}
-    <h3  class="text-center"><a href="{% url 'scipost:login' %}?next={{request.path}}" class="btns btxn-info mt-3 px-4">Login to report</a></h3>
 {% endif %}
 
 {% if invited_reports %}
-<hr>
-<div class="row">
+{# <hr>#}
+<div class="row mt-4">
     <div class="col-12">
         <div class="card card-grey">
             <div class="card-body">
@@ -174,8 +182,8 @@
 {% endif %}
 
 {% if contributed_reports %}
-<hr>
-<div class="row">
+{# <hr>#}
+<div class="row mt-4">
     <div class="col-12">
         <div class="card card-grey">
             <div class="card-body">
@@ -194,8 +202,22 @@
 
 {% endif %}
 
+{% if not user.is_authenticated %}
+    {% if submission.comments.vetted.exists %}
+        <h3 class="text-center my-3"><a href="{% url 'scipost:login' %}?next={{request.path}}">Login to report</a></h3>
+    {% else %}
+        <h3 class="text-center my-3"><a href="{% url 'scipost:login' %}?next={{request.path}}">Login to report or comment</a></h3>
+    {% endif %}
+{% endif %}
+
 {% include 'scipost/comments_block.html' with comments=submission.comments.vetted %}
 
-{% include 'comments/new_comment.html' with object_id=submission.id type_of_object='submission' open_for_commenting=submission.open_for_commenting %}
+
+{# This is an apparent redundant logic block; however, it makes sure the "login to ..." links wouldn't be shown twice! #}
+{% if not user.is_authenticated and submission.comments.vetted.exists %}
+    {% include 'comments/new_comment.html' with object_id=submission.id type_of_object='submission' open_for_commenting=submission.open_for_commenting %}
+{% elif user.is_authenticated %}
+    {% include 'comments/new_comment.html' with object_id=submission.id type_of_object='submission' open_for_commenting=submission.open_for_commenting %}
+{% endif %}
 
 {% endblock content %}
diff --git a/submissions/views.py b/submissions/views.py
index 8bc429bad64d7abb2b6e748433601cf5bcccce5f..77eb5c43bcf0d8fbf623f2cc076d76d36075006f 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -1496,7 +1496,6 @@ class PlagiarismView(SubmissionAdminViewMixin, UpdateView):
 
 class PlagiarismReportPDFView(SubmissionAdminViewMixin, SingleObjectMixin, RedirectView):
     permission_required = 'scipost.can_do_plagiarism_checks'
-    template_name = 'submissions/admin/eic_recommendation_detail.html'
     editorial_page = True
 
     def get_redirect_url(self, *args, **kwargs):