diff --git a/assets/js/academic-search.js b/assets/js/academic-search.js
new file mode 100644
index 00000000..de29e191
--- /dev/null
+++ b/assets/js/academic-search.js
@@ -0,0 +1,185 @@
+/*************************************************
+ *  Academic
+ *  https://github.com/gcushen/hugo-academic
+ *
+ *  In-built Fuse based search algorithm.
+ **************************************************/
+
+/* ---------------------------------------------------------------------------
+* Configuration.
+* --------------------------------------------------------------------------- */
+
+// Configure Fuse.
+let fuseOptions = {
+  shouldSort: true,
+  includeMatches: true,
+  tokenize: true,
+  threshold: search_config.threshold,  // Set to ~0.3 for parsing diacritics and CJK languages.
+  location: 0,
+  distance: 100,
+  maxPatternLength: 32,
+  minMatchCharLength: search_config.minLength,  // Set to 1 for parsing CJK languages.
+  keys: [
+    {name:'title', weight:0.99}, /* 1.0 doesn't work o_O */
+    {name:'summary', weight:0.6},
+    {name:'authors', weight:0.5},
+    {name:'content', weight:0.2},
+    {name:'tags', weight:0.5},
+    {name:'categories', weight:0.5}
+  ]
+};
+
+// Configure summary.
+let summaryLength = 60;
+
+/* ---------------------------------------------------------------------------
+* Functions.
+* --------------------------------------------------------------------------- */
+
+// Get query from URI.
+function getSearchQuery(name) {
+  return decodeURIComponent((location.search.split(name + '=')[1] || '').split('&')[0]).replace(/\+/g, ' ');
+}
+
+// Set query in URI without reloading the page.
+function updateURL(url) {
+  if (history.replaceState) {
+    window.history.replaceState({path:url}, '', url);
+  }
+}
+
+// Pre-process new search query.
+function initSearch(force, fuse) {
+  let query = $("#search-query").val();
+
+  // If query deleted, clear results.
+  if ( query.length < 1) {
+    $('#search-hits').empty();
+  }
+
+  // Check for timer event (enter key not pressed) and query less than minimum length required.
+  if (!force && query.length < fuseOptions.minMatchCharLength)
+    return;
+
+  // Do search.
+  $('#search-hits').empty();
+  searchAcademic(query, fuse);
+  let newURL = window.location.protocol + "//" + window.location.host + window.location.pathname + '?q=' + encodeURIComponent(query) + window.location.hash;
+  updateURL(newURL);
+}
+
+// Perform search.
+function searchAcademic(query, fuse) {
+  let results = fuse.search(query);
+  // console.log({"results": results});
+
+  if (results.length > 0) {
+    $('#search-hits').append('<h2 class="mt-0">' + results.length + ' ' + i18n.results + '</h2>');
+    parseResults(query, results);
+  } else {
+    $('#search-hits').append('<div class="search-no-results">' + i18n.no_results + '</div>');
+  }
+}
+
+// Parse search results.
+function parseResults(query, results) {
+  $.each( results, function(key, value) {
+    let content_key = value.item.section;
+    let content = "";
+    let snippet = "";
+    let snippetHighlights = [];
+
+    // Show abstract in results for content types where the abstract is often the primary content.
+    if (["publication", "talk"].includes(content_key)) {
+      content = value.item.summary;
+    } else {
+      content = value.item.content;
+    }
+
+    if ( fuseOptions.tokenize ) {
+      snippetHighlights.push(query);
+    } else {
+      $.each( value.matches, function(matchKey, matchValue) {
+        if (matchValue.key == "content") {
+          let start = (matchValue.indices[0][0]-summaryLength>0) ? matchValue.indices[0][0]-summaryLength : 0;
+          let end = (matchValue.indices[0][1]+summaryLength<content.length) ? matchValue.indices[0][1]+summaryLength : content.length;
+          snippet += content.substring(start, end);
+          snippetHighlights.push(matchValue.value.substring(matchValue.indices[0][0], matchValue.indices[0][1]-matchValue.indices[0][0]+1));
+        }
+      });
+    }
+
+    if (snippet.length < 1) {
+      snippet += value.item.summary;  // Alternative fallback: `content.substring(0, summaryLength*2);`
+    }
+
+    // Load template.
+    let template = $('#search-hit-fuse-template').html();
+
+    // Localize content types.
+    if (content_key in content_type) {
+      content_key = content_type[content_key];
+    }
+
+    // Parse template.
+    let templateData = {
+      key: key,
+      title: value.item.title,
+      type: content_key,
+      relpermalink: value.item.relpermalink,
+      snippet: snippet
+    };
+    let output = render(template, templateData);
+    $('#search-hits').append(output);
+
+    // Highlight search terms in result.
+    $.each( snippetHighlights, function(hlKey, hlValue){
+      $("#summary-"+key).mark(hlValue);
+    });
+
+  });
+}
+
+function render(template, data) {
+  // Replace placeholders with their values.
+  let key, find, re;
+  for (key in data) {
+    find = '\\{\\{\\s*' + key + '\\s*\\}\\}';  // Expect placeholder in the form `{{x}}`.
+    re = new RegExp(find, 'g');
+    template = template.replace(re, data[key]);
+  }
+  return template;
+}
+
+/* ---------------------------------------------------------------------------
+* Initialize.
+* --------------------------------------------------------------------------- */
+
+// If Academic's in-built search is enabled and Fuse loaded, then initialize it.
+if (typeof Fuse === 'function') {
+// Wait for Fuse to initialize.
+  $.getJSON(search_config.indexURI, function (search_index) {
+    let fuse = new Fuse(search_index, fuseOptions);
+
+    // On page load, check for search query in URL.
+    if (query = getSearchQuery('q')) {
+      $("body").addClass('searching');
+      $('.search-results').css({opacity: 0, visibility: "visible"}).animate({opacity: 1},200);
+      $("#search-query").val(query);
+      $("#search-query").focus();
+      initSearch(true, fuse);
+    }
+
+    // On search box key up, process query.
+    $('#search-query').keyup(function (e) {
+      clearTimeout($.data(this, 'searchTimer')); // Ensure only one timer runs!
+      if (e.keyCode == 13) {
+        initSearch(true, fuse);
+      } else {
+        $(this).data('searchTimer', setTimeout(function () {
+          initSearch(false, fuse);
+        }, 250));
+      }
+    });
+  });
+}
diff --git a/assets/scss/custom.scss b/assets/scss/custom.scss
index 42cbf113..bde63f88 100644
--- a/assets/scss/custom.scss
+++ b/assets/scss/custom.scss
@@ -183,10 +183,39 @@ html {
 }
 
 #TableOfContents li a,
