diff --git a/netlify.toml b/netlify.toml
index ace4c69..1c10419 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,2 +1,4 @@
 [context."master".environment]
   VUE_APP_ATLAS_GRAPHQL_ENDPOINT = "https://explorehomer-atlas.scaife-viewer.org/graphql/"
+[context."feature/passage-metadata-improvements".environment]
+  VUE_APP_ATLAS_GRAPHQL_ENDPOINT = "https://explorehomer-feature-pa-bpryib.herokuapp.com/graphql/"
diff --git a/package.json b/package.json
index e35b340..a45b4f3 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.28",
     "@fortawesome/free-solid-svg-icons": "^5.13.0",
     "@fortawesome/vue-fontawesome": "^0.1.9",
-    "@scaife-viewer/scaife-widgets": "0.13.1",
+    "@scaife-viewer/scaife-widgets": "0.14.0",
     "apollo-boost": "^0.4.7",
     "core-js": "^3.6.5",
     "graphql": "^15.0.0",
diff --git a/src/App.vue b/src/App.vue
index 02d468c..ce2a27f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -24,6 +24,9 @@
     margin: 0;
     padding: 0;
   }
+  :root {
+    --scaife-brand-color: #{$explorehomer-brand};
+  }
   #app {
     font-family: $font-family-sans;
     -webkit-font-smoothing: antialiased;
@@ -36,7 +39,21 @@
   div.main-layout > .widget {
     border-top: none;
   }
+  div.main-layout > .widget > .main-widget-heading {
+    // heading is currently unused, but the slot is defined
+    // in scaife-skeleton
+    display: none;
+  }
   a {
     color: $explorehomer-brand;
   }
+
+  .new-alexandria-widget {
+    font-family: $font-family-serif;
+    font-size: 14px;
+    line-height: 18px;
+    .new-alexandria-container {
+      padding-right: 1rem;
+    }
+  }
 </style>
diff --git a/src/components/ImageViewer.vue b/src/components/ImageViewer.vue
index 29e9830..6ef110f 100644
--- a/src/components/ImageViewer.vue
+++ b/src/components/ImageViewer.vue
@@ -3,13 +3,18 @@
     <div id="image-toolbar" class="toolbar">
       <span v-show="displayViewer">
         <small>
-          <a id="zoom-in" class="link" title="Zoom in">Zoom In</a>
-          <span>&vert;&nbsp;</span>
-          <a id="zoom-out" class="link" title="Zoom out">Zoom Out</a>
-          <span>&vert;&nbsp;</span>
-          <a id="home" class="link" title="Go home">Home</a>
-          <span>&vert;&nbsp;</span>
-          <a id="full-page" class="link" title="Toggle full page">Full Page</a>
+          <a id="home" class="link" title="Go home">
+            <icon name="home" />
+          </a>
+          <a id="zoom-in" class="link" title="Zoom in">
+            <icon name="search-plus" />
+          </a>
+          <a id="zoom-out" class="link" title="Zoom out">
+            <icon name="search-minus" />
+          </a>
+          <a id="full-page" class="link" title="Toggle full page">
+            <icon name="window-maximize" />
+          </a>
         </small>
       </span>
       <div v-show="displayViewer" id="image-viewer" class="viewer"></div>
@@ -110,6 +115,18 @@
       height: calc(100vh - 100px);
     }
 
