diff --git a/_includes/recline-deps.html b/_includes/recline-deps.html
index 2ae67399..fb77d16b 100644
--- a/_includes/recline-deps.html
+++ b/_includes/recline-deps.html
@@ -48,6 +48,7 @@
   <script type="text/javascript" src="{{page.root}}vendor/timeline/js/timeline.js"></script>
 
   <script type="text/javascript" src="{{page.root}}node_modules/intl-messageformat/dist/intl-messageformat-with-locales.min.js"></script>
+  <script type="text/javascript" src="{{page.root}}vendor/common-intl-wmustache.js"></script>
 
   <!--[if lte IE 7]>
   <script language="javascript" type="text/javascript" src="{{page.root}}vendor/json/json2.js"></script>
@@ -69,7 +70,6 @@
   <script type="text/javascript" src="http://okfnlabs.org/csv.js/csv.js"></script>
 
   <!-- views -->
-  <script type="text/javascript" src="{{page.root}}src/i18n/view.i18n.js"></script>
   <script type="text/javascript" src="{{page.root}}src/i18n/en.js"></script>
   <script type="text/javascript" src="{{page.root}}src/i18n/pl.js"></script>
   <script type="text/javascript" src="{{page.root}}src/view.grid.js"></script>
diff --git a/demos/multiview/app.js b/demos/multiview/app.js
index c50980ea..e905ae92 100755
--- a/demos/multiview/app.js
+++ b/demos/multiview/app.js
@@ -64,10 +64,11 @@ var createMultiView = function(dataset, state) {
   $el.appendTo(window.explorerDiv);
 
   // customize the subviews for the MultiView
+  var fmt = I18nMessages('recline', recline.View.translations);
   var views = [
     {
       id: 'grid',
-      label: 'Grid',
+      label: fmt.t('Grid'),
       view: new recline.View.SlickGrid({
         model: dataset,
         state: {
@@ -91,14 +92,14 @@ var createMultiView = function(dataset, state) {
     },
     {
       id: 'graph',
-      label: 'Graph',
+      label: fmt.t('Graph'),
       view: new recline.View.Graph({
         model: dataset
       })
     },
     {
       id: 'map',
-      label: 'Map',
+      label: fmt.t('Map'),
       view: new recline.View.Map({
         model: dataset
       })
diff --git a/test/index.html b/test/index.html
index 83fc10da..d260afa8 100644
--- a/test/index.html
+++ b/test/index.html
@@ -35,7 +35,7 @@
   <script type="text/javascript" src="../vendor/timeline/js/timeline.js"></script>
 
   <script type="text/javascript" src="../node_modules/intl-messageformat/dist/intl-messageformat-with-locales.min.js"></script>
-  <script type="module" src="../node_modules/intl-format-cache/lib/memoizer.js"></script>
+  <script type="text/javascript" src="../vendor/common-intl-wmustache.js"></script>
 
   <!--[if lte IE 7]>
   <script language="javascript" type="text/javascript" src="../vendor/json/json2.js"></script>
@@ -59,7 +59,6 @@
   <script type="text/javascript" src="backend.dataproxy.test.js"></script>
 
   <!-- views and view tests -->
-  <script type="text/javascript" src="../src/i18n/view.i18n.js"></script>
   <script type="text/javascript" src="../src/i18n/en.js"></script>
   <script type="text/javascript" src="../src/i18n/pl.js"></script>
   <script type="text/javascript" src="../src/view.grid.js"></script>
diff --git a/src/i18n/view.i18n.js b/vendor/common-intl-wmustache.js
similarity index 96%
rename from src/i18n/view.i18n.js
rename to vendor/common-intl-wmustache.js
index 15b4665b..5add2899 100644
--- a/src/i18n/view.i18n.js
+++ b/vendor/common-intl-wmustache.js
@@ -1,5 +1,8 @@
-/*jshint multistr:true */
-
+/**
+ *  Copyright (c) 2016 Krzysztof Madejski
+ *
+ * This code is licensed under GPL v3 http://choosealicense.com/licenses/gpl-3.0/
+ */
 "use strict";
 var I18nMessages = function(libraryID, translations, languageResolverOrLocale, appHardcodedLocale) {
     if (typeof this === 'undefined') {