-.toc-top li a {
+.toc-top li a,
+.toc-top span a
+{
   color: rgb(89, 89, 89);
 }
 
+.toc-top {
+  padding-left: 0;
+}
+
+// TOC indentation for each level.
+#TableOfContents div div {
+  padding-left: 0.8rem;
+}
+
+#TableOfContents span {
+  display: block;
+}
+
+#TableOfContents span a,
+.toc-top span a {
+  display: block;
+  padding: .125rem 1.5rem;
+  font-size: 0.7rem;
+}
+
+#TableOfContents span a:hover,
+.toc-top span a:hover
+{
+  color: $sta-primary;
+  text-decoration: none;
+}
+
 footer {
   display: flex;
   justify-content: flex-start;
@@ -230,6 +259,25 @@ footer {
   display: none;
 }
 
+.docs-sidebar .nav>span>a {
+  display: block;
+  padding: .25rem 1.5rem;
+  font-size: 0.8rem;
+  color: rgba(0, 0, 0, .65);
+}
+
+.docs-sidebar .nav>span>a:hover {
+  color: rgba(0, 0, 0, .85);
+  text-decoration: none;
+  background-color: transparent;
+}
+
+.docs-sidebar .nav>span>a:hover {
+  color: rgba(0, 0, 0, .85);
+  text-decoration: none;
+  background-color: transparent;
+}
+
 .dark {
 
   .site-footer-logo-dark {
@@ -241,6 +289,10 @@ footer {
     display: none;
   }
 
+  .docs-sidebar .nav > span:not(.active) > a {
+    color: rgb(248, 248, 242);
+  }
+
   .btn-primary, .btn.btn-primary.active, .btn-light {
     color: white;
   }
@@ -254,14 +306,27 @@ footer {
   }
 
   #TableOfContents li a,
-  .toc-top li a {
+  .toc-top li a,
+  .toc-top span a
+  {
     color: rgb(191, 190, 193);
   }
 
+  #TableOfContents li a:hover,
+  .toc-top li a:hover,
+  .toc-top span a:hover,
+  .docs-sidebar .docs-toc-item a:hover,
+  .docs-sidenav a:hover,
+  .docs-sidebar .nav > span:not(.active) > a:hover
+  {
+    color: mix(white, $sta-primary-light, 50%);
+  }
+
   a,
   .docs-sidebar .docs-toc-item.active a,
   .docs-sidebar .nav>.active:hover>a,
-  .docs-sidebar .nav>.active>a {
+  .docs-sidebar .nav>.active>a,
+  .docs-sidebar .docs-toc-item.active span a {
     color: mix(white, $sta-primary-light, 50%);
   }
 
diff --git a/content/courses/fiji-image-processing/fiji-omero/index.md b/content/courses/fiji-image-processing/fiji-omero/index.md
index b8106fc7..1e112287 100644
--- a/content/courses/fiji-image-processing/fiji-omero/index.md
+++ b/content/courses/fiji-image-processing/fiji-omero/index.md
@@ -182,8 +182,8 @@ Before you begin, you need to know the dataset ID that the image should be linke
 
 3. Go to OMERO webclient (http://omero.hpc.virginia.edu) and look for the uploaded image in `Orphaned Images`.
 
-	<img src="/courses/fiji-omero/leaf.png" style="float:left;width:40%;height:auto">
-	<img src="/courses/fiji-omero/fiji-omero-new-export.png" style="width:40%;height:auto">
+	<img src="./leaf.png" style="float:left;width:40%;height:auto">
+	<img src="./fiji-omero-new-export.png" style="width:40%;height:auto">
 
 
 <br>
@@ -211,15 +211,15 @@ Before you begin, you need to know the dataset ID that the image should be linke
 	a. Go to `Process` > `Filter` > `Median`.  In the popup dialog enter a `Radius` of  `3.0` and click `OK`.  This will smooth out some of the image's intrinsic noise without degrading the object outlines.
 
 	b. Go to `Image` > `Adjust Threshold`.  In the popup dialog choose the `Default` thresholding algorithm, uncheck the `Dark Background` box and click `Apply`. The image should have been converted to a binary mask with white objects ona black background.
-			<img src="/courses/fiji-omero/fiji-omero-setthreshold.png" style="float:left;width:47%;height:auto">
-			<img src="/courses/fiji-omero/fiji-omero-blobs-thresholded.png" style="width:40%;height:auto">
+			<img src="./fiji-omero-setthreshold.png" style="float:left;width:47%;height:auto">
+			<img src="./fiji-omero-blobs-thresholded.png" style="width:40%;height:auto">
 	
 	
 	c. Go to `Analyze` > `Set Measurements...`. In the popup dialog specify the parameters as shown in this screenshot. Click `OK`.
 
 	d. Go to `Analyze` > `Analyze Particles` and set up the parameters as shown. Click `OK`.
-			<img src="/courses/fiji-omero/fiji-omero-setmeasurements.png" style="float:left;width:40%;height:auto">
-			<img src="/courses/fiji-omero/fiji-omero-analyzeparticles.png" style="width:50%;height:auto">
+			<img src="./fiji-omero-setmeasurements.png" style="float:left;width:40%;height:auto">
+			<img src="./fiji-omero-analyzeparticles.png" style="width:50%;height:auto">
 
     e. These steps should create a `Results` and a `Summary` table.
 
diff --git a/content/courses/fiji-image-processing/introduction/index.md b/content/courses/fiji-image-processing/introduction/index.md
index 186c3091..1e4302a5 100644
--- a/content/courses/fiji-image-processing/introduction/index.md
+++ b/content/courses/fiji-image-processing/introduction/index.md
@@ -10,7 +10,7 @@ url_dataset: data/intro-fiji-images.zip
 
 {{< figure src="/img/fiji.png" >}}
 
-{{% link-button href="/data/intro-fiji-images.zip" icon="fa fa-download" %}}Data{{% /link-button %}}
+{{% link-button href="/data/intro-fiji-images.zip" icon="fa fa-download" aria-label="Download Data" title="Download Data" %}}Data{{% /link-button %}}
 
 ## Fiji Installation
 
diff --git a/content/courses/fiji-image-processing/scripting/index.md b/content/courses/fiji-image-processing/scripting/index.md
index 5f4e91d4..5d49b0ad 100644
--- a/content/courses/fiji-image-processing/scripting/index.md
+++ b/content/courses/fiji-image-processing/scripting/index.md
@@ -9,7 +9,7 @@ url_code: /scripts/fiji/fiji-example-scripts.zip
 
 {{< figure library="true" src="fiji.png" >}}
 
-{{% link-button href="/scripts/fiji/fiji-example-scripts.zip" icon="fa fa-download" %}}Scripts{{% /link-button %}}
+{{% link-button href="/scripts/fiji/fiji-example-scripts.zip" icon="fa fa-download" title="Download Scripts" aria-label="Download Scripts" %}}Scripts{{% /link-button %}}
 
 This chapter is an introduction to the scripting interface of the [Fiji](https://fiji.sc) application, an open-source and enhanced version of the popular ImageJ program used for scientific image processing.  Here you will learn how to write scripts for automated execution of image processing pipelines and batch processing of multiple image files in Fiji.
 
diff --git a/content/landing/_index.md b/content/landing/_index.md
index 74176e63..8ec49902 100644
--- a/content/landing/_index.md
+++ b/content/landing/_index.md
@@ -5,9 +5,9 @@ subtitle = ""
 
 ## [Tutorials](/tutorials) are perfect for introducing yourself to a new topic.
 
-Some tutorials are offered as in-person and/or Zoom workshops regularly.  Find the notes or slides and download materials [here](/tutorials).
+Some tutorials are offered as in-person and/or Zoom workshops regularly.  Find the notes or slides and download materials [on the Tutorials page](/tutorials).
 
-For a list of upcoming workshops, please see our [page](https://www.rc.virginia.edu/education/workshops/) at the UVARC Website.
+For a list of upcoming workshops, please see [the Workshops page](https://www.rc.virginia.edu/education/workshops/) at the UVARC Website.
 
 ## [Short courses](/courses) are longer and more in-depth than tutorials or workshops.
 
diff --git a/content/notes/slurm-from-cli/_index.md b/content/notes/slurm-from-cli/_index.md
index 99183d94..ee2b5005 100644
--- a/content/notes/slurm-from-cli/_index.md
+++ b/content/notes/slurm-from-cli/_index.md
@@ -5,12 +5,13 @@ type: docs
 weight: 1
 menu: 
     slurm-from-cli:
+        name: The Slurm Resource Manager
 ---
 
-{{< figure src="/notes/slurm-from-cli/img/slurm_logo.png" width=30% >}}
+{{< figure src="/notes/slurm-from-cli/img/slurm_logo.png" width=30% alt="Slurm resource manager logo" >}}
 
 
-[Slurm](https://slurm.schedmd.com/) is a  __resource manager__ (RM), also known as a  _queueing system_.
+[Slurm](https://slurm.schedmd.com/ "The official Slurm website") is a  __resource manager__ (RM), also known as a  _queueing system_.
 
 Resource managers are used to submit _jobs_ on a computing cluster to compute nodes from an access point generally called a  login node.
 
diff --git a/content/notes/slurm-from-cli/img/slurm_logo.png b/content/notes/slurm-from-cli/img/slurm_logo.png
index f3e7acd7..b99e7459 100644
Binary files a/content/notes/slurm-from-cli/img/slurm_logo.png and b/content/notes/slurm-from-cli/img/slurm_logo.png differ
diff --git a/content/notes/slurm-from-cli/section1.md b/content/notes/slurm-from-cli/section1.md
index 4efa862b..9e2716d0 100644
--- a/content/notes/slurm-from-cli/section1.md
+++ b/content/notes/slurm-from-cli/section1.md
@@ -10,7 +10,7 @@ menu:
 
 ## Resources and Partitions
 
-An HPC **job** is a description of the resources required, any preparatory steps such as loading [modules](https://www.rc.virginia.edu/userinfo/rivanna/software/modules/) or otherwise setting up an environment, and the commands to run the software, along with any postprocessing that may be appropriate.
+An HPC **job** is a description of the resources required, any preparatory steps such as loading [modules](https://www.rc.virginia.edu/userinfo/rivanna/software/modules/ "The Research Computing website's modules page") or otherwise setting up an environment, and the commands to run the software, along with any postprocessing that may be appropriate.
 
 The job is specified through a special form of script often called a _batch script_.  Usually it is written in `bash`.
 
@@ -34,7 +34,7 @@ Slurm began when cpus had only one core each. Beginning around 2005, cpus began
 
 **Memory** refers to _random-access memory_.  It is not the same thing as storage.  If a process reports running out of memory, it means RAM memory. Running out of disk space will result in a different error.
 
-For more details about the structure of a computational cluster, see our [introduction](https://learning.rc.virginia.edu/notes/hpc-intro/).
+For more details about the structure of a computational cluster, see our [introduction](/notes/hpc-intro/ "Intro to High Performance Computing notes").
 ## Processes and Tasks
 
 A **process** can be envisioned an instance of an executable that is running on a particular computer.  Most executables run only a single process.  Some executables run _threads_ within the _root_ process.
@@ -44,7 +44,7 @@ Slurm refers to the root process as a **task**. By default, each task is assigne
 
 ## Slurm Resource Requests
 
-SLURM refers to queues as  __partitions__ .  We do not have a default partition; each job must request one explicitly.
+SLURM refers to queues as  __partitions__.  We do not have a default partition; each job must request one explicitly.
 
 {{< table >}}
 | Queue Name | Purpose | Job Time Limit | Max Memory / Node / Job | Max Cores / Node |
diff --git a/content/notes/slurm-from-cli/section2.md b/content/notes/slurm-from-cli/section2.md
index b8d0a6f0..22f1b137 100644
--- a/content/notes/slurm-from-cli/section2.md
+++ b/content/notes/slurm-from-cli/section2.md
@@ -16,13 +16,13 @@ Several options are available to prepare batch scripts.
 
 ### Graphical Editors
 
-You can log in to a [FastX](https://www.rc.virginia.edu/userinfo/rivanna/logintools/fastx/), which provides a [MATE](https://mate-desktop.org/) desktop environment. One of the tools is a graphical editor very similar to Notepad.  It is called `pluma` by MATE, but we have made it available as `gedit` if started from a terminal.  If you wish to start it from a menu, it is available from Applications&rarr;Accessories.
+You can log in to a [FastX](https://www.rc.virginia.edu/userinfo/rivanna/logintools/fastx/ "Research Computing's FastX info page"), which provides a [MATE](https://mate-desktop.org/ "The official MATE website") desktop environment. One of the tools is a graphical editor very similar to Notepad.  It is called `pluma` by MATE, but we have made it available as `gedit` if started from a terminal.  If you wish to start it from a menu, it is available from Applications&rarr;Accessories.
 
-You can also use [Open OnDemand's](https://www.rc.virginia.edu/userinfo/rivanna/ood/overview/) built-in file manager and editor.  Create a new file from the Files menu.  Select the file and choose `Edit` from the three-dot dropdown menu to the right of the file name.  This will open a very basic text editor.
+You can also use [Open OnDemand's](https://www.rc.virginia.edu/userinfo/rivanna/ood/overview/ "Research Computing's Open OnDemand info page") built-in file manager and editor.  Create a new file from the Files menu.  Select the file and choose `Edit` from the three-dot dropdown menu to the right of the file name.  This will open a very basic text editor.
 
 ### Command-Line Editors
 
-Editors available at the command line are [nano](https://www.nano-editor.org/), [vim](https://www.vim.org/), and [emacs](https://www.gnu.org/software/emacs/).  Nano is a simple text-only editor.  Vim is also available text-only from a command line, but a graphical version called `gvim` can be invoked from a MATE Desktop through the Applications&rarr;Accessories menu. Emacs can also be started from the Accessories menu but, if a graphical environment, will start a graphical user interface.  If invoked within a text-only environment, it will fall back to a text interface.
+Editors available at the command line are [nano](https://www.nano-editor.org/ "The official nano website"), [vim](https://www.vim.org/ "The official vim website"), and [emacs](https://www.gnu.org/software/emacs/ "The official emacs website").  Nano is a simple text-only editor.  Vim is also available text-only from a command line, but a graphical version called `gvim` can be invoked from a MATE Desktop through the Applications&rarr;Accessories menu. Emacs can also be started from the Accessories menu but, if a graphical environment, will start a graphical user interface.  If invoked within a text-only environment, it will fall back to a text interface.
 
 ### Open OnDemand Tool
 
@@ -60,7 +60,7 @@ The lines starting with `#SBATCH` are the resource requests.  They are called "p
 ```
 Here we are requesting
   * 1 node, 1 task, 1 core
-  * 32GB of memory (measured in MB). Strictly speaking this will be "Gibibyes."
+  * 32GB of memory (measured in MB). Strictly speaking this will be "Gibibytes."
   * 2 hours of running time.
   * The interactive partition (queue).  A partition must be specified.
   * The account (allocation) group `hpc_training`
@@ -120,7 +120,7 @@ Angle brackets `< >` indicate a value to be specified, and are not typed.
 | -t \<time\> | -\-time=\<time\> | Set the upper limit of the runtime. Format can be `M` (a number of minutes), `MM:SS` (minutes:seconds), `HH:MM:SS` (hours:minutes:seconds), `D-H` (days-hours), `D-HH:MM` (days-hours:minutes), or `D-HH:MM:SS` (days-hours:minutes:seconds). |
 {{< /table >}}
 
-See also our [documentation](https://www.rc.virginia.edu/userinfo/rivanna/slurm/) for many more examples.
+See also our [documentation](https://www.rc.virginia.edu/userinfo/rivanna/slurm/ "Research Computing's Slurm documentation") for many more examples.
 
 
 
@@ -170,7 +170,7 @@ To find bioinformatics software packages, try this:
 $ module key bio
 ```
 
-The available software is also listed on our [website](https://www.rc.virginia.edu/userinfo/rivanna/software/complete-list/)
+The available software is also listed on our [website](https://www.rc.virginia.edu/userinfo/rivanna/software/complete-list/ "Research Computing's complete software list").
 
 **Exercise 2**
 
diff --git a/content/notes/slurm-from-cli/section3.md b/content/notes/slurm-from-cli/section3.md
index 95a47039..846af178 100644
--- a/content/notes/slurm-from-cli/section3.md
+++ b/content/notes/slurm-from-cli/section3.md
@@ -159,7 +159,7 @@ $sacct -o jobname,jobid,ncpus,nnodes,maxrss,state,elapsed -j 56221192
 mpiheated+ 56221192.0           10        1    108800K  COMPLETED   00:00:33 
 ```
 
-The output from `sacct` can be heavily customized. For more information see the [documentation](https://slurm.schedmd.com/sacct.html).
+The output from `sacct` can be heavily customized. For more information see the [documentation](https://slurm.schedmd.com/sacct.html "Official Slurm sacct command documentation").
 
 Running `sacct` puts a load on the system and can be very slow, so please use it judiciously.
 
@@ -214,7 +214,7 @@ Jobstats reports are only kept in the database for so long, so older jobs will g
 
 ## Stream Output in Slurm
 
-When running a program interactively, any output to the Unix [standard streams](https://learning.rc.virginia.edu/notes/unix-tutorial/unix_tutorial_3/) will be printed directly to the user's console window.  However, programs running under the control of Slurm will not have a console attached. 
+When running a program interactively, any output to the Unix [standard streams](/notes/unix-tutorial/unix_tutorial_3/ "The Unix tutorial's More About Files page") will be printed directly to the user's console window.  However, programs running under the control of Slurm will not have a console attached. 
 
 By default, SLURM redirects both standard output and standard error to a file called `slurm-<jobid>.out`.
 
diff --git a/content/notes/slurm-from-cli/section4.md b/content/notes/slurm-from-cli/section4.md
index d6255a09..43ceb30f 100644
--- a/content/notes/slurm-from-cli/section4.md
+++ b/content/notes/slurm-from-cli/section4.md
@@ -42,7 +42,7 @@ Most HPC sites, including UVa's, restrict the memory and time allowed to process
 2. Short development jobs,
 3. "Computational steering" in which a program runs for an interval, then the output is examined and parameters may be adjusted.
 
-For most of these cases, we strongly recommend the use of the Open OnDemand [Interactive Applications](/notes/hpc-intro/interactive_apps/interactive/).  Jupyterlab is available to run notebooks.  Rstudio and Matlab Desktop are also available to run through this interface.  For more general work, including command-line options, the Desktop is usually the best option. It provides a basic terminal, but also access to other applications should they be needed.
+For most of these cases, we strongly recommend the use of the Open OnDemand [Interactive Applications](/notes/hpc-intro/interactive_apps/interactive/ "The Interactive Applications section in the Intro to High Performance Computing notes").  Jupyterlab is available to run notebooks.  Rstudio and Matlab Desktop are also available to run through this interface.  For more general work, including command-line options, the Desktop is usually the best option. It provides a basic terminal, but also access to other applications should they be needed.
 
 For general-purpose interactive work with graphics, please use the Open OnDemand Desktop.  The X11 service that Linux uses for graphics is very slow over a network.  Even with a fast connection between two systems, the Desktop will perform better since the X11 server process and the programs that use it are running on the same computer.
 
@@ -64,13 +64,13 @@ Never issue an sbatch command from within an interactive job (including OOD jobs
 
 One of the advantages of using a high-performance cluster is the ability to use many cores and/or nodes at once.  This is called _parallelism_.  There are three main types of parallelism.
 
-You should understand whether your program can make use of more than one core or node before you request multiple cores and/or nodes. Special programming is required to enable these capabilities.  Asking for multiple cores or nodes that your program cannot use will result in idle cores and wasted SUs, since you are charged for each core-hour. The [`seff`](/notes/slurm-from-cli/section3/#seff) command can help with this.
+You should understand whether your program can make use of more than one core or node before you request multiple cores and/or nodes. Special programming is required to enable these capabilities.  Asking for multiple cores or nodes that your program cannot use will result in idle cores and wasted SUs, since you are charged for each core-hour. The [`seff`](/notes/slurm-from-cli/section3/#seff "The Jobs on the Cluster page") command can help with this.
 
 ### High Throughput Serial Parallelism
 
-High throughput parallelism is when many identical jobs are run at once, each on a single core.  Examples can include Monte-Carlo methods, parameter searches, image processing on many related images, some areas of bioinformatics, and many others.  For most cases of this type of parallelism, the best Slurm option is a [job array](/notes/slurm-from-cli/section4/#job-arrays).
+High throughput parallelism is when many identical jobs are run at once, each on a single core.  Examples can include Monte-Carlo methods, parameter searches, image processing on many related images, some areas of bioinformatics, and many others.  For most cases of this type of parallelism, the best Slurm option is a [job array](/notes/slurm-from-cli/section4/#job-arrays "The Job Arrays section").
 
-When planning a high-throughput project, it is important to keep in mind that if the individual jobs are very short, less than roughly 15-30 minutes each, it is very inefficient to run each one separately, whether you do this manually or through an array.  In this case you should group your jobs and run multiple instances within the same job script.  Please [contact us](https://www.rc.virginia.edu/form/support-request/) if you would like assistance setting this up.
+When planning a high-throughput project, it is important to keep in mind that if the individual jobs are very short, less than roughly 15-30 minutes each, it is very inefficient to run each one separately, whether you do this manually or through an array.  In this case you should group your jobs and run multiple instances within the same job script.  Please [contact us](https://www.rc.virginia.edu/form/support-request/ "Research Computing's support request form") if you would like assistance setting this up.
 
 ### Multicore (Threaded)
 
@@ -100,7 +100,7 @@ GPU job scripts are similar to CPU scripts, but do require the addition of the -
 
 The script uses the command nvidia-smi which detects the GPU.
 
-We have several different GPU types equipped on our nodes each offering varying amounts of memory. See our website for [Hardware Specifications](https://www.rc.virginia.edu/userinfo/hpc/#system-details). In the example above, Slurm will choose whatever GPU is available. If you are working with larger models you may find that you need a GPU with more memory. To request a specific GPU, you add it to the gres Slurm option. If a GPU type has multiple options (for instance, we offer 40GB and 80GB A100 GPUs), there will be a constraint you can use to specify even further. Example Slurm script requesting 1 80GB A100 GPU node:
+We have several different GPU types equipped on our nodes each offering varying amounts of memory. See our website for [Hardware Specifications](https://www.rc.virginia.edu/userinfo/hpc/#system-details "Research Computing's overview page"). In the example above, Slurm will choose whatever GPU is available. If you are working with larger models you may find that you need a GPU with more memory. To request a specific GPU, you add it to the gres Slurm option. If a GPU type has multiple options (for instance, we offer 40GB and 80GB A100 GPUs), there will be a constraint you can use to specify even further. Example Slurm script requesting 1 80GB A100 GPU node:
 
 {{< code-download file="/notes/slurm-from-cli/scripts/gpua100.slurm" lang="bash" >}}
 
@@ -220,8 +220,8 @@ This is a useful command to check whether you’re running out of storage space
 
 To gain information on the different queues you can use the `qlist` command. This will show the list of partitions, their usage, and the SU charge rate. You can use `qlimits` for information on each queue’s limits.
 
-The `sinfo` command will provide some more detailed information on the health of each queue and the number of active nodes available. These commands can be useful in diagnosing why a job may not be running, or to better understand the queue usage for more efficient job throughput. More information on hardware specifications and queue information can be found [here](https://rc.virginia.edu/userinfo/rivanna/overview/#hardware-configuration) on our website.
+The `sinfo` command will provide some more detailed information on the health of each queue and the number of active nodes available. These commands can be useful in diagnosing why a job may not be running, or to better understand the queue usage for more efficient job throughput. More information on hardware specifications and queue information can be found [here](https://rc.virginia.edu/userinfo/rivanna/overview/#hardware-configuration "Research Computing's overview page") on our website.
 
 ## Need Help
 
-Research Computing is ready to help you learn to use our systems efficiently.  You can [submit a ticket](https://www.rc.virginia.edu/form/support-request/).  For in-person help, please attend one of our weekly sessions of [office hours](https://www.rc.virginia.edu/support/#office-hours).
+Research Computing is ready to help you learn to use our systems efficiently.  You can [submit a ticket](https://www.rc.virginia.edu/form/support-request/ "Research Computing's support request form").  For in-person help, please attend one of our weekly sessions of [office hours](https://www.rc.virginia.edu/support/#office-hours "Research Computing's Support Options page").
diff --git a/content/tutorials/connecting-to-hpc/index.md b/content/tutorials/connecting-to-hpc/index.md
index 82a11f7d..57ef1e3e 100644
--- a/content/tutorials/connecting-to-hpc/index.md
+++ b/content/tutorials/connecting-to-hpc/index.md
@@ -13,4 +13,4 @@ weight: 110
 
 ---
 
-{{< youtube id="jUsGuEbht6U" >}}
+{{< youtube id="BpaFQG4JOEU" >}}
diff --git a/content/tutorials/interactive-apps-ood/index.md b/content/tutorials/interactive-apps-ood/index.md
index 4bc98991..b073a0bc 100644
--- a/content/tutorials/interactive-apps-ood/index.md
+++ b/content/tutorials/interactive-apps-ood/index.md
@@ -13,4 +13,4 @@ weight: 110
 
 ---
 
-{{< youtube id="a9ps9ULmPx8" >}}
+{{< youtube id="FUZbumfxGyY" >}}
diff --git a/content/tutorials/working-with-files/index.md b/content/tutorials/working-with-files/index.md
index 367cd8f5..65ccbf71 100644
--- a/content/tutorials/working-with-files/index.md
+++ b/content/tutorials/working-with-files/index.md
@@ -13,4 +13,4 @@ weight: 110
 
 ---
 
-{{< youtube id="UtfNaYfNHy4" >}}
+{{< youtube id="asN63Ujhzks" >}}
diff --git a/layouts/partials/book_layout.html b/layouts/partials/book_layout.html
new file mode 100644
index 00000000..e27cb460
--- /dev/null
+++ b/layouts/partials/book_layout.html
@@ -0,0 +1,69 @@
+{{ $current_page := . }}
+
+{{/* Check whether to show breadcrumb navigation. */}}
+{{ $breadcrumb_page_types := site.Params.breadcrumb.page_types | default dict }}
+{{ $show_breadcrumb := index $breadcrumb_page_types .Type | default false }}
+
+<div class="container-fluid docs">
+  <div class="row flex-xl-nowrap">
+    <div class="col-12 col-md-3 col-xl-2 docs-sidebar">
+      {{ partial "book_sidebar" . }}
+    </div>
+
+    {{/* Show ToC by default. */}}
+    {{ if ne .Params.toc false }}
+    <div class="d-none d-xl-block col-xl-2 docs-toc">
+      {{ partial "hooks/page_toc_start" . }}
+
+      <div class="nav toc-top">
+        <span><a href="#" id="back_to_top" class="docs-toc-title">{{ i18n "on_this_page" }}</a></span>
+      </div>
+
+      {{ .TableOfContents }}
+
+      {{ partial "hooks/page_toc_end" . }}
+    </div>
+    {{ end }}
+
+    <main class="col-12 col-md-9 col-xl-8 py-md-3 pl-md-5 docs-content" role="main">
+
+      <article class="article">
+
+        <div class="docs-article-container">
+          {{ if $show_breadcrumb }}
+            {{ partial "breadcrumb" $current_page }}
+          {{ end }}
+
+          <h1>{{ .Title }}</h1>
+
+          <div class="article-style">
+            {{ .Content }}
+          </div>
+
+          {{ partial "tags.html" . }}
+
+          {{/* Show next/previous pages by default. */}}
+          {{ if ne site.Params.book_section_pager false }}
+          <div class="article-widget">
+            {{ partial "section_pager" . }}
+          </div>
+          {{ end }}
+        </div>
+
+        <div class="body-footer">
+          <p>{{ i18n "last_updated" }} {{ $.Lastmod.Format site.Params.date_format }}</p>
+
+          {{ partial "page_edit" . }}
+
+          {{ partial "comments" . }}
+
+          {{ partial "page_related" . }}
+        </div>
+
+      </article>
+
+      {{ partial "site_footer" . }}
+
+    </main>
+  </div>
+</div>
diff --git a/layouts/partials/book_menu.html b/layouts/partials/book_menu.html
new file mode 100644
index 00000000..4615abfe
--- /dev/null
+++ b/layouts/partials/book_menu.html
@@ -0,0 +1,86 @@
+{{ define "book-menu" }}
+
+{{- $first := false -}}
+{{- $current_node := .current_node -}}
+{{- $is_root := .is_root -}}
+{{- $order_by := .order_by -}}
+{{ $icon := "" }}
+
+{{ with .sect }}
+  {{ if .IsSection }}
+    {{ if not $is_root }}
+      {{- $first = (eq $current_node.FirstSection.Type "book") | and (eq $current_node.FirstSection .) -}}
+    {{ end }}
+
+    {{- safeHTML $current_node.FirstSection.Params.pre_nav -}}
+
+    {{/* Get section icon. */}}
+    {{ $pack := or .Params.icon_pack "fas" }}
+    {{ $pack_prefix := $pack }}
+    {{ if in (slice "fab" "fas" "far" "fal") $pack }}
+      {{ $pack_prefix = "fa" }}
+    {{ end }}
+    {{ with .Params.icon }}
+      {{- if eq $pack "emoji" -}}
+        {{- . | emojify -}}
+      {{- else if eq $pack "custom" -}}
+        {{- $svg_icon := resources.Get (printf "media/icon-pack/%s.svg" .) -}}
+        {{- if $svg_icon -}}
+          {{ $icon = printf "<img src=\"%s\" alt=\"%s\" class=\"svg-icon svg-baseline pr-1\">" $svg_icon.RelPermalink . }}
+        {{- end -}}
+      {{- else -}}
+        {{ $icon = printf "<i class=\"%s %s-%s pr-1\"></i>" $pack $pack_prefix . }}
+      {{- end -}}
+    {{ end }}
+
+    {{ if $first }}
+      <div class="nav docs-sidenav">
+        <span class="{{ if and .File $current_node.File | and (eq .File.UniqueID $current_node.File.UniqueID) }}active{{ end }}"><a href="{{ .RelPermalink }}">{{ safeHTML $icon }}{{ .LinkTitle | default .Title }}</a></span>
+    {{else}}
+      <div class="docs-toc-item">
+        <a class="docs-toc-link {{ if and .File $current_node.File | and (eq .File.UniqueID $current_node.File.UniqueID) }} active{{ end }}" href="{{ .RelPermalink }}">{{ safeHTML $icon }}{{ .LinkTitle | default .Title }}</a>
+    {{end}}
+
+    {{- $page_count := (add (len .Pages) (len .Sections)) -}}
+    {{ if ne $page_count 0 }}
+      {{ if not $first }}
+        <div class="nav docs-sidenav">
+      {{end}}
+      {{- .Scratch.Set "pages" .Pages -}}
+      {{- if .Sections -}}
+        {{- .Scratch.Set "pages" (.Pages | union .Sections) -}}
+      {{- end -}}
+      {{- $pages := (.Scratch.Get "pages") -}}
+      {{- if eq $order_by "title" -}}
+        {{- range $pages.ByTitle -}}
+          {{ template "book-menu" dict "sect" . "current_node" $current_node "order_by" $order_by }}
+        {{- end -}}
+      {{- else if eq $order_by "title_desc" -}}
+        {{- range $pages.ByTitle.Reverse -}}
+          {{ template "book-menu" dict "sect" . "current_node" $current_node "order_by" $order_by }}
+        {{- end -}}
+      {{- else -}}
+        {{- range $pages.ByWeight -}}
+          {{ template "book-menu" dict "sect" . "current_node" $current_node "order_by" $order_by }}
+        {{- end -}}
+      {{- end}}
+      {{ if not $first }}
+        </div>
+      {{end}}
+    {{end}}
+
+    {{ if not $first }}
+      </div>
+    {{else}}
+      </div>
+    {{end}}
+
+  {{- else -}}
+    {{- if not .Params.Hidden -}}
+      <span class="{{ if and .File $current_node.File | and (eq .File.UniqueID $current_node.File.UniqueID) }}active{{ end }}"><a href="{{ .RelPermalink }}">{{ safeHTML $icon }}{{ .LinkTitle | default .Title }}</a></span>
+    {{- end -}}
+  {{ end -}}
+{{- end -}}
+
+{{/* End define. */}}
+{{ end -}}
diff --git a/layouts/partials/docs_sidebar.html b/layouts/partials/docs_sidebar.html
index 08576e5f..57eb7ca3 100644
--- a/layouts/partials/docs_sidebar.html
+++ b/layouts/partials/docs_sidebar.html
@@ -38,13 +38,13 @@
     <a class="docs-toc-link" {{ if .URL }}href="{{ .URL }}"{{else if .HasChildren }}href="{{ (index .Children 0).URL }}"{{end}}>{{ .Name }}</a>
 
     {{- if .HasChildren }}
-    <ul class="nav docs-sidenav">
+    <div class="nav docs-sidenav">
       {{ range .Children.ByWeight }}
-      <li {{ if $current_page.IsMenuCurrent $menu_name . }}class="active"{{ end }}>
+      <span {{ if $current_page.IsMenuCurrent $menu_name . }}class="active"{{ end }}>
         <a href="{{ .URL }}">{{ .Name }}</a>
-      </li>
+      </span>
       {{ end }}
-    </ul>
+    </div>
     {{ end }}
 
   </div>
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
new file mode 100644
index 00000000..bb261c5e
--- /dev/null
+++ b/layouts/partials/navbar.html
@@ -0,0 +1,173 @@
+{{ $current_page := . }}
+
+{{/* Get site logo. */}}
+{{ $show_logo := site.Params.main_menu.show_logo | default true }}
+{{ $has_logo := fileExists "assets/images/logo.png" | or (fileExists "assets/images/logo.svg") }}
+{{ $logo := "" }}
+{{ if $has_logo }}
+  {{ $logo = (partial "functions/get_logo" (dict "constraint" "max_height" "size" 70)) }}
+{{ end }}
+
+<nav class="navbar navbar-expand-lg navbar-light compensate-for-scrollbar" id="navbar-main">
+  <div class="container">
+
+    {{if $show_logo}}
+    <div class="d-none d-lg-inline-flex">
+      <a class="navbar-brand" href="{{ "/" | relLangURL }}">
+        {{- if $has_logo -}}
+          <img src="{{ $logo.RelPermalink }}" alt="{{ site.Title }}">
+        {{- else -}}
+          {{- site.Title -}}
+        {{- end -}}
+      </a>
+    </div>
+    {{end}}
+
+    {{ if site.Menus.main }}
+    <button type="button" class="navbar-toggler" data-toggle="collapse"
+            data-target="#navbar-content" aria-controls="navbar" aria-expanded="false" aria-label="{{ i18n "toggle_navigation" }}">
+    <span><i class="fas fa-bars"></i></span>
+    </button>
+    {{ end }}
+
+    {{if $show_logo}}
+    <div class="navbar-brand-mobile-wrapper d-inline-flex d-lg-none">
+      <a class="navbar-brand" href="{{ "/" | relLangURL }}">
+      {{- if $has_logo -}}
+        <img src="{{ $logo.RelPermalink }}" alt="{{ site.Title }}">
+      {{- else -}}
+        {{- site.Title -}}
+      {{- end -}}
+      </a>
+    </div>
+    {{end}}
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    {{ $align_menu := site.Params.main_menu.align | default "l" }}
+    <div class="navbar-collapse main-menu-item collapse {{ if eq $align_menu "c" }}justify-content-center{{ else if eq $align_menu "r" }}justify-content-end{{else}}justify-content-start{{ end }}" id="navbar-content">
+
+      <!-- Left Nav Bar -->
+      <ul class="navbar-nav d-md-inline-flex">
+        {{ range site.Menus.main }}
+
+        {{ if .HasChildren }}
+        <li class="nav-item dropdown">
+          <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true">
+            {{- .Pre -}}<span>{{ .Name | safeHTML }}</span>{{- .Post -}}
+            <span class="caret"></span>
+          </a>
+          <div class="dropdown-menu">
+            {{ range .Children }}
+              <a class="dropdown-item" href="{{ .URL | relLangURL }}"{{ if $.IsHome }} data-target="{{ .URL }}"{{ end }}>
+                {{- .Pre -}}<span>{{ .Name | safeHTML }}</span>{{- .Post -}}
+              </a>
+            {{ end }}
+          </div>
+        </li>
+
+        {{ else }}
+
+        {{/* Set target for link. */}}
+        {{ $.Scratch.Set "target" "" }}
+        {{ if gt (len .URL) 4 }}
+          {{ if eq "http" (slicestr .URL 0 4) }}
+            {{ $.Scratch.Set "target" " target=\"_blank\" rel=\"noopener\"" }}
+          {{ end }}
+        {{ end }}
+
+        {{/* Get active page. */}}
+        {{ $is_link_in_current_path := in $current_page.RelPermalink .URL }}
+        {{ $is_widget_page := or $current_page.IsHome (eq $current_page.Type "widget_page") }}
+        {{ $hash := findRE "#(.+)" .URL }}
+        {{ $is_same_page := $is_link_in_current_path }}
+        {{ if gt (len $hash) 0 }}
+          {{ $hash = index $hash 0 }}
+          {{ $hash_removed := replace .URL $hash "" }}
+          {{ if eq (len $hash_removed) 0 }}
+            {{ $hash_removed = "/" }}{{/* Add robustness for `/#SECTION` or `#SECTION` in `menus.toml`. */}}
+          {{ end }}
+          {{ $is_same_page = eq (path.Dir $current_page.RelPermalink) (path.Dir ($hash_removed|relLangURL)) }}
+        {{ end }}
+
+        <li class="nav-item">
+          <a class="nav-link {{if $is_link_in_current_path }} active{{end}}" href="{{.URL | relLangURL}}"{{ if and $is_widget_page $is_same_page }} data-target="{{$hash}}"{{ end }}{{ ($.Scratch.Get "target") | safeHTMLAttr }}>
+            {{- .Pre -}}<span>{{ .Name | safeHTML }}</span>{{- .Post -}}
+          </a>
+        </li>
+
+        {{ end }}
+        {{ end }}
+
+      {{ if site.Menus.main_right | and (eq $align_menu "l") }}
+      </ul>
+      <ul class="navbar-nav ml-md-auto">
+      {{ end }}
+
+        {{ range site.Menus.main_right }}
+
+        {{/* Set target for link. */}}
+        {{ $.Scratch.Set "target" "" }}
+        {{ if gt (len .URL) 4 }}
+        {{ if eq "http" (slicestr .URL 0 4) }}
+        {{ $.Scratch.Set "target" " target=\"_blank\" rel=\"noopener\"" }}
+        {{ end }}
+        {{ end }}
+
+        <li class="nav-item">
+          <a class="nav-link" href="{{ .URL | relLangURL }}"{{ if $.IsHome }} data-target="{{ .URL }}"{{ end }}{{ ($.Scratch.Get "target") | safeHTMLAttr }}>
+            {{- .Pre -}}<span>{{ .Name | safeHTML }}</span>{{- .Post -}}
+          </a>
+        </li>
+
+        {{ end }}
+      </ul>
+    </div><!-- /.navbar-collapse -->
+
+    <ul class="nav-icons navbar-nav flex-row ml-auto d-flex pl-md-2">
+      {{ if site.Params.search.engine }}
+      <li class="nav-item">
+        <a class="nav-link js-search" href="#" title="Search the site"><i class="fas fa-search" aria-hidden="true"></i></a>
+      </li>
+      {{ end }}
+
+      {{ if site.Params.day_night }}
+      <li class="nav-item dropdown theme-dropdown">
+        <a href="#" class="nav-link js-theme-selector" data-toggle="dropdown" aria-haspopup="true" title="Color scheme">
+          <i class="fas fa-palette" aria-hidden="true"></i>
+        </a>
+        <div class="dropdown-menu">
+          <a href="#" class="dropdown-item js-set-theme-light">
+            <span>{{ i18n "theme_light" | default "Light" }}</span>
+          </a>
+          <a href="#" class="dropdown-item js-set-theme-dark">
+            <span>{{ i18n "theme_dark" | default "Dark" }}</span>
+          </a>
+          <a href="#" class="dropdown-item js-set-theme-auto">
+            <span>{{ i18n "theme_auto" | default "Automatic" }}</span>
+          </a>
+        </div>
+      </li>
+      {{ end }}
+
+      {{ if .IsTranslated }}
+      <li class="nav-item dropdown i18n-dropdown">
+        <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true">
+          <i class="fas fa-globe mr-1" aria-hidden="true"></i><span class="d-none d-lg-inline">{{ index site.Data.i18n.languages .Lang }}</span>
+        </a>
+        <div class="dropdown-menu">
+          <div class="dropdown-item dropdown-item-active">
+            <span>{{ index site.Data.i18n.languages .Lang }}</span>
+          </div>
+          {{ range .Translations }}
+          <a class="dropdown-item" href="{{ .Permalink }}"{{ if $.IsHome }} data-target="{{ .RelPermalink }}"{{ end }}>
+            <span>{{ index site.Data.i18n.languages .Lang }}</span>
+          </a>
+          {{ end }}
+        </div>
+      </li>
+      {{ end }}
+
+    </ul>
+
+  </div><!-- /.container -->
+</nav>
diff --git a/layouts/partials/page_metadata.html b/layouts/partials/page_metadata.html
new file mode 100644
index 00000000..1ba61462
--- /dev/null
+++ b/layouts/partials/page_metadata.html
@@ -0,0 +1,68 @@
+{{ $is_list := .is_list }}
+{{ $page := .page }}
+
+<div class="article-metadata">
+
+  {{/* If `authors` is set and is not empty. */}}
+  {{ if $page.Params.authors }}
+  {{ $authorLen := len $page.Params.authors }}
+  {{ if gt $authorLen 0 }}
+  <div>
+    {{ partial "page_metadata_authors" $page }}
+  </div>
+  {{ end }}
+  {{ end }}
+
+  {{ if not (in (slice "talk" "page") $page.Type) }}
+  <span class="article-date">
+    {{ $date := $page.Lastmod.Format site.Params.date_format }}
+    {{ if eq $page.Type "publication" }}
+      {{ $date = $page.Date.Format (site.Params.publications.date_format | default "January, 2006") }}
+    {{ else }}
+      {{ if ne $page.Params.Lastmod $page.Params.Date }}
+          {{ i18n "last_updated" }}
+      {{ end }}
+    {{ end }}
+    {{ $date }}
+  </span>
+  {{ end }}
+
+  {{ if and (eq $is_list 1) (eq $page.Type "publication") }}
+  <span class="middot-divider"></span>
+  <span class="pub-publication">
+    {{ if $page.Params.publication_short }}
+      {{ $page.Params.publication_short | markdownify }}
+    {{ else if $page.Params.publication }}
+      {{ $page.Params.publication | markdownify }}
+    {{ end }}
+  </span>
+  {{ end }}
+
+  {{ if and (eq $page.Type "post") (not (or (eq site.Params.reading_time false) (eq $page.Params.reading_time false))) }}
+  <span class="middot-divider"></span>
+  <span class="article-reading-time">
+    {{ $page.ReadingTime }} {{ i18n "minute_read" }}
+  </span>
+  {{ end }}
+
+  {{/* Show Disqus comment count if enabled. */}}
+  {{ $disqus_enabled := eq site.Params.comments.engine 1 | and (index site.Params.comments.commentable $page.Type) | and (ne $page.Params.commentable false) | or $page.Params.commentable }}
+  {{ if and $disqus_enabled (site.Params.comments.disqus.show_count | default true) }}
+  <span class="middot-divider"></span>
+  <a href="{{ $page.RelPermalink }}#disqus_thread"><!-- Count will be inserted here --></a>
+  {{ end}}
+
+  {{ $taxonomy := "categories" }}
+  {{ if $page.Param $taxonomy }}
+  <span class="middot-divider"></span>
+  <span class="article-categories">
+    <i class="fas fa-folder mr-1"></i>
+    <span class="sr-only">Categories: </span>
+    {{- range $index, $value := ($page.GetTerms $taxonomy) -}}
+      {{- if gt $index 0 }}, {{ end -}}
+      <a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
+    {{- end -}}
+  </span>
+  {{ end }}
+
+</div>
diff --git a/layouts/partials/search.html b/layouts/partials/search.html
new file mode 100644
index 00000000..5f850a84
--- /dev/null
+++ b/layouts/partials/search.html
@@ -0,0 +1,32 @@
+<aside class="search-results" id="search">
+  <div class="container">
+    <section class="search-header">
+
+      <div class="row no-gutters justify-content-between mb-3">
+        <div class="col-6">
+          <h1>{{ i18n "search" }}</h1>
+        </div>
+        <div class="col-6 col-search-close">
+          <a class="js-search" href="#" title="Close search"><i class="fas fa-times-circle text-muted" aria-hidden="true"></i></a>
+        </div>
+      </div>
+
+      <div id="search-box">
+        {{ if eq site.Params.search.engine 1 }}
+        <input name="q" id="search-query" placeholder="{{i18n "search_placeholder"}}" autocapitalize="off"
+        autocomplete="off" autocorrect="off" spellcheck="false" type="search">
+        {{ else }}
+        <!-- Search box will appear here -->
+        {{ end }}
+      </div>
+
+    </section>
+    <section class="section-search-results">
+
+      <div id="search-hits" aria-live="polite">
+        <!-- Search results will appear here -->
+      </div>
+
+    </section>
+  </div>
+</aside>
diff --git a/layouts/partials/tags.html b/layouts/partials/tags.html
index 7ae6c6d5..e7999f88 100644
--- a/layouts/partials/tags.html
+++ b/layouts/partials/tags.html
@@ -1,6 +1,7 @@
 {{ $taxonomy := "tags" }}
 {{ if .Param $taxonomy }}
 <div class="article-tags">
+  <span class="sr-only">Tags: </span>
   {{ range $index, $value := (.GetTerms $taxonomy) }}
   <a class="badge badge-light" href="{{ .RelPermalink }}">{{  replaceRE `([^\\])_` "$1 " .LinkTitle }}</a>
   {{ end }}
diff --git a/layouts/partials/widgets/about.html b/layouts/partials/widgets/about.html
new file mode 100644
index 00000000..e58e8f52
--- /dev/null
+++ b/layouts/partials/widgets/about.html
@@ -0,0 +1,109 @@
+{{ $ := .root }}
+{{ $page := .page }}
+
+{{ $author := "" }}
+{{ if .author }}
+  {{ $author = .author }}
+{{ else }}
+  {{ $author = $page.Params.author }}
+{{end}}
+
+{{ $person_page_path := (printf "/authors/%s" $author) }}
+{{ $person_page := site.GetPage $person_page_path }}
+{{ if not $person_page }}
+  {{ errorf "Could not find an author page at `%s`. Please check the value of `author` in your About widget and create an associated author page if one does not already exist. See https://sourcethemes.com/academic/docs/page-builder/#about " $person_page_path }}
+{{end}}
+{{ $person := $person_page.Params }}
+{{ $avatar := ($person_page.Resources.ByType "image").GetMatch "*avatar*" }}
+{{ $avatar_shape := site.Params.avatar.shape | default "circle" }}
+
+<!-- About widget -->
+<div class="row">
+  <div class="col-12 col-lg-4">
+    <div id="profile">
+
+      {{ if site.Params.avatar.gravatar }}
+      <img class="avatar {{if eq $avatar_shape "square"}}avatar-square{{else}}avatar-circle{{end}}" src="https://s.gravatar.com/avatar/{{ md5 $person.email }}?s=270')" alt="Avatar of {{$person_page.Title}}">
+      {{ else if $avatar }}
+      {{ $avatar_image := $avatar.Fill "270x270 Center" }}
+      <img class="avatar {{if eq $avatar_shape "square"}}avatar-square{{else}}avatar-circle{{end}}" src="{{ $avatar_image.RelPermalink }}" alt="Avatar of {{$person_page.Title}}">
+      {{ end }}
+
+      <div class="portrait-title">
+        <h2>{{ $person_page.Title }}</h2>
+        {{ with $person.role }}<h3>{{ . | markdownify | emojify }}</h3>{{ end }}
+
+        {{ range $person.organizations }}
+        <h3>
+          {{ with .url }}<a href="{{ . }}" target="_blank" rel="noopener">{{ end }}
+          <span>{{ .name }}</span>
+          {{ if .url }}</a>{{ end }}
+        </h3>
+        {{ end }}
+      </div>
+
+      <ul class="network-icon" aria-hidden="true">
+        {{ range $person.social }}
+        {{ $pack := or .icon_pack "fas" }}
+        {{ $pack_prefix := $pack }}
+        {{ if in (slice "fab" "fas" "far" "fal") $pack }}
+          {{ $pack_prefix = "fa" }}
+        {{ end }}
+        {{ $link := .link }}
+        {{ $scheme := (urls.Parse $link).Scheme }}
+        {{ $target := "" }}
+        {{ if not $scheme }}
+          {{ $link = .link | relLangURL }}
+        {{ else if in (slice "http" "https") $scheme }}
+          {{ $target = "target=\"_blank\" rel=\"noopener\"" }}
+        {{ end }}
+        <li>
+          <a href="{{ $link | safeURL }}" {{ $target | safeHTMLAttr }}>
+            <i class="{{ $pack }} {{ $pack_prefix }}-{{ .icon }} big-icon"></i>
+          </a>
+        </li>
+        {{ end }}
+      </ul>
+
+    </div>
+  </div>
+  <div class="col-12 col-lg-8">
+
+    {{/* Only display widget title in explicit instances of about widget, not in author pages. */}}
+    {{ if and $page.Params.widget $page.Title }}<h1>{{ $page.Title | markdownify | emojify }}</h1>{{ end }}
+
+    {{ $person_page.Content }}
+
+    <div class="row">
+
+      {{ with $person.interests }}
+      <div class="col-md-5">
+        <h3>{{ i18n "interests" | markdownify }}</h3>
+        <ul class="ul-interests">
+          {{ range . }}
+          <li>{{ . | markdownify | emojify }}</li>
+          {{ end }}
+        </ul>
+      </div>
+      {{ end }}
+
+      {{ with $person.education }}
+      <div class="col-md-7">
+        <h3>{{ i18n "education" | markdownify }}</h3>
+        <ul class="ul-edu fa-ul">
+          {{ range .courses }}
+          <li>
+            <i class="fa-li fas fa-graduation-cap"></i>
+            <div class="description">
+              <p class="course">{{ .course }}{{ with .year }}, {{ . }}{{ end }}</p>
+              <p class="institution">{{ .institution }}</p>
+            </div>
+          </li>
+          {{ end }}
+        </ul>
+      </div>
+      {{ end }}
+
+    </div>
+  </div>
+</div>
diff --git a/layouts/shortcodes/code-download.html b/layouts/shortcodes/code-download.html
index b7ca7aac..e721f3f7 100644
--- a/layouts/shortcodes/code-download.html
+++ b/layouts/shortcodes/code-download.html
@@ -2,6 +2,6 @@
 {{ $lang := .Get "language" }}
 {{ $code :=  readFile $file }}
 {{ (print "```" $lang "\n" $code "\n```") | markdownify }}
-<a href="{{ $file }}" download>
+<a href="{{ $file }}" download title="Download this code">
 <i class="fa fa-download" aria-hidden="true"></i>
 </a>
diff --git a/layouts/shortcodes/file-download.html b/layouts/shortcodes/file-download.html
index dd4de182..97a502be 100644
--- a/layouts/shortcodes/file-download.html
+++ b/layouts/shortcodes/file-download.html
@@ -1,6 +1,6 @@
 {{ $file := .Get "file" }}
 {{ $text := .Get "text" }}
+<a href="{{ $file }}" download title="Download file">
 {{ ( print $text | markdownify ) }}
-<a href="{{ $file }}" download>
 <i class="fa fa-download" aria-hidden="true"></i>
 </a>
diff --git a/layouts/shortcodes/link-button.html b/layouts/shortcodes/link-button.html
index 7b3e3b91..3c6c0d30 100644
--- a/layouts/shortcodes/link-button.html
+++ b/layouts/shortcodes/link-button.html
@@ -1,4 +1,4 @@
-<a {{ with .Get "href"}} href="{{.}}" target="_blank" {{ end }} class="btn btn-outline-primary">
+<a {{ with .Get "href"}} href="{{.}}" target="_blank" {{ end }} {{ with .Get "aria-label"}} aria-label="{{.}}" {{ end }} {{ with .Get "title"}} title="{{.}}" {{ end }} class="btn btn-outline-primary">
   {{ $icon := .Get "icon" }}
   {{ $iconposition := .Get "icon-position" }}
   {{ if ($icon) }}