+    .link {
+      font-size: 18px;
+      cursor: pointer;
+      margin: 0 0.5rem;
+      padding: 0.25rem;
+      border-radius: 3px;
+    }
+    .link:hover {
+      color: $white;
+      background: $explorehomer-brand;
+    }
+
     .error {
       margin: 10px 0px;
       padding:12px;
diff --git a/src/components/ImageViewerToolbar.vue b/src/components/ImageViewerToolbar.vue
new file mode 100644
index 0000000..c16785d
--- /dev/null
+++ b/src/components/ImageViewerToolbar.vue
@@ -0,0 +1,70 @@
+<template>
+  <div class="image-viewer-toolbar">
+    <a href :class="{ active: showText }" @click.prevent="onShowText">
+      <icon name="align-justify" />
+    </a>
+    <a href :class="{ active: showImage }" @click.prevent="onShowImage" >
+      <icon name="book-open" />
+    </a>
+    <a href :class="{ active: showBoth }" @click.prevent="onShowBoth" >
+      <icon name="align-justify" /> |
+      <icon name="book-open" />
+    </a>
+  </div>
+</template>
+
+<script>
+  import {
+    IMAGE_VIEWER_STATE_TEXT,
+    IMAGE_VIEWER_STATE_IMAGE,
+    IMAGE_VIEWER_STATE_BOTH,
+  } from '@/constants';
+
+  export default {
+    props: ['show'],
+    computed: {
+      showText() {
+        return this.show === IMAGE_VIEWER_STATE_TEXT;
+      },
+      showImage() {
+        return this.show === IMAGE_VIEWER_STATE_IMAGE;
+      },
+      showBoth() {
+        return this.show === IMAGE_VIEWER_STATE_BOTH;
+      },
+    },
+    methods: {
+      onShowText() {
+        this.$emit('show', IMAGE_VIEWER_STATE_TEXT);
+      },
+      onShowImage() {
+        this.$emit('show', IMAGE_VIEWER_STATE_IMAGE);
+      },
+      onShowBoth() {
+        this.$emit('show', IMAGE_VIEWER_STATE_BOTH);
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .image-viewer-toolbar {
+    display: flex;
+    padding-bottom: 0.75rem;
+    a {
+      margin: 0 0.5rem;
+      padding: 0.25rem;
+      border-radius: 3px;
+      border: 1px solid transparent;
+    }
+    a:hover {
+      border-color: $explorehomer-brand;
+    }
+    a.active {
+      font-weight: 700;
+      background: $explorehomer-brand;
+      color: $white;
+      border-color: transparent;
+    }
+  }
+</style>
diff --git a/src/constants.js b/src/constants.js
index cca8efa..5d48a4d 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -15,3 +15,7 @@ export const CLEAR_NAMED_ENTITIES = 'clearNamedEntities';
 export const PLAY_AUDIO = 'playAudio';
 export const STOP_AUDIO = 'stopAudio';
 export const SELECT_LINE = 'selectLine';
+
+export const IMAGE_VIEWER_STATE_BOTH = 'both';
+export const IMAGE_VIEWER_STATE_TEXT = 'text';
+export const IMAGE_VIEWER_STATE_IMAGE = 'image';
diff --git a/src/main.js b/src/main.js
index e921ce6..51e6ac2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,6 +6,12 @@ import {
   faVolumeUp,
   faUser,
   faMapMarkerAlt,
+  faAlignJustify,
+  faBookOpen,
+  faSearchMinus,
+  faSearchPlus,
+  faHome,
+  faWindowMaximize,
 } from '@fortawesome/free-solid-svg-icons';
 
 import SkeletonPlugin from 'scaife-skeleton';
@@ -23,6 +29,12 @@ const iconMap = [
   faVolumeUp,
   faUser,
   faMapMarkerAlt,
+  faAlignJustify,
+  faBookOpen,
+  faSearchMinus,
+  faSearchPlus,
+  faHome,
+  faWindowMaximize,
 ].reduce((map, obj) => {
   return {
     ...map,
diff --git a/src/reader/components/ReaderView.vue b/src/reader/components/ReaderView.vue
index ae41257..f70434b 100644
--- a/src/reader/components/ReaderView.vue
+++ b/src/reader/components/ReaderView.vue
@@ -10,8 +10,8 @@
 <script>
   import {
     MetadataWidget,
-    NewAlexandriaWidget,
     PassageAncestorsWidget,
+    PassageSiblingsWidget,
     PassageChildrenWidget,
     PassageReferenceWidget,
     TextSizeWidget,
@@ -26,12 +26,16 @@
   import ScholiaWidget from '@/widgets/ScholiaWidget.vue';
   import AudioWidget from '@/widgets/AudioWidget.vue';
   import WordListWidget from '@/widgets/WordListWidget.vue';
+  import NewAlexandriaWidget from '@/widgets/NewAlexandriaWidget.vue';
   import { FETCH_METADATA, FETCH_LIBRARY } from '@/constants';
 
   export default {
     name: 'ReaderView',
     beforeCreate() {
-      this.$store.dispatch(FETCH_METADATA);
+      if (!this.$route.query.urn) {
+        // load the first version returned from ATLAS
+        this.$store.dispatch(FETCH_METADATA);
+      }
       this.$store.dispatch(FETCH_LIBRARY);
     },
     computed: {
@@ -43,6 +47,7 @@
           LibraryWidget,
           PassageReferenceWidget,
           PassageAncestorsWidget,
+          PassageSiblingsWidget,
           PassageChildrenWidget,
           // TOCWidget,
         ];
diff --git a/src/reader/widgets/ReaderWidget.vue b/src/reader/widgets/ReaderWidget.vue
index a6734ea..db52f8d 100644
--- a/src/reader/widgets/ReaderWidget.vue
+++ b/src/reader/widgets/ReaderWidget.vue
@@ -1,17 +1,38 @@
 <template>
   <article class="u-flex">
     <section class="reader-left">
+      <h2 v-if="passageTitle" class="reader-heading main-widget-heading">
+        {{ passageTitle }}
+      </h2>
       <div class="reader-container u-flex">
         <Paginator :urn="previous" direction="left" />
         <LoaderBall v-if="gqlLoading" />
-        <template v-else-if="imageMode">
-          <Reader :lines="lines" :textSize="textSize" :textWidth="textWidth" />
+        <div class="image-mode" :class="showImage" v-else-if="imageMode">
+          <ImageViewerToolbar :show="showImage" @show="onShowImage" />
+          <div class="image-mode-container" v-if="showImage === 'both'">
+            <Reader
+              :lines="lines"
+              :textSize="textSize"
+              :textWidth="textWidth"
+            />
+            <ImageViewer
+              v-if="imageIdentifier"
+              :imageIdentifier="imageIdentifier"
+            />
+            <EmptyMessage class="reader-empty-annotations" v-else />
+          </div>
+          <Reader
+            v-else-if="showImage === 'text'"
+            :lines="lines"
+            :textSize="textSize"
+            :textWidth="textWidth"
+          />
           <ImageViewer
-            v-if="imageIdentifier"
+            v-else-if="showImage === 'image' && imageIdentifier"
             :imageIdentifier="imageIdentifier"
           />
           <EmptyMessage class="reader-empty-annotations" v-else />
-        </template>
+        </div>
         <template v-else-if="alignmentMode">
           <EmptyMessage
             class="reader-empty-annotations"
@@ -44,8 +65,13 @@
   import Alignments from '@/reader/components/Alignments.vue';
   import EmptyMessage from '@/components/EmptyMessage.vue';
   import ImageViewer from '@/components/ImageViewer.vue';
+  import ImageViewerToolbar from '@/components/ImageViewerToolbar.vue';
   import Paginator from '@/components/Paginator.vue';
-  import { SET_PASSAGE, UPDATE_METADATA } from '@/constants';
+  import {
+    SET_PASSAGE,
+    UPDATE_METADATA,
+    IMAGE_VIEWER_STATE_BOTH,
+  } from '@/constants';
   import { MODULE_NS } from '@/reader/constants';
 
   export default {
@@ -55,14 +81,40 @@
       Paginator,
       Reader,
       ImageViewer,
+      ImageViewerToolbar,
     },
     scaifeConfig: {},
+    data() {
+      return {
+        showImage: IMAGE_VIEWER_STATE_BOTH,
+      };
+    },
+    methods: {
+      onShowImage(kind) {
+        this.showImage = kind;
+      },
+      setVersionMetadata() {
+        this.$store.dispatch(
+          UPDATE_METADATA,
+          { urn: this.urn.version },
+          { root: true },
+        );
+      },
+    },
     watch: {
       urn() {
         this.$nextTick(() => {
           this.$parent.$el.scrollTop = 0;
         });
       },
+      versionMetadata: {
+        immediate: true,
+        handler() {
+          if (!this.versionMetadata) {
+            this.setVersionMetadata();
+          }
+        },
+      },
     },
     beforeUpdate() {
       if (this.urn && !this.$route.query.urn) {
@@ -74,11 +126,7 @@
         });
       }
       if (this.version !== this.urn.version) {
-        this.$store.dispatch(
-          UPDATE_METADATA,
-          { urn: this.urn.version },
-          { root: true },
-        );
+        this.setVersionMetadata();
       }
     },
     computed: {
@@ -230,19 +278,25 @@
           };
         });
       },
-      siblings() {
-        return this.gqlData && this.gqlData.passageTextParts.metadata.siblings
-          ? this.gqlData.passageTextParts.metadata.siblings
+      versionMetadata() {
+        return this.$store.state.metadata;
+      },
+      passageTitle() {
+        return this.versionMetadata ? this.versionMetadata.label : null;
+      },
+      passageMetadata() {
+        return this.gqlData && this.gqlData.passageTextParts.metadata
+          ? this.gqlData.passageTextParts.metadata
           : null;
       },
       previous() {
-        return this.siblings && this.siblings.previous
-          ? new URN(this.siblings.previous)
+        return this.passageMetadata && this.passageMetadata.previous
+          ? new URN(this.passageMetadata.previous)
           : null;
       },
       next() {
-        return this.siblings && this.siblings.next
-          ? new URN(this.siblings.next)
+        return this.passageMetadata && this.passageMetadata.next
+          ? new URN(this.passageMetadata.next)
           : null;
       },
     },
@@ -256,6 +310,9 @@
   section {
     width: 100%;
   }
+  .reader-heading {
+    flex: 1;
+  }
   .reader-container {
     align-items: baseline;
     justify-content: left;
@@ -267,11 +324,27 @@
       padding-top: 40px;
     }
   }
-</style>
-
-<style>
- .reader-empty-annotations {
-   text-align: center;
-   margin-top: 1rem;
- }
+  ::v-deep .reader-empty-annotations {
+    text-align: center;
+    margin-top: 1rem;
+  }
+  .image-mode {
+    flex: 1;
+    &.both {
+      .image-mode-container {
+        grid-template-columns: 1fr 1fr;
+        column-gap: 0.75rem;
+      }
+    }
+    &.text,
+    &.image {
+      .image-mode-container {
+        grid-template-columns: 1fr;
+      }
+    }
+    .image-mode-container {
+      display: grid;
+      height: calc(100vh - 75px);
+    }
+  }
 </style>
diff --git a/src/widgets/DisplayModeWidget.vue b/src/widgets/DisplayModeWidget.vue
index 9d87b07..bd288c1 100644
--- a/src/widgets/DisplayModeWidget.vue
+++ b/src/widgets/DisplayModeWidget.vue
@@ -117,11 +117,13 @@
 <style lang="scss">
   .main-layout.main-layout-wide {
     flex: 4;
-    .reader {
-      padding-right: 1rem;
-    }
     .open-seadragon {
       padding-left: 1rem;
+      border-left: 1px solid $gray-300;
+    }
+    .image .open-seadragon {
+      border: none;
+      padding-left: 0;
     }
   }
 </style>
diff --git a/src/widgets/NewAlexandriaWidget.vue b/src/widgets/NewAlexandriaWidget.vue
new file mode 100644
index 0000000..8f1002c
--- /dev/null
+++ b/src/widgets/NewAlexandriaWidget.vue
@@ -0,0 +1,138 @@
+<script>
+  /*
+  This widget contains customizations for Explore Homer that handle
+  special-case queries tothe New Alexandria Commentary API.
+
+  In the future, we may want to take this type of customization
+  into consideration when implementing hooks / extensibility points
+  within `scaife-widgets`.
+
+  We may also find that the Vue Composition API
+  (https://composition-api.vuejs.org/) lends itself to these types of
+  customizations.
+  */
+  import gql from 'graphql-tag';
+
+  import WIDGETS_NS, {
+    NewAlexandriaWidget,
+  } from '@scaife-viewer/scaife-widgets';
+
+  export default {
+    extends: NewAlexandriaWidget,
+    name: 'NewAlexandriaWidget',
+    scaifeConfig: {
+      displayName: 'New Alexandria Commentary',
+    },
+    data: () => ({
+      passageTextParts: [],
+      healedPassage: '',
+    }),
+    computed: {
+      needsHealing() {
+        // special-case handling for the Folios version of
+        // the Iliad
+        return (
+          this.originalPassage.version ===
+          'urn:cts:greekLit:tlg0012.tlg001.msA-folios:'
+        );
+      },
+      originalPassage() {
+        // the passage retrieved from the store
+        return this.$store.getters[`${WIDGETS_NS}/passage`];
+      },
+      passage() {
+        // overrides `NewAlexandriaWidget.computed.passage`
+        // so that only the healedPassage is passed to NAC
+        // via the `passage` watcher
+        return this.healedPassage;
+      },
+    },
+    watch: {
+      originalPassage: {
+        immediate: true,
+        handler() {
+          if (this.needsHealing) {
+            this.healFolioURN();
+          } else {
+            this.healedPassage = this.originalPassage.toString();
+          }
+        },
+      },
+      passageTextParts() {
+        // after we have retrieved passage text parts,
+        // extract the refs and populate healedPassage
+        const refs = this.extractPassageTextPartRefs();
+        const healedRefs = this.extractHealedRefs(refs);
+        this.updateHealedPassage(healedRefs);
+      },
+    },
+    methods: {
+      hasLinesInRef(ref) {
+        // good: 2r.1.1
+        // bad: 12r, 12r.1
+        return ref.split('.').length === 3;
+      },
+      healFolioURN() {
+        const refs = this.originalPassage.reference.split('-');
+        if (this.hasLinesInRef(refs[0])) {
+          const healedRefs = this.extractHealedRefs(refs);
+          this.updateHealedPassage(healedRefs);
+        } else {
+          this.fetchPassageTextParts();
+        }
+      },
+      extractHealedRefs(refs) {
+        // pops the folio off of refs,
+        // e.g. 12r.1.1-12r.1.7 --> 1.1-1.7
+        const healedRefs = [];
+        refs.forEach(ref => {
+          const refParts = ref.split('.');
+          healedRefs.push(refParts.slice(1).join('.'));
+        });
+        return healedRefs;
+      },
+      updateHealedPassage(refs) {
+        if (refs.length > 0) {
+          const refPart = refs.join('-');
+          this.healedPassage = `${this.originalPassage.version}${refPart}`;
+        }
+      },
+      fetchPassageTextParts() {
+        // retrieves the lowest text parts for a folio level reference,
+        // e.g. 12r --> 12r.1.1-12.r.1.25
+        const query = gql`
+          {
+            passageTextParts(
+              reference: "${this.originalPassage}"
+            ) {
+              edges {
+                node {
+                  id
+                  ref
+                }
+              }
+            }
+          }
+        `;
+        this.$gql(query).then(data => {
+          this.passageTextParts = data.passageTextParts.edges.map(edge => {
+            const { node } = edge;
+            return node;
+          });
+        });
+        return query;
+      },
+      extractPassageTextPartRefs() {
+        // extracts the ref(s) from the text parts
+        const refs = [];
+        // start ref
+        refs.push(this.passageTextParts.slice(0, 1)[0].ref);
+        if (this.passageTextParts.length > 1) {
+          // end ref
+          refs.push(this.passageTextParts.slice(-1)[0].ref);
+        }
+        return refs;
+      },
+    },
+  };
+</script>
diff --git a/yarn.lock b/yarn.lock
index 33c6df2..4bf311a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1482,10 +1482,10 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@scaife-viewer/scaife-widgets@0.13.1":
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/@scaife-viewer/scaife-widgets/-/scaife-widgets-0.13.1.tgz#40da92bf603b8247ffc3aa2f69a661927873c194"
-  integrity sha512-2HKzXu+0RSalwghDi9GzbV8x5iKBKs2l1da2Bn9eLNhqtEWdE+a0zQj19tBphf8ztEnXbKVHAJZyWgfpqNgmCg==
+"@scaife-viewer/scaife-widgets@0.14.0":
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/@scaife-viewer/scaife-widgets/-/scaife-widgets-0.14.0.tgz#2d0f76f9ad8372d42409d14b545f52822fcb06e3"
+  integrity sha512-wNvTgjvc1JEhwu106xDNbsMAiAbeNFUCeZ8nnNLZON2SzdWeEfjePLOh5dSKju4sasl5XSBNrGeImmt3K7jXog==
   dependencies:
     "@fortawesome/fontawesome-svg-core" "^1.2.25"
     "@fortawesome/free-solid-svg-icons" "^5.11.2"
@@ -2338,9 +2338,9 @@ acorn-walk@^7.1.1:
   integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==
 
 acorn@^5.5.3:
-  version "5.7.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
-  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+  version "5.7.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
+  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
 acorn@^6.0.1, acorn@^6.2.1:
   version "6.4.0"
@@ -12549,9 +12549,9 @@ websocket-driver@>=0.5.1:
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3, whatwg-encoding@^1.0.5:
   version "1.0.5"