diff --git a/inc/types/book.inc b/inc/types/book.inc
index 13bc5f26..92efd91f 100755
--- a/inc/types/book.inc
+++ b/inc/types/book.inc
@@ -92,10 +92,18 @@ function dlts_viewer_full_book_view(&$entity) {
 }
 
 function dlts_viewer_book_metadata_view($entity) {
-    $element = node_view($entity, 'metadata');
+    $element = node_view($entity, 'metadata',$entity->language);
     return drupal_render($element);
 }
 
+function dlts_viewer_process_node_dlts_book(&$vars) {
+    $args = arg();
+    $count = count($args);
+    if ($count === 3 && $args[2] == 'display') {
+        $vars['theme_hook_suggestions'][] = 'node__display';
+    }
+}
+
 function dlts_viewer_pjax_book_view(&$entity) {
     $vars = array(
         'button_next' => $entity->button_next,
@@ -128,7 +136,7 @@ function _language_field(&$entity) {
     $entity->lang_name = isset($languages[$entity->language]->name) ? $languages[$entity->language]->name : 'English';
     $translations = translation_path_get_translations('node/' . $entity->nid);
     if (count($translations) > 1) {
-        $entity->lang_options = array('#type' => 'markup', '#prefix' => '<select class="language">', '#suffix' => '</select>', '#markup' => '');
+        $entity->lang_options = array('#type' => 'markup', '#prefix' => '<select class="language" aria-label="Choose Language for Metadata">', '#suffix' => '</select>', '#markup' => '');
         foreach ($translations as $key => $index) {
             $url = url('books/' . $entity->identifier . '/display', array('absolute' => true, 'query' => array('lang' => $key)));
             $markup = array(
diff --git a/js/modules/slider-base.js b/js/modules/slider-base.js
index edf72e03..6e1e33ee 100755
--- a/js/modules/slider-base.js
+++ b/js/modules/slider-base.js
@@ -733,7 +733,7 @@ YUI.add('slider-base', function(Y, NAME) {
      * @type {String}
      * @default &lt;span class="{thumbClass}" tabindex="-1">&lt;img src="{thumbShadowUrl}" alt="Slider thumb shadow" class="{thumbShadowClass}">&lt;img src="{thumbImageUrl}" alt="Slider thumb" class="{thumbImageClass}">&lt;/span>
      */
-    THUMB_TEMPLATE : '<span class="{thumbClass}" aria-labelledby="{thumbAriaLabelId}" aria-valuetext="" aria-valuemax="" aria-valuemin="" aria-valuenow="" role="slider" tabindex="0">' + // keyboard access jeff     tabindex="-1"
+    THUMB_TEMPLATE : '<span aria-hidden="true" class="{thumbClass}" aria-valuetext="" aria-valuemax="" aria-valuemin="" aria-valuenow="" role="slider" tabindex="0">' + // keyboard access jeff     tabindex="-1"
     '<img src="{thumbShadowUrl}" ' + 'alt="Slider thumb shadow" ' + 'class="{thumbShadowClass}">' + '<img src="{thumbImageUrl}" ' + 'alt="Slider thumb" ' + 'class="{thumbImageClass}">' + '</span>'
 
   }, {
diff --git a/js/ui.components.yui.js b/js/ui.components.yui.js
index 3bee6c72..a324304b 100755
--- a/js/ui.components.yui.js
+++ b/js/ui.components.yui.js
@@ -108,19 +108,23 @@ YUI().use(
       }
       Y.fire(event_prefix + ':toggle', e);
     }
+
     /** TODO: I don't like this, find a more elegant solution */
     function pager_form(e) {
       e.preventDefault();
       var value = this.get('value');
-      var current = parseInt(book.sequence_number, 10);
+      var olMap = Y.one('.olMap');
+      var olMapData = olMap.getData();
+      var current = parseInt(olMapData.sequence, 10);
       var css_class;
       if (value.match(/\D/)) {
         css_class = 'error';
       }
       else {
         value = parseInt(value, 10);
-        if (value !== current &&(value > 0 && value <= sequenceCount )) {
+        if (value !== current && (value > 0 && value <= sequenceCount)) {
           css_class = 'ok';
+          Y.one('.current_page').set('text', value);
           pjax.navigate(bookUrl + '/' +  value);
         }
         else {
@@ -161,6 +165,7 @@ YUI().use(
       var data = map.getData();
       var request = bookUrl + '/' + e.target.getValue() + '?page_view=' + data.pageview;
       if (!Y.Lang.isValue(slider.triggerBy)) {
+        Y.one('.current_page').set('text', e.target.getValue());
         pjax.navigate(request);
         /** slider set focus to the slider rail, blur as soon as possible so that user can use the keyboard to read the book */
         Y.soon(function() {
@@ -174,6 +179,7 @@ YUI().use(
     }
 
     function pjax_navigate(e) {
+      Y.one('body').addClass('openlayers-loading');
       var msg = e.url.replace(bookUrl, '' ).replace('/' , '');
       if (/(^[\d]+$){1}/.test(msg ) || /(^[\d]+-[\d]+$){1}/.test(msg)) {
         this.one('.current_page').set('text', msg);
@@ -336,11 +342,8 @@ YUI().use(
         imgMetadata: config.metadata
       });
       Y.on('contentready', function() {
-    	Y.CrossFrame.postMessage("parent", JSON.stringify({fire: 'openlayers:change', data: config }));
-    	Y.fire('openlayers:change', config);
-        Y.later(1000, Y.one('.pane.load'), function() {
-          this.hide();
-        });
+    	  Y.CrossFrame.postMessage("parent", JSON.stringify({fire: 'openlayers:change', data: config }));
+    	  Y.fire('openlayers:change', config);
       }, '#' + config.id);
     }
 
@@ -357,8 +360,8 @@ YUI().use(
     }
 
     function openLayersTilesLoading() {
-      if (Y.one('body').hasClass('openlayers-loading' )) {
-        Y.later(500, Y.one('.pane.load'), openLayersTilesLoading);
+      if (Y.one('body').hasClass('openlayers-loading')) {
+        Y.later(200, Y.one('.pane.load'), openLayersTilesLoading);
       }
       else {
         Y.one('.pane.load').hide();
@@ -563,4 +566,17 @@ YUI().use(
 
     Y.delegate('change', onSelectMVChange, 'body', '.field-name-mv-2016 form');
 
+    // Post message to parent frame when "pane display" is available
+    // and give access to the node data attributes
+    function onDisplayContentReady () {
+      var display = Y.one('#display');
+      var displayData = display.getData();
+      Y.CrossFrame.postMessage('parent', JSON.stringify({ fire: 'display:load', data: displayData}));
+    }
+    function resizeSlider() {
+      slider.set('length' ,(Y.one('#pager').get('offsetWidth') - 120 ));
+    }
+    Y.on('windowresize', resizeSlider);
+    Y.once('contentready', onDisplayContentReady, '#display');
+
 });
diff --git a/js/ui.keyboard.yui.js b/js/ui.keyboard.yui.js
index 90179532..c3726566 100755
--- a/js/ui.keyboard.yui.js
+++ b/js/ui.keyboard.yui.js
@@ -1,127 +1,124 @@
-// http://yuilibrary.com/yui/docs/event/synth-example.html
-// http://www.cambiaresearch.com/articles/15/javascript-char-codes-key-codes
-YUI().use('node', 'event-synthetic', 'event-custom', function(Y) {
-  Y.Event.define("arrow", {
-    // Webkit and IE repeat keydown when you hold down arrow keys.
-    // Opera links keypress to page scroll; others keydown.
-    // Firefox prevents page scroll via preventDefault() on either
-    // keydown or keypress.
-    _event:(Y.UA.webkit || Y.UA.ie) ? 'keydown' : 'keypress',
-    _keys: {
-        37: true,
-        38: true,
-        39: true,
-        40: true
-    },
-    _directions: {
-        '37': 'w',
-        '38': 'n',
-        '39': 'e',
-        '40': 's'
-    },
-    _keydown: function(e) {
-        if (this._keys[e.keyCode]) {
-            var node = e.currentTarget,
-                input = node.getData('-yui3-arrow-dir');
-
-            if (!input) {
-                input = [];
-                node.setData('-yui3-arrow-dir', input);
-            }
-
-            // Avoid repeats for browsers that fire multiple
-            // keydowns when holding down an arrow key
-            if (input[input.length - 1] !== e.keyCode) {
-                input.push(e.keyCode);
-            }
-        }
-    },
-    _notify: function(e, notifier) {
-        if (this._keys[e.keyCode]) {
-            var node = e.currentTarget,
-                input  = node.getData('-yui3-arrow-dir'),
-                directions = this._directions,
-                direction = [e.keyCode],
-                i;
-
-            for(i = input.length - 1; i >= 0; --i) {
-                if ((e.keyCode - input[i]) % 2) {
-                    direction.push(input[i]);
-                    break;
-                }
-            }
-            e.direction = directions[direction];
-            notifier.fire(e);
-        }
-    },
-    _keyup: function(e) {
-        if (this._keys[e.keyCode]) {
-            var node = e.currentTarget,
-                input = node.getData('-yui3-arrow-dir'),
-                i;
-            if (input) {
-                for(i = input.length - 1; i >= 0; --i) {
-                    if (input[i] === e.keyCode) {
-                        input.splice(i, 1);
-                        break;
-                    }
-                }
-            }
-        }
-    },
-    on: function(node, sub, notifier, filter) {
-        var method =(filter) ? 'delegate' : 'on';
-        sub._handle = new Y.EventHandle([
-            node[method]('keydown', Y.rbind(this._keydown, this), filter),
-            node[method](this._event, Y.rbind(this._notify, this, notifier), filter),            
-            node[method]('keyup', Y.rbind(this._keyup, this), filter)
-        ]);
-    },
-    detach: function(node, sub, notifier) {
-        sub._handle.detach();
-    },
-    delegate: function() {
-        this.on.apply(this, arguments);
-    },
-    detachDelegate: function() {
-        this.detach.apply(this, arguments);
-    }
-  });
+YUI().use(
+    'node', 
+    'node-event-simulate', 
+    'event', 
+    'event-custom', function(Y) {
     
-  function move(e) {
-    e.preventDefault();
-    var map = OpenLayers.DLTS.pages[0], size, handled = true, slideFactor = 75;
-    if (!e.shiftKey) {
-      switch(e.direction) {
-        case 'n':
-          map.pan(0, -slideFactor);
-          break;
-          
-        case 's':
-          map.pan(0, slideFactor);
-          break;
-          
-        case 'e':
-          map.pan(slideFactor, 0);
-          break;
-          
-        case 'w':
-          map.pan(-slideFactor, 0);
-          break;
-          
-      }
+     // https://github.com/RobertWHurst/KeyboardJS
+     // A JavaScript library for binding keyboard combos without the pain of key codes and key combo conflicts.    
+     // version: 2.4.1   
+     !function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.keyboardJS=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+          var Keyboard=require("./lib/keyboard"),Locale=require("./lib/locale"),KeyCombo=require("./lib/key-combo"),keyboard=new Keyboard;keyboard.setLocale("us",require("./locales/us")),exports=module.exports=keyboard,exports.Keyboard=Keyboard,exports.Locale=Locale,exports.KeyCombo=KeyCombo;
+          },{"./lib/key-combo":2,"./lib/keyboard":3,"./lib/locale":4,"./locales/us":5}],2:[function(require,module,exports){
+          function KeyCombo(o){this.sourceStr=o,this.subCombos=KeyCombo.parseComboStr(o),this.keyNames=this.subCombos.reduce(function(o,e){return o.concat(e)},[])}KeyCombo.sequenceDeliminator=">>",KeyCombo.comboDeliminator=">",KeyCombo.keyDeliminator="+",KeyCombo.parseComboStr=function(o){for(var e=KeyCombo._splitStr(o,KeyCombo.comboDeliminator),t=[],r=0;r<e.length;r+=1)t.push(KeyCombo._splitStr(e[r],KeyCombo.keyDeliminator));return t},KeyCombo.prototype.check=function(o){for(var e=0,t=0;t<this.subCombos.length;t+=1)if(e=this._checkSubCombo(this.subCombos[t],e,o),-1===e)return!1;return!0},KeyCombo.prototype.isEqual=function(o){if(!o||"string"!=typeof o&&"object"!=typeof o)return!1;if("string"==typeof o&&(o=new KeyCombo(o)),this.subCombos.length!==o.subCombos.length)return!1;for(var e=0;e<this.subCombos.length;e+=1)if(this.subCombos[e].length!==o.subCombos[e].length)return!1;for(var e=0;e<this.subCombos.length;e+=1){for(var t=this.subCombos[e],r=o.subCombos[e].slice(0),s=0;s<t.length;s+=1){var i=t[s],n=r.indexOf(i);n>-1&&r.splice(n,1)}if(0!==r.length)return!1}return!0},KeyCombo._splitStr=function(o,e){for(var t=o,r=e,s="",i=[],n=0;n<t.length;n+=1)n>0&&t[n]===r&&"\\"!==t[n-1]&&(i.push(s.trim()),s="",n+=1),s+=t[n];return s&&i.push(s.trim()),i},KeyCombo.prototype._checkSubCombo=function(o,e,t){o=o.slice(0),t=t.slice(e);for(var r=e,s=0;s<o.length;s+=1){var i=o[s];if("\\"===i[0]){var n=i.slice(1);(n===KeyCombo.comboDeliminator||n===KeyCombo.keyDeliminator)&&(i=n)}var b=t.indexOf(i);if(b>-1&&(o.splice(s,1),s-=1,b>r&&(r=b),0===o.length))return r}return-1},module.exports=KeyCombo;
+          },{}],3:[function(require,module,exports){
+          (function (global){
+          function Keyboard(e,t,n,r){this._locale=null,this._currentContext=null,this._contexts={},this._listeners=[],this._appliedListeners=[],this._locales={},this._targetElement=null,this._targetWindow=null,this._targetPlatform="",this._targetUserAgent="",this._isModernBrowser=!1,this._targetKeyDownBinding=null,this._targetKeyUpBinding=null,this._targetResetBinding=null,this._paused=!1,this._callerHandler=null,this.setContext("global"),this.watch(e,t,n,r)}var Locale=require("./locale"),KeyCombo=require("./key-combo");Keyboard.prototype.setLocale=function(e,t){var n=null;"string"==typeof e?t?(n=new Locale(e),t(n,this._targetPlatform,this._targetUserAgent)):n=this._locales[e]||null:(n=e,e=n._localeName),this._locale=n,this._locales[e]=n,n&&(this._locale.pressedKeys=n.pressedKeys)},Keyboard.prototype.getLocale=function(e){return e||(e=this._locale.localeName),this._locales[e]||null},Keyboard.prototype.bind=function(e,t,n,r){if((null===e||"function"==typeof e)&&(r=n,n=t,t=e,e=null),e&&"object"==typeof e&&"number"==typeof e.length)for(var s=0;s<e.length;s+=1)this.bind(e[s],t,n);else this._listeners.push({keyCombo:e?new KeyCombo(e):null,pressHandler:t||null,releaseHandler:n||null,preventRepeat:r||!1,preventRepeatByDefault:r||!1})},Keyboard.prototype.addListener=Keyboard.prototype.bind,Keyboard.prototype.on=Keyboard.prototype.bind,Keyboard.prototype.unbind=function(e,t,n){if((null===e||"function"==typeof e)&&(n=t,t=e,e=null),e&&"object"==typeof e&&"number"==typeof e.length)for(var r=0;r<e.length;r+=1)this.unbind(e[r],t,n);else for(var r=0;r<this._listeners.length;r+=1){var s=this._listeners[r],o=!e&&!s.keyCombo||s.keyCombo&&s.keyCombo.isEqual(e),i=!t&&!n||!t&&!s.pressHandler||t===s.pressHandler,a=!t&&!n||!n&&!s.releaseHandler||n===s.releaseHandler;o&&i&&a&&(this._listeners.splice(r,1),r-=1)}},Keyboard.prototype.removeListener=Keyboard.prototype.unbind,Keyboard.prototype.off=Keyboard.prototype.unbind,Keyboard.prototype.setContext=function(e){this._locale&&this.releaseAllKeys(),this._contexts[e]||(this._contexts[e]=[]),this._listeners=this._contexts[e],this._currentContext=e},Keyboard.prototype.getContext=function(){return this._currentContext},Keyboard.prototype.withContext=function(e,t){var n=this.getContext();this.setContext(e),t(),this.setContext(n)},Keyboard.prototype.watch=function(e,t,n,r){var s=this;if(this.stop(),!e){if(!global.addEventListener&&!global.attachEvent)throw new Error("Cannot find global functions addEventListener or attachEvent.");e=global}if("number"==typeof e.nodeType&&(r=n,n=t,t=e,e=global),!e.addEventListener&&!e.attachEvent)throw new Error("Cannot find addEventListener or attachEvent methods on targetWindow.");this._isModernBrowser=!!e.addEventListener;var o=e.navigator&&e.navigator.userAgent||"",i=e.navigator&&e.navigator.platform||"";t&&null!==t||(t=e.document),n&&null!==n||(n=i),r&&null!==r||(r=o),this._targetKeyDownBinding=function(e){s.pressKey(e.keyCode,e),s._handleCommandBug(e,i)},this._targetKeyUpBinding=function(e){s.releaseKey(e.keyCode,e)},this._targetResetBinding=function(e){s.releaseAllKeys(e)},this._bindEvent(t,"keydown",this._targetKeyDownBinding),this._bindEvent(t,"keyup",this._targetKeyUpBinding),this._bindEvent(e,"focus",this._targetResetBinding),this._bindEvent(e,"blur",this._targetResetBinding),this._targetElement=t,this._targetWindow=e,this._targetPlatform=n,this._targetUserAgent=r},Keyboard.prototype.stop=function(){this._targetElement&&this._targetWindow&&(this._unbindEvent(this._targetElement,"keydown",this._targetKeyDownBinding),this._unbindEvent(this._targetElement,"keyup",this._targetKeyUpBinding),this._unbindEvent(this._targetWindow,"focus",this._targetResetBinding),this._unbindEvent(this._targetWindow,"blur",this._targetResetBinding),this._targetWindow=null,this._targetElement=null)},Keyboard.prototype.pressKey=function(e,t){if(!this._paused){if(!this._locale)throw new Error("Locale not set");this._locale.pressKey(e),this._applyBindings(t)}},Keyboard.prototype.releaseKey=function(e,t){if(!this._paused){if(!this._locale)throw new Error("Locale not set");this._locale.releaseKey(e),this._clearBindings(t)}},Keyboard.prototype.releaseAllKeys=function(e){if(!this._paused){if(!this._locale)throw new Error("Locale not set");this._locale.pressedKeys.length=0,this._clearBindings(e)}},Keyboard.prototype.pause=function(){this._paused||(this._locale&&this.releaseAllKeys(),this._paused=!0)},Keyboard.prototype.resume=function(){this._paused=!1},Keyboard.prototype.reset=function(){this.releaseAllKeys(),this._listeners.length=0},Keyboard.prototype._bindEvent=function(e,t,n){return this._isModernBrowser?e.addEventListener(t,n,!1):e.attachEvent("on"+t,n)},Keyboard.prototype._unbindEvent=function(e,t,n){return this._isModernBrowser?e.removeEventListener(t,n,!1):e.detachEvent("on"+t,n)},Keyboard.prototype._getGroupedListeners=function(){var e=[],t=[],n=this._listeners;return"global"!==this._currentContext&&(n=[].concat(n,this._contexts.global)),n.sort(function(e,t){return(t.keyCombo?t.keyCombo.keyNames.length:0)-(e.keyCombo?e.keyCombo.keyNames.length:0)}).forEach(function(n){for(var r=-1,s=0;s<t.length;s+=1)(null===t[s]&&null===n.keyCombo||null!==t[s]&&t[s].isEqual(n.keyCombo))&&(r=s);-1===r&&(r=t.length,t.push(n.keyCombo)),e[r]||(e[r]=[]),e[r].push(n)}),e},Keyboard.prototype._applyBindings=function(e){var t=!1;e||(e={}),e.preventRepeat=function(){t=!0},e.pressedKeys=this._locale.pressedKeys.slice(0);for(var n=this._locale.pressedKeys.slice(0),r=this._getGroupedListeners(),s=0;s<r.length;s+=1){var o=r[s],i=o[0].keyCombo;if(null===i||i.check(n)){for(var a=0;a<o.length;a+=1){var l=o[a];null===i&&(l={keyCombo:new KeyCombo(n.join("+")),pressHandler:l.pressHandler,releaseHandler:l.releaseHandler,preventRepeat:l.preventRepeat,preventRepeatByDefault:l.preventRepeatByDefault}),l.pressHandler&&!l.preventRepeat&&(l.pressHandler.call(this,e),t&&(l.preventRepeat=t,t=!1)),l.releaseHandler&&-1===this._appliedListeners.indexOf(l)&&this._appliedListeners.push(l)}if(i)for(var a=0;a<i.keyNames.length;a+=1){var d=n.indexOf(i.keyNames[a]);-1!==d&&(n.splice(d,1),a-=1)}}}},Keyboard.prototype._clearBindings=function(e){e||(e={});for(var t=0;t<this._appliedListeners.length;t+=1){var n=this._appliedListeners[t],r=n.keyCombo;if(null===r||!r.check(this._locale.pressedKeys)){if(this._callerHandler!==n.releaseHandler){var s=this._callerHandler;this._callerHandler=n.releaseHandler,n.preventRepeat=n.preventRepeatByDefault,n.releaseHandler.call(this,e),this._callerHandler=s}this._appliedListeners.splice(t,1),t-=1}}},Keyboard.prototype._handleCommandBug=function(e,t){var n=["shift","ctrl","alt","capslock","tab","command"];t.match("Mac")&&this._locale.pressedKeys.includes("command")&&!n.includes(this._locale.getKeyNames(e.keyCode)[0])&&this._targetKeyUpBinding(e)},module.exports=Keyboard;
+          }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+          },{"./key-combo":2,"./locale":4}],4:[function(require,module,exports){
+          function Locale(e){this.localeName=e,this.pressedKeys=[],this._appliedMacros=[],this._keyMap={},this._killKeyCodes=[],this._macros=[]}var KeyCombo=require("./key-combo");Locale.prototype.bindKeyCode=function(e,s){"string"==typeof s&&(s=[s]),this._keyMap[e]=s},Locale.prototype.bindMacro=function(e,s){"string"==typeof s&&(s=[s]);var t=null;"function"==typeof s&&(t=s,s=null);var o={keyCombo:new KeyCombo(e),keyNames:s,handler:t};this._macros.push(o)},Locale.prototype.getKeyCodes=function(e){var s=[];for(var t in this._keyMap){var o=this._keyMap[t].indexOf(e);o>-1&&s.push(0|t)}return s},Locale.prototype.getKeyNames=function(e){return this._keyMap[e]||[]},Locale.prototype.setKillKey=function(e){if("string"!=typeof e)this._killKeyCodes.push(e);else for(var s=this.getKeyCodes(e),t=0;t<s.length;t+=1)this.setKillKey(s[t])},Locale.prototype.pressKey=function(e){if("string"!=typeof e){for(var s=this.getKeyNames(e),t=0;t<s.length;t+=1)-1===this.pressedKeys.indexOf(s[t])&&this.pressedKeys.push(s[t]);this._applyMacros()}else for(var o=this.getKeyCodes(e),t=0;t<o.length;t+=1)this.pressKey(o[t])},Locale.prototype.releaseKey=function(e){if("string"==typeof e)for(var s=this.getKeyCodes(e),t=0;t<s.length;t+=1)this.releaseKey(s[t]);else{var o=this.getKeyNames(e),r=this._killKeyCodes.indexOf(e);if(r>-1)this.pressedKeys.length=0;else for(var t=0;t<o.length;t+=1){var i=this.pressedKeys.indexOf(o[t]);i>-1&&this.pressedKeys.splice(i,1)}this._clearMacros()}},Locale.prototype._applyMacros=function(){for(var e=this._macros.slice(0),s=0;s<e.length;s+=1){var t=e[s];if(t.keyCombo.check(this.pressedKeys)){t.handler&&(t.keyNames=t.handler(this.pressedKeys));for(var o=0;o<t.keyNames.length;o+=1)-1===this.pressedKeys.indexOf(t.keyNames[o])&&this.pressedKeys.push(t.keyNames[o]);this._appliedMacros.push(t)}}},Locale.prototype._clearMacros=function(){for(var e=0;e<this._appliedMacros.length;e+=1){var s=this._appliedMacros[e];if(!s.keyCombo.check(this.pressedKeys)){for(var t=0;t<s.keyNames.length;t+=1){var o=this.pressedKeys.indexOf(s.keyNames[t]);o>-1&&this.pressedKeys.splice(o,1)}s.handler&&(s.keyNames=null),this._appliedMacros.splice(e,1),e-=1}}},module.exports=Locale;
+          },{"./key-combo":2}],5:[function(require,module,exports){
+          module.exports=function(e,d,n){e.bindKeyCode(3,["cancel"]),e.bindKeyCode(8,["backspace"]),e.bindKeyCode(9,["tab"]),e.bindKeyCode(12,["clear"]),e.bindKeyCode(13,["enter"]),e.bindKeyCode(16,["shift"]),e.bindKeyCode(17,["ctrl"]),e.bindKeyCode(18,["alt","menu"]),e.bindKeyCode(19,["pause","break"]),e.bindKeyCode(20,["capslock"]),e.bindKeyCode(27,["escape","esc"]),e.bindKeyCode(32,["space","spacebar"]),e.bindKeyCode(33,["pageup"]),e.bindKeyCode(34,["pagedown"]),e.bindKeyCode(35,["end"]),e.bindKeyCode(36,["home"]),e.bindKeyCode(37,["left"]),e.bindKeyCode(38,["up"]),e.bindKeyCode(39,["right"]),e.bindKeyCode(40,["down"]),e.bindKeyCode(41,["select"]),e.bindKeyCode(42,["printscreen"]),e.bindKeyCode(43,["execute"]),e.bindKeyCode(44,["snapshot"]),e.bindKeyCode(45,["insert","ins"]),e.bindKeyCode(46,["delete","del"]),e.bindKeyCode(47,["help"]),e.bindKeyCode(145,["scrolllock","scroll"]),e.bindKeyCode(187,["equal","equalsign","="]),e.bindKeyCode(188,["comma",","]),e.bindKeyCode(190,["period","."]),e.bindKeyCode(191,["slash","forwardslash","/"]),e.bindKeyCode(192,["graveaccent","`"]),e.bindKeyCode(219,["openbracket","["]),e.bindKeyCode(220,["backslash","\\"]),e.bindKeyCode(221,["closebracket","]"]),e.bindKeyCode(222,["apostrophe","'"]),e.bindKeyCode(48,["zero","0"]),e.bindKeyCode(49,["one","1"]),e.bindKeyCode(50,["two","2"]),e.bindKeyCode(51,["three","3"]),e.bindKeyCode(52,["four","4"]),e.bindKeyCode(53,["five","5"]),e.bindKeyCode(54,["six","6"]),e.bindKeyCode(55,["seven","7"]),e.bindKeyCode(56,["eight","8"]),e.bindKeyCode(57,["nine","9"]),e.bindKeyCode(96,["numzero","num0"]),e.bindKeyCode(97,["numone","num1"]),e.bindKeyCode(98,["numtwo","num2"]),e.bindKeyCode(99,["numthree","num3"]),e.bindKeyCode(100,["numfour","num4"]),e.bindKeyCode(101,["numfive","num5"]),e.bindKeyCode(102,["numsix","num6"]),e.bindKeyCode(103,["numseven","num7"]),e.bindKeyCode(104,["numeight","num8"]),e.bindKeyCode(105,["numnine","num9"]),e.bindKeyCode(106,["nummultiply","num*"]),e.bindKeyCode(107,["numadd","num+"]),e.bindKeyCode(108,["numenter"]),e.bindKeyCode(109,["numsubtract","num-"]),e.bindKeyCode(110,["numdecimal","num."]),e.bindKeyCode(111,["numdivide","num/"]),e.bindKeyCode(144,["numlock","num"]),e.bindKeyCode(112,["f1"]),e.bindKeyCode(113,["f2"]),e.bindKeyCode(114,["f3"]),e.bindKeyCode(115,["f4"]),e.bindKeyCode(116,["f5"]),e.bindKeyCode(117,["f6"]),e.bindKeyCode(118,["f7"]),e.bindKeyCode(119,["f8"]),e.bindKeyCode(120,["f9"]),e.bindKeyCode(121,["f10"]),e.bindKeyCode(122,["f11"]),e.bindKeyCode(123,["f12"]),e.bindMacro("shift + `",["tilde","~"]),e.bindMacro("shift + 1",["exclamation","exclamationpoint","!"]),e.bindMacro("shift + 2",["at","@"]),e.bindMacro("shift + 3",["number","#"]),e.bindMacro("shift + 4",["dollar","dollars","dollarsign","$"]),e.bindMacro("shift + 5",["percent","%"]),e.bindMacro("shift + 6",["caret","^"]),e.bindMacro("shift + 7",["ampersand","and","&"]),e.bindMacro("shift + 8",["asterisk","*"]),e.bindMacro("shift + 9",["openparen","("]),e.bindMacro("shift + 0",["closeparen",")"]),e.bindMacro("shift + -",["underscore","_"]),e.bindMacro("shift + =",["plus","+"]),e.bindMacro("shift + [",["opencurlybrace","opencurlybracket","{"]),e.bindMacro("shift + ]",["closecurlybrace","closecurlybracket","}"]),e.bindMacro("shift + \\",["verticalbar","|"]),e.bindMacro("shift + ;",["colon",":"]),e.bindMacro("shift + '",["quotationmark","'"]),e.bindMacro("shift + !,",["openanglebracket","<"]),e.bindMacro("shift + .",["closeanglebracket",">"]),e.bindMacro("shift + /",["questionmark","?"]),d.match("Mac")?e.bindMacro("command",["mod","modifier"]):e.bindMacro("ctrl",["mod","modifier"]);for(var i=65;90>=i;i+=1){var o=String.fromCharCode(i+32),b=String.fromCharCode(i);e.bindKeyCode(i,o),e.bindMacro("shift + "+o,b),e.bindMacro("capslock + "+o,b)}var a,r,c=n.match("Firefox")?59:186,t=n.match("Firefox")?173:189;d.match("Mac")&&(n.match("Safari")||n.match("Chrome"))?(a=91,r=93):d.match("Mac")&&n.match("Opera")?(a=17,r=17):d.match("Mac")&&n.match("Firefox")&&(a=224,r=224),e.bindKeyCode(c,["semicolon",";"]),e.bindKeyCode(t,["dash","-"]),e.bindKeyCode(a,["command","windows","win","super","leftcommand","leftwindows","leftwin","leftsuper"]),e.bindKeyCode(r,["command","windows","win","super","rightcommand","rightwindows","rightwin","rightsuper"]),e.setKillKey("command")};
+          },{}]},{},[1])(1)
+    });
+
+    // OpenLayers Map
+    var map = OpenLayers.DLTS.pages[0];
+
+    // The nudge
+    var slideFactor = 75;
+
+    // up arrow (or i) - nudge up
+    keyboardJS.bind(['i', 'up'], function() {
+      map.pan(0, slideFactor);
+    });
+
+    // down arrow (or m) - nudge down
+    keyboardJS.bind(['m', 'down'], function() {
+      map.pan(0, -slideFactor);
+    });
+
+    // right arrow (or k) - nudge right
+    keyboardJS.bind(['k', 'right'], function() {
+      map.pan(-slideFactor, 0);
+    });
+
+    // left arrow (or j) - nudge left
+    keyboardJS.bind(['j', 'left'], function() {
+      map.pan(slideFactor, 0);
+    });
+
+    // shift + right (or shift + k) - load page to the right of this one (previous or next depending13 on language)
+    keyboardJS.bind(['shift + right', 'shift + k'], function() {
+      Y.one('a.pager-right').simulate("click");
+    });
+  
+    // shift + left (or shift + j) - load page to the left of this one (previous or next depending on language)
+    keyboardJS.bind(['shift + left', 'shift + j'], function() {
+      Y.one('a.pager-left').simulate("click");
+    });
+
+    function onHelp (event) {
     }
-    // Shift opptions
-    else {
-      switch(e.direction) {
-        case 'e':
-          Y.fire('openlayers:next', e);
-          break;
-        case 'w':
-          Y.fire('openlayers:previous', e);
-          break;          
+  
+    function onZoom (event) {
+      var maxZoom = event.map.resolutions.length - 1;
+      var zoomInButton = Y.one('#control-zoom-in .olButton');
+      var zoomOutButton = Y.one('#control-zoom-out .olButton');      
+      
+      // Check for zoom_out_max class
+      if (event.zoom <= 0) {
+        zoomOutButton.addClass('zoom_out_max');
+      }
+      else {
+        if (zoomOutButton.hasClass('zoom_out_max')) {
+          zoomOutButton.removeClass('zoom_out_max');
         }
+      }
+
+      // Check for zoom_in_max class
+      if (event.zoom >= maxZoom) {
+        zoomInButton.addClass('zoom_in_max');
+      }
+      else {
+        if (zoomInButton.hasClass('zoom_in_max')) {
+          zoomInButton.removeClass('zoom_in_max');
+        }
+      }
     }
-  } 
-  Y.on('arrow', move);
-});
\ No newline at end of file
+
+    // shift + up arrow (or shift + i) - zoom in one level
+    keyboardJS.bind(['shift + up', 'shift + i'], function() {
+      const afterZoom = parseInt(map.zoom + 1, 10);
+      map.zoomIn();
+      Y.fire('viewer:zoom', { map: map, dir: 'in', zoom: afterZoom });
+    });
+
+    // shift + down (or shift + m) - zoom out one level
+    keyboardJS.bind(['shift + down', 'shift + m'], function() {
+      const afterZoom = parseInt(map.zoom - 1, 10);
+      map.zoomOut();
+      Y.fire('viewer:zoom', { map: map, dir: 'out', zoom: afterZoom });
+    });
+
+    // 1 - zoom to fit in window
+    keyboardJS.bind(['1'], function() {
+      map.zoomTo(1);
+      Y.fire('viewer:zoom', map);
+    });
+
+    // / or ? - show/hide help
+    keyboardJS.bind(['/', '?'], function() {
+      Y.fire('toggle:help', map);
+    });
+
+    // / spacebar - show/hide metadata panel  
+    keyboardJS.bind(['spacebar'], function() {
+      Y.one('#button-metadata').simulate("click");    
+    });
+
+    Y.on('viewer:zoom', onZoom);
+
+    Y.on('toggle:help', onHelp);
+
+});
diff --git a/js/ui.map.components.yui.js b/js/ui.map.components.yui.js
index 3242cd34..b3bc98cb 100644
--- a/js/ui.map.components.yui.js
+++ b/js/ui.map.components.yui.js
@@ -97,6 +97,7 @@ YUI().use(
 
 
         function pjax_navigate(e) {
+            Y.one('body').addClass('openlayers-loading')
             var msg = e.url.replace(bookUrl, '' ).replace('/' , '');
             if (/(^[\d]+$){1}/.test(msg ) || /(^[\d]+-[\d]+$){1}/.test(msg)) {
                 this.one('.current_page').set('text', msg);
@@ -255,8 +256,8 @@ YUI().use(
         }
 
         function openLayersTilesLoading() {
-            if (Y.one('body').hasClass('openlayers-loading' )) {
-                Y.later(500, Y.one('.pane.load'), openLayersTilesLoading);
+            if (Y.one('body').hasClass('openlayers-loading')) {
+                Y.later(200, Y.one('.pane.load'), openLayersTilesLoading);
             }
             else {
                 Y.one('.pane.load').hide();
diff --git a/js/ui.photo.components.yui.js b/js/ui.photo.components.yui.js
index 6dfd397c..da10ca27 100644
--- a/js/ui.photo.components.yui.js
+++ b/js/ui.photo.components.yui.js
@@ -76,6 +76,7 @@ YUI().use(
 
 
         function pjax_navigate(e) {
+            Y.one('body').addClass('openlayers-loading')
             var msg = e.url.replace(photoUrl, '' ).replace('/' , '');
             if (/(^[\d]+$){1}/.test(msg ) || /(^[\d]+-[\d]+$){1}/.test(msg)) {
                 this.one('.current_page').set('text', msg);
@@ -236,16 +237,13 @@ YUI().use(
             Y.on('contentready', function() {
                 Y.CrossFrame.postMessage("parent", JSON.stringify({fire: 'openlayers:change', data: config }));
                 Y.fire('openlayers:change', config);
-                Y.later(1000, Y.one('.pane.load'), function() {
-                    this.hide();
-                });
             }, '#' + config.id);
         }
 
 
         function openLayersTilesLoading() {
-            if (Y.one('body').hasClass('openlayers-loading' )) {
-                Y.later(500, Y.one('.pane.load'), openLayersTilesLoading);
+            if (Y.one('body').hasClass('openlayers-loading')) {
+                Y.later(200, Y.one('.pane.load'), openLayersTilesLoading);
             }
             else {
                 Y.one('.pane.load').hide();
diff --git a/templates/components/component--slider.tpl.php b/templates/components/component--slider.tpl.php
index ebf6ea86..a026f8e0 100755
--- a/templates/components/component--slider.tpl.php
+++ b/templates/components/component--slider.tpl.php
@@ -1 +1 @@
-<span id="<?php print $slider_id ?>"></span> <form><input id="slider_value" value="<?php print $sequence_number ?>"/></form> <span>/</span> <span class="sequence_count"><?php print $sequence_count ?></span>
+<span id="<?php print $slider_id ?>" aria-hidden="true"></span> <span role="navigation"><form><input id="slider_value" value="<?php print $sequence_number ?>" aria-label="Page to jump to"></form> <span>/</span> <span class="sequence_count"><?php print $sequence_count ?></span></span>
diff --git a/templates/components/component--top.tpl.php b/templates/components/component--top.tpl.php
index a4d6e089..0ebf865a 100755
--- a/templates/components/component--top.tpl.php
+++ b/templates/components/component--top.tpl.php
@@ -1,4 +1,4 @@
-<div id="top" class="pane top">
+<div id="top" class="pane top" role="banner">
     <div class="views-u-1">
         <?php if ($is_admin && $messages) : ?>
             <?php print $messages; ?>
diff --git a/templates/display.tpl.php b/templates/display.tpl.php
index 22cf6b20..f9e47ccb 100755
--- a/templates/display.tpl.php
+++ b/templates/display.tpl.php
@@ -1,4 +1,3 @@
-<div id="pagemeta" class="pane pagemeta" dir="<?php print isset($lang_dir) ? $lang_dir : "ltr" ?>">
  <!-- Google Tag Manager (noscript) -->
 <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-TRVMLPF"
                   height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
@@ -14,5 +13,4 @@
     </<?php print $ds_content_wrapper ?>>
     <?php if (!empty($drupal_render_children)): ?>
         <?php print $drupal_render_children ?>
-    <?php endif; ?>
-</div>
+    <?php endif; ?>
\ No newline at end of file
diff --git a/templates/ds-1col--node-metadata.tpl.php b/templates/ds-1col--node-metadata.tpl.php
index 3d62b01e..10d3dd4a 100755
--- a/templates/ds-1col--node-metadata.tpl.php
+++ b/templates/ds-1col--node-metadata.tpl.php
@@ -1,7 +1,7 @@
-<div id="navbar" class="pane navbar">
+<div id="navbar" class="pane navbar"  role="navigation">
     <?php print $navbar ?>
 </div>
-<div id="main" class="pane main" dir="<?php print isset($lang_dir) ? $lang_dir : "ltr" ?>">
+<div role="main" id="main" class="pane main" dir="<?php print isset($lang_dir) ? $lang_dir : "ltr" ?>">
     <div id="pagemeta" class="pane pagemeta <?php echo ($pane_metadata_hidden) ? 'hidden' : '' ?>">
         <div class="container">
             <<?php print $ds_content_wrapper; print $layout_attributes; ?> class="<?php print $classes;?> " dir="<?php print isset($lang_dir) ? $lang_dir : "ltr" ?>" data-dir="<?php print isset($lang_dir) ? $lang_dir : "ltr" ?>" data-lang="<?php print isset($lang_language) ? $lang_language : "und" ?>" >
@@ -16,7 +16,7 @@
         <?php if (!empty($drupal_render_children)) : print $drupal_render_children; endif; ?>
     </div>
 </div>
-<div id="display" class="pane display"
+<div role="presentation" aria-hidden="true" id="display" class="pane display"
      data-url="<?php print $url ?>"
      data-identifier="<?php print $identifier ?>"
      data-sequence-count="<?php print $sequence_count ?>"
@@ -27,7 +27,7 @@
     <?php if (isset($button_previous)) print $button_previous; ?>
     <?php if (isset($button_next)) print $button_next;  ?>
 </div>
-<div class="pane load loading">
+<div class="pane load loading" role="presentation" aria-hidden="true">
     <?php if (isset($loading)) print $loading ; ?>
 </div>
 </div>
@@ -36,6 +36,6 @@
         <?php if (isset($slider)) : print $slider ; endif ; ?>
     </div>
 <?php endif; ?>
-<div id="thumbnails" class="views-g pane thumbnails hidden">
+<div role="presentation" id="thumbnails" class="views-g pane thumbnails hidden">
     <?php if (isset($thumbnails)) : print $thumbnails; endif; ?>
 </div>
diff --git a/templates/html.tpl.php b/templates/html.tpl.php
index 0cf0e100..e065a7b3 100755
--- a/templates/html.tpl.php
+++ b/templates/html.tpl.php
@@ -15,7 +15,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <base target="content-frame">
 </head>
-<body class="pane-body <?php echo $pane_metadata_hidden ?>">
+<body class="pane-body openlayers-loading <?php echo $pane_metadata_hidden ?>">
 <?php print $page_top ?>
 <?php print $page ?>
 <?php print $page_bottom ?>