diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6aad2099f3..99894aa1bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 -----
 
+## 0.2.8 (2018-07-28)
+
+#### Fixes
+- Fixed tabs on home page when using the split home layout ([#4764](https://github.com/pymedusa/Medusa/pull/4764))
+- Fixed black screen after update ([#4774](https://github.com/pymedusa/Medusa/pull/4774))
+- Fixed error when trying to rename episodes ([#4774](https://github.com/pymedusa/Medusa/pull/4774))
+
+-----
+
 ## 0.2.7 (2018-07-27)
 
 #### New Features
diff --git a/medusa/common.py b/medusa/common.py
index 38e9c351a3..159962c961 100644
--- a/medusa/common.py
+++ b/medusa/common.py
@@ -48,7 +48,7 @@
 # To enable, set SPOOF_USER_AGENT = True
 SPOOF_USER_AGENT = False
 INSTANCE_ID = str(uuid.uuid1())
-VERSION = '0.2.7'
+VERSION = '0.2.8'
 USER_AGENT = 'Medusa/{version} ({system}; {release}; {instance})'.format(
     version=VERSION, system=platform.system(), release=platform.release(),
     instance=INSTANCE_ID)
diff --git a/themes-default/slim/static/js/core.js b/themes-default/slim/static/js/core.js
index 14e169728c..62d8181b08 100644
--- a/themes-default/slim/static/js/core.js
+++ b/themes-default/slim/static/js/core.js
@@ -57,6 +57,8 @@ const UTIL = {
         UTIL.exec('common'); // Load common
         UTIL.exec(controller); // Load MEDUSA[controller]
         UTIL.exec(controller, action); // Load MEDUSA[controller][action]
+
+        window.dispatchEvent(new Event('medusa-loaded'));
     }
 };
 
diff --git a/themes-default/slim/views/home.mako b/themes-default/slim/views/home.mako
index b6388bd3f0..bc2a9144d0 100644
--- a/themes-default/slim/views/home.mako
+++ b/themes-default/slim/views/home.mako
@@ -11,35 +11,38 @@
 <%block name="scripts">
 <script>
 window.app = {};
-const startVue = () => {
-    window.app = new Vue({
-        store,
-        el: '#vue-wrap',
-        metaInfo: {
-            title: 'Home'
-        },
-        data() {
-            return {
-                header: 'Show List'
-            };
-        },
-        computed: Object.assign({
-            layout: {
-                get() {
-                    const { config } = this;
-                    return config.layout.home;
-                },
-                set(layout) {
-                    const { $store } = this;
-                    const page = 'home';
-                    $store.dispatch('setLayout', { page, layout });
-                }
+window.app = new Vue({
+    store,
+    el: '#vue-wrap',
+    metaInfo: {
+        title: 'Home'
+    },
+    data() {
+        return {
+            header: 'Show List'
+        };
+    },
+    computed: Object.assign({
+        layout: {
+            get() {
+                const { config } = this;
+                return config.layout.home;
+            },
+            set(layout) {
+                const { $store } = this;
+                const page = 'home';
+                $store.dispatch('setLayout', { page, layout });
             }
-        }),
-        mounted() {
         }
-    });
-};
+    }),
+    mounted() {
+        const postLoad = () => {
+            // Update VueInViewport
+            window.dispatchEvent(new Event('scroll'));
+        };
+        window.addEventListener('medusa-loaded', postLoad, { once: true });
+    }
+});
 </script>
 </%block>
 <%block name="metas">
diff --git a/themes-default/slim/views/layouts/main.mako b/themes-default/slim/views/layouts/main.mako
index ac26d44952..17f8470caf 100644
--- a/themes-default/slim/views/layouts/main.mako
+++ b/themes-default/slim/views/layouts/main.mako
@@ -115,18 +115,18 @@
 
         ## Add Vue component x-templates here
         ## @NOTE: These will be usable on all pages
-        <script src="js/lib/vue.js"></script>
-        <script src="js/lib/http-vue-loader.js"></script>
-        <script src="js/lib/vue-async-computed@3.3.0.js"></script>
-        <script src="js/lib/vue-in-viewport-mixin.min.js"></script>
-        <script src="js/lib/vue-router.min.js"></script>
-        <script src="js/lib/vue-meta.min.js"></script>
-        <script src="js/lib/vue-snotify.min.js"></script>
-        <script src="js/lib/vue-js-toggle-button.js"></script>
-        <script src="js/lib/vuex.js"></script>
-        <script src="js/lib/vue-native-websocket-2.0.7.js"></script>
-        <script src="js/notifications.js"></script>
-        <script src="js/store.js"></script>
+        <script src="js/lib/vue.js?${sbPID}"></script>
+        <script src="js/lib/http-vue-loader.js?${sbPID}"></script>
+        <script src="js/lib/vue-async-computed@3.3.0.js?${sbPID}"></script>
+        <script src="js/lib/vue-in-viewport-mixin.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-router.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-meta.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-snotify.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-js-toggle-button.js?${sbPID}"></script>
+        <script src="js/lib/vuex.js?${sbPID}"></script>
+        <script src="js/lib/vue-native-websocket-2.0.7.js?${sbPID}"></script>
+        <script src="js/notifications.js?${sbPID}"></script>
+        <script src="js/store.js?${sbPID}"></script>
         <script>
             Vue.component('app-header', httpVueLoader('js/templates/app-header.vue'));
             Vue.component('scroll-buttons', httpVueLoader('js/templates/scroll-buttons.vue'));
@@ -202,7 +202,7 @@
             }
         </script>
         <%block name="scripts" />
-        <script src="js/router.js"></script>
+        <script src="js/router.js?${sbPID}"></script>
         <script>
             if (!window.app) {
                 console.info('Loading Vue with router since window.app is missing.');
diff --git a/themes-default/slim/views/testRename.mako b/themes-default/slim/views/testRename.mako
index 0634c286d1..7d6b51410c 100644
--- a/themes-default/slim/views/testRename.mako
+++ b/themes-default/slim/views/testRename.mako
@@ -138,7 +138,7 @@ const startVue = () => {
     <tbody>
 <%
 odd = not odd
-epStr = str(cur_ep_obj.season) + "x" + str(cur_ep_obj.episode)
+epStr = 's{season}e{episode}'.format(season=cur_ep_obj.season, episode=cur_ep_obj.episode)
 epList = sorted([cur_ep_obj.episode] + [x.episode for x in cur_ep_obj.related_episodes])
 if len(epList) > 1:
     epList = [min(epList), max(epList)]
@@ -146,7 +146,7 @@ if len(epList) > 1:
         <tr class="season-${cur_season} ${'good' if curLoc == newLoc else 'wanted'} seasonstyle">
             <td class="col-checkbox">
             % if curLoc != newLoc:
-                <input type="checkbox" class="epCheck" id="${str(cur_ep_obj.season) + 'x' + str(cur_ep_obj.episode)}" name="${str(cur_ep_obj.season) + "x" + str(cur_ep_obj.episode)}" />
+                <input type="checkbox" class="epCheck" id="${epStr}" name="${epStr}" />
             % endif
             </td>
             <td align="center" valign="top" class="nowrap">${"-".join(map(str, epList))}</td>
diff --git a/themes/dark/assets/js/core.js b/themes/dark/assets/js/core.js
index 14e169728c..62d8181b08 100644
--- a/themes/dark/assets/js/core.js
+++ b/themes/dark/assets/js/core.js
@@ -57,6 +57,8 @@ const UTIL = {
         UTIL.exec('common'); // Load common
         UTIL.exec(controller); // Load MEDUSA[controller]
         UTIL.exec(controller, action); // Load MEDUSA[controller][action]
+
+        window.dispatchEvent(new Event('medusa-loaded'));
     }
 };
 
diff --git a/themes/dark/assets/js/core.js.map b/themes/dark/assets/js/core.js.map
index 461a3f65c1..6b04c115f7 100644
--- a/themes/dark/assets/js/core.js.map
+++ b/themes/dark/assets/js/core.js.map
@@ -1 +1 @@
-{"version":3,"names":[],"mappings":"","sources":["js/core.js"],"sourcesContent":["(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c=\"function\"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error(\"Cannot find module '\"+i+\"'\");throw a.code=\"MODULE_NOT_FOUND\",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u=\"function\"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){\n'use strict';\n\n// eslint-disable-line max-lines\n// @TODO Move these into common.ini when possible,\n//       currently we can't do that as browser.js and a few others need it before this is loaded\nvar topImageHtml = '<img src=\"images/top.gif\" width=\"31\" height=\"11\" alt=\"Jump to top\" />'; // eslint-disable-line no-unused-vars\nvar webRoot = $('body').attr('web-root');\nvar apiRoot = webRoot + '/api/v2/';\nvar apiKey = $('body').attr('api-key');\n\nvar MEDUSA = {\n    common: {},\n    config: {},\n    home: {},\n    manage: {},\n    history: {},\n    errorlogs: {},\n    schedule: {},\n    addShows: {}\n};\n\nvar UTIL = {\n    exec: function exec(controller, action) {\n        var ns = MEDUSA;\n        action = action === undefined ? 'init' : action;\n\n        if (controller !== '' && ns[controller] && typeof ns[controller][action] === 'function') {\n            ns[controller][action]();\n        }\n    },\n    init: function init() {\n        if (typeof startVue === 'function') {\n            // eslint-disable-line no-undef\n            startVue(); // eslint-disable-line no-undef\n        } else {\n            $('[v-cloak]').removeAttr('v-cloak');\n        }\n\n        var _document = document,\n            body = _document.body;\n\n        $('[asset]').each(function () {\n            var asset = $(this).attr('asset');\n            var series = $(this).attr('series');\n            var path = apiRoot + 'series/' + series + '/asset/' + asset + '?api_key=' + apiKey;\n            if (this.tagName.toLowerCase() === 'img') {\n                var defaultPath = $(this).attr('src');\n                if ($(this).attr('lazy') === 'on') {\n                    $(this).attr('data-original', path);\n                } else {\n                    $(this).attr('src', path);\n                }\n                $(this).attr('onerror', 'this.src = \"' + defaultPath + '\"; return false;');\n            }\n            if (this.tagName.toLowerCase() === 'a') {\n                $(this).attr('href', path);\n            }\n        });\n        var controller = body.getAttribute('data-controller');\n        var action = body.getAttribute('data-action');\n\n        UTIL.exec('common'); // Load common\n        UTIL.exec(controller); // Load MEDUSA[controller]\n        UTIL.exec(controller, action); // Load MEDUSA[controller][action]\n    }\n};\n\n$.fn.extend({\n    addRemoveWarningClass: function addRemoveWarningClass(_) {\n        if (_) {\n            return $(this).removeClass('warning');\n        }\n        return $(this).addClass('warning');\n    }\n});\n\nif (!document.location.pathname.endsWith('/login/')) {\n    api.get('config/main').then(function (response) {\n        log.setDefaultLevel('trace');\n        $.extend(MEDUSA.config, response.data);\n        MEDUSA.config.themeSpinner = MEDUSA.config.themeName === 'dark' ? '-dark' : '';\n        MEDUSA.config.loading = '<img src=\"images/loading16' + MEDUSA.config.themeSpinner + '.gif\" height=\"16\" width=\"16\" />';\n\n        if (navigator.userAgent.indexOf('PhantomJS') === -1) {\n            $(document).ready(UTIL.init);\n        }\n\n        MEDUSA.config.indexers.indexerIdToName = function (indexerId) {\n            if (!indexerId) {\n                return '';\n            }\n            return Object.keys(MEDUSA.config.indexers.config.indexers).filter(function (indexer) {\n                // eslint-disable-line array-callback-return\n                if (MEDUSA.config.indexers.config.indexers[indexer].id === parseInt(indexerId, 10)) {\n                    return MEDUSA.config.indexers.config.indexers[indexer].name;\n                }\n            })[0];\n        };\n\n        MEDUSA.config.indexers.nameToIndexerId = function (name) {\n            if (!name) {\n                return '';\n            }\n            return MEDUSA.config.indexers.config.indexers[name];\n        };\n    }).catch(function (error) {\n        log.error(error);\n        alert('Unable to connect to Medusa!'); // eslint-disable-line no-alert\n    });\n}\n\n},{}]},{},[1]);\n"],"file":"core.js"}
\ No newline at end of file
+{"version":3,"names":[],"mappings":"","sources":["js/core.js"],"sourcesContent":["(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c=\"function\"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error(\"Cannot find module '\"+i+\"'\");throw a.code=\"MODULE_NOT_FOUND\",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u=\"function\"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){\n'use strict';\n\n// eslint-disable-line max-lines\n// @TODO Move these into common.ini when possible,\n//       currently we can't do that as browser.js and a few others need it before this is loaded\nvar topImageHtml = '<img src=\"images/top.gif\" width=\"31\" height=\"11\" alt=\"Jump to top\" />'; // eslint-disable-line no-unused-vars\nvar webRoot = $('body').attr('web-root');\nvar apiRoot = webRoot + '/api/v2/';\nvar apiKey = $('body').attr('api-key');\n\nvar MEDUSA = {\n    common: {},\n    config: {},\n    home: {},\n    manage: {},\n    history: {},\n    errorlogs: {},\n    schedule: {},\n    addShows: {}\n};\n\nvar UTIL = {\n    exec: function exec(controller, action) {\n        var ns = MEDUSA;\n        action = action === undefined ? 'init' : action;\n\n        if (controller !== '' && ns[controller] && typeof ns[controller][action] === 'function') {\n            ns[controller][action]();\n        }\n    },\n    init: function init() {\n        if (typeof startVue === 'function') {\n            // eslint-disable-line no-undef\n            startVue(); // eslint-disable-line no-undef\n        } else {\n            $('[v-cloak]').removeAttr('v-cloak');\n        }\n\n        var _document = document,\n            body = _document.body;\n\n        $('[asset]').each(function () {\n            var asset = $(this).attr('asset');\n            var series = $(this).attr('series');\n            var path = apiRoot + 'series/' + series + '/asset/' + asset + '?api_key=' + apiKey;\n            if (this.tagName.toLowerCase() === 'img') {\n                var defaultPath = $(this).attr('src');\n                if ($(this).attr('lazy') === 'on') {\n                    $(this).attr('data-original', path);\n                } else {\n                    $(this).attr('src', path);\n                }\n                $(this).attr('onerror', 'this.src = \"' + defaultPath + '\"; return false;');\n            }\n            if (this.tagName.toLowerCase() === 'a') {\n                $(this).attr('href', path);\n            }\n        });\n        var controller = body.getAttribute('data-controller');\n        var action = body.getAttribute('data-action');\n\n        UTIL.exec('common'); // Load common\n        UTIL.exec(controller); // Load MEDUSA[controller]\n        UTIL.exec(controller, action); // Load MEDUSA[controller][action]\n\n        window.dispatchEvent(new Event('medusa-loaded'));\n    }\n};\n\n$.fn.extend({\n    addRemoveWarningClass: function addRemoveWarningClass(_) {\n        if (_) {\n            return $(this).removeClass('warning');\n        }\n        return $(this).addClass('warning');\n    }\n});\n\nif (!document.location.pathname.endsWith('/login/')) {\n    api.get('config/main').then(function (response) {\n        log.setDefaultLevel('trace');\n        $.extend(MEDUSA.config, response.data);\n        MEDUSA.config.themeSpinner = MEDUSA.config.themeName === 'dark' ? '-dark' : '';\n        MEDUSA.config.loading = '<img src=\"images/loading16' + MEDUSA.config.themeSpinner + '.gif\" height=\"16\" width=\"16\" />';\n\n        if (navigator.userAgent.indexOf('PhantomJS') === -1) {\n            $(document).ready(UTIL.init);\n        }\n\n        MEDUSA.config.indexers.indexerIdToName = function (indexerId) {\n            if (!indexerId) {\n                return '';\n            }\n            return Object.keys(MEDUSA.config.indexers.config.indexers).filter(function (indexer) {\n                // eslint-disable-line array-callback-return\n                if (MEDUSA.config.indexers.config.indexers[indexer].id === parseInt(indexerId, 10)) {\n                    return MEDUSA.config.indexers.config.indexers[indexer].name;\n                }\n            })[0];\n        };\n\n        MEDUSA.config.indexers.nameToIndexerId = function (name) {\n            if (!name) {\n                return '';\n            }\n            return MEDUSA.config.indexers.config.indexers[name];\n        };\n    }).catch(function (error) {\n        log.error(error);\n        alert('Unable to connect to Medusa!'); // eslint-disable-line no-alert\n    });\n}\n\n},{}]},{},[1]);\n"],"file":"core.js"}
\ No newline at end of file
diff --git a/themes/dark/templates/home.mako b/themes/dark/templates/home.mako
index b6388bd3f0..bc2a9144d0 100644
--- a/themes/dark/templates/home.mako
+++ b/themes/dark/templates/home.mako
@@ -11,35 +11,38 @@
 <%block name="scripts">
 <script>
 window.app = {};
-const startVue = () => {
-    window.app = new Vue({
-        store,
-        el: '#vue-wrap',
-        metaInfo: {
-            title: 'Home'
-        },
-        data() {
-            return {
-                header: 'Show List'
-            };
-        },
-        computed: Object.assign({
-            layout: {
-                get() {
-                    const { config } = this;
-                    return config.layout.home;
-                },
-                set(layout) {
-                    const { $store } = this;
-                    const page = 'home';
-                    $store.dispatch('setLayout', { page, layout });
-                }
+window.app = new Vue({
+    store,
+    el: '#vue-wrap',
+    metaInfo: {
+        title: 'Home'
+    },
+    data() {
+        return {
+            header: 'Show List'
+        };
+    },
+    computed: Object.assign({
+        layout: {
+            get() {
+                const { config } = this;
+                return config.layout.home;
+            },
+            set(layout) {
+                const { $store } = this;
+                const page = 'home';
+                $store.dispatch('setLayout', { page, layout });
             }
-        }),
-        mounted() {
         }
-    });
-};
+    }),
+    mounted() {
+        const postLoad = () => {
+            // Update VueInViewport
+            window.dispatchEvent(new Event('scroll'));
+        };
+        window.addEventListener('medusa-loaded', postLoad, { once: true });
+    }
+});
 </script>
 </%block>
 <%block name="metas">
diff --git a/themes/dark/templates/layouts/main.mako b/themes/dark/templates/layouts/main.mako
index ac26d44952..17f8470caf 100644
--- a/themes/dark/templates/layouts/main.mako
+++ b/themes/dark/templates/layouts/main.mako
@@ -115,18 +115,18 @@
 
         ## Add Vue component x-templates here
         ## @NOTE: These will be usable on all pages
-        <script src="js/lib/vue.js"></script>
-        <script src="js/lib/http-vue-loader.js"></script>
-        <script src="js/lib/vue-async-computed@3.3.0.js"></script>
-        <script src="js/lib/vue-in-viewport-mixin.min.js"></script>
-        <script src="js/lib/vue-router.min.js"></script>
-        <script src="js/lib/vue-meta.min.js"></script>
-        <script src="js/lib/vue-snotify.min.js"></script>
-        <script src="js/lib/vue-js-toggle-button.js"></script>
-        <script src="js/lib/vuex.js"></script>
-        <script src="js/lib/vue-native-websocket-2.0.7.js"></script>
-        <script src="js/notifications.js"></script>
-        <script src="js/store.js"></script>
+        <script src="js/lib/vue.js?${sbPID}"></script>
+        <script src="js/lib/http-vue-loader.js?${sbPID}"></script>
+        <script src="js/lib/vue-async-computed@3.3.0.js?${sbPID}"></script>
+        <script src="js/lib/vue-in-viewport-mixin.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-router.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-meta.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-snotify.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-js-toggle-button.js?${sbPID}"></script>
+        <script src="js/lib/vuex.js?${sbPID}"></script>
+        <script src="js/lib/vue-native-websocket-2.0.7.js?${sbPID}"></script>
+        <script src="js/notifications.js?${sbPID}"></script>
+        <script src="js/store.js?${sbPID}"></script>
         <script>
             Vue.component('app-header', httpVueLoader('js/templates/app-header.vue'));
             Vue.component('scroll-buttons', httpVueLoader('js/templates/scroll-buttons.vue'));
@@ -202,7 +202,7 @@
             }
         </script>
         <%block name="scripts" />
-        <script src="js/router.js"></script>
+        <script src="js/router.js?${sbPID}"></script>
         <script>
             if (!window.app) {
                 console.info('Loading Vue with router since window.app is missing.');
diff --git a/themes/dark/templates/testRename.mako b/themes/dark/templates/testRename.mako
index 0634c286d1..7d6b51410c 100644
--- a/themes/dark/templates/testRename.mako
+++ b/themes/dark/templates/testRename.mako
@@ -138,7 +138,7 @@ const startVue = () => {
     <tbody>
 <%
 odd = not odd
-epStr = str(cur_ep_obj.season) + "x" + str(cur_ep_obj.episode)
+epStr = 's{season}e{episode}'.format(season=cur_ep_obj.season, episode=cur_ep_obj.episode)
 epList = sorted([cur_ep_obj.episode] + [x.episode for x in cur_ep_obj.related_episodes])
 if len(epList) > 1:
     epList = [min(epList), max(epList)]
@@ -146,7 +146,7 @@ if len(epList) > 1:
         <tr class="season-${cur_season} ${'good' if curLoc == newLoc else 'wanted'} seasonstyle">
             <td class="col-checkbox">
             % if curLoc != newLoc:
-                <input type="checkbox" class="epCheck" id="${str(cur_ep_obj.season) + 'x' + str(cur_ep_obj.episode)}" name="${str(cur_ep_obj.season) + "x" + str(cur_ep_obj.episode)}" />
+                <input type="checkbox" class="epCheck" id="${epStr}" name="${epStr}" />
             % endif
             </td>
             <td align="center" valign="top" class="nowrap">${"-".join(map(str, epList))}</td>
diff --git a/themes/light/assets/js/core.js b/themes/light/assets/js/core.js
index 14e169728c..62d8181b08 100644
--- a/themes/light/assets/js/core.js
+++ b/themes/light/assets/js/core.js
@@ -57,6 +57,8 @@ const UTIL = {
         UTIL.exec('common'); // Load common
         UTIL.exec(controller); // Load MEDUSA[controller]
         UTIL.exec(controller, action); // Load MEDUSA[controller][action]
+
+        window.dispatchEvent(new Event('medusa-loaded'));
     }
 };
 
diff --git a/themes/light/assets/js/core.js.map b/themes/light/assets/js/core.js.map
index 461a3f65c1..6b04c115f7 100644
--- a/themes/light/assets/js/core.js.map
+++ b/themes/light/assets/js/core.js.map
@@ -1 +1 @@
-{"version":3,"names":[],"mappings":"","sources":["js/core.js"],"sourcesContent":["(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c=\"function\"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error(\"Cannot find module '\"+i+\"'\");throw a.code=\"MODULE_NOT_FOUND\",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u=\"function\"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){\n'use strict';\n\n// eslint-disable-line max-lines\n// @TODO Move these into common.ini when possible,\n//       currently we can't do that as browser.js and a few others need it before this is loaded\nvar topImageHtml = '<img src=\"images/top.gif\" width=\"31\" height=\"11\" alt=\"Jump to top\" />'; // eslint-disable-line no-unused-vars\nvar webRoot = $('body').attr('web-root');\nvar apiRoot = webRoot + '/api/v2/';\nvar apiKey = $('body').attr('api-key');\n\nvar MEDUSA = {\n    common: {},\n    config: {},\n    home: {},\n    manage: {},\n    history: {},\n    errorlogs: {},\n    schedule: {},\n    addShows: {}\n};\n\nvar UTIL = {\n    exec: function exec(controller, action) {\n        var ns = MEDUSA;\n        action = action === undefined ? 'init' : action;\n\n        if (controller !== '' && ns[controller] && typeof ns[controller][action] === 'function') {\n            ns[controller][action]();\n        }\n    },\n    init: function init() {\n        if (typeof startVue === 'function') {\n            // eslint-disable-line no-undef\n            startVue(); // eslint-disable-line no-undef\n        } else {\n            $('[v-cloak]').removeAttr('v-cloak');\n        }\n\n        var _document = document,\n            body = _document.body;\n\n        $('[asset]').each(function () {\n            var asset = $(this).attr('asset');\n            var series = $(this).attr('series');\n            var path = apiRoot + 'series/' + series + '/asset/' + asset + '?api_key=' + apiKey;\n            if (this.tagName.toLowerCase() === 'img') {\n                var defaultPath = $(this).attr('src');\n                if ($(this).attr('lazy') === 'on') {\n                    $(this).attr('data-original', path);\n                } else {\n                    $(this).attr('src', path);\n                }\n                $(this).attr('onerror', 'this.src = \"' + defaultPath + '\"; return false;');\n            }\n            if (this.tagName.toLowerCase() === 'a') {\n                $(this).attr('href', path);\n            }\n        });\n        var controller = body.getAttribute('data-controller');\n        var action = body.getAttribute('data-action');\n\n        UTIL.exec('common'); // Load common\n        UTIL.exec(controller); // Load MEDUSA[controller]\n        UTIL.exec(controller, action); // Load MEDUSA[controller][action]\n    }\n};\n\n$.fn.extend({\n    addRemoveWarningClass: function addRemoveWarningClass(_) {\n        if (_) {\n            return $(this).removeClass('warning');\n        }\n        return $(this).addClass('warning');\n    }\n});\n\nif (!document.location.pathname.endsWith('/login/')) {\n    api.get('config/main').then(function (response) {\n        log.setDefaultLevel('trace');\n        $.extend(MEDUSA.config, response.data);\n        MEDUSA.config.themeSpinner = MEDUSA.config.themeName === 'dark' ? '-dark' : '';\n        MEDUSA.config.loading = '<img src=\"images/loading16' + MEDUSA.config.themeSpinner + '.gif\" height=\"16\" width=\"16\" />';\n\n        if (navigator.userAgent.indexOf('PhantomJS') === -1) {\n            $(document).ready(UTIL.init);\n        }\n\n        MEDUSA.config.indexers.indexerIdToName = function (indexerId) {\n            if (!indexerId) {\n                return '';\n            }\n            return Object.keys(MEDUSA.config.indexers.config.indexers).filter(function (indexer) {\n                // eslint-disable-line array-callback-return\n                if (MEDUSA.config.indexers.config.indexers[indexer].id === parseInt(indexerId, 10)) {\n                    return MEDUSA.config.indexers.config.indexers[indexer].name;\n                }\n            })[0];\n        };\n\n        MEDUSA.config.indexers.nameToIndexerId = function (name) {\n            if (!name) {\n                return '';\n            }\n            return MEDUSA.config.indexers.config.indexers[name];\n        };\n    }).catch(function (error) {\n        log.error(error);\n        alert('Unable to connect to Medusa!'); // eslint-disable-line no-alert\n    });\n}\n\n},{}]},{},[1]);\n"],"file":"core.js"}
\ No newline at end of file
+{"version":3,"names":[],"mappings":"","sources":["js/core.js"],"sourcesContent":["(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c=\"function\"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error(\"Cannot find module '\"+i+\"'\");throw a.code=\"MODULE_NOT_FOUND\",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u=\"function\"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){\n'use strict';\n\n// eslint-disable-line max-lines\n// @TODO Move these into common.ini when possible,\n//       currently we can't do that as browser.js and a few others need it before this is loaded\nvar topImageHtml = '<img src=\"images/top.gif\" width=\"31\" height=\"11\" alt=\"Jump to top\" />'; // eslint-disable-line no-unused-vars\nvar webRoot = $('body').attr('web-root');\nvar apiRoot = webRoot + '/api/v2/';\nvar apiKey = $('body').attr('api-key');\n\nvar MEDUSA = {\n    common: {},\n    config: {},\n    home: {},\n    manage: {},\n    history: {},\n    errorlogs: {},\n    schedule: {},\n    addShows: {}\n};\n\nvar UTIL = {\n    exec: function exec(controller, action) {\n        var ns = MEDUSA;\n        action = action === undefined ? 'init' : action;\n\n        if (controller !== '' && ns[controller] && typeof ns[controller][action] === 'function') {\n            ns[controller][action]();\n        }\n    },\n    init: function init() {\n        if (typeof startVue === 'function') {\n            // eslint-disable-line no-undef\n            startVue(); // eslint-disable-line no-undef\n        } else {\n            $('[v-cloak]').removeAttr('v-cloak');\n        }\n\n        var _document = document,\n            body = _document.body;\n\n        $('[asset]').each(function () {\n            var asset = $(this).attr('asset');\n            var series = $(this).attr('series');\n            var path = apiRoot + 'series/' + series + '/asset/' + asset + '?api_key=' + apiKey;\n            if (this.tagName.toLowerCase() === 'img') {\n                var defaultPath = $(this).attr('src');\n                if ($(this).attr('lazy') === 'on') {\n                    $(this).attr('data-original', path);\n                } else {\n                    $(this).attr('src', path);\n                }\n                $(this).attr('onerror', 'this.src = \"' + defaultPath + '\"; return false;');\n            }\n            if (this.tagName.toLowerCase() === 'a') {\n                $(this).attr('href', path);\n            }\n        });\n        var controller = body.getAttribute('data-controller');\n        var action = body.getAttribute('data-action');\n\n        UTIL.exec('common'); // Load common\n        UTIL.exec(controller); // Load MEDUSA[controller]\n        UTIL.exec(controller, action); // Load MEDUSA[controller][action]\n\n        window.dispatchEvent(new Event('medusa-loaded'));\n    }\n};\n\n$.fn.extend({\n    addRemoveWarningClass: function addRemoveWarningClass(_) {\n        if (_) {\n            return $(this).removeClass('warning');\n        }\n        return $(this).addClass('warning');\n    }\n});\n\nif (!document.location.pathname.endsWith('/login/')) {\n    api.get('config/main').then(function (response) {\n        log.setDefaultLevel('trace');\n        $.extend(MEDUSA.config, response.data);\n        MEDUSA.config.themeSpinner = MEDUSA.config.themeName === 'dark' ? '-dark' : '';\n        MEDUSA.config.loading = '<img src=\"images/loading16' + MEDUSA.config.themeSpinner + '.gif\" height=\"16\" width=\"16\" />';\n\n        if (navigator.userAgent.indexOf('PhantomJS') === -1) {\n            $(document).ready(UTIL.init);\n        }\n\n        MEDUSA.config.indexers.indexerIdToName = function (indexerId) {\n            if (!indexerId) {\n                return '';\n            }\n            return Object.keys(MEDUSA.config.indexers.config.indexers).filter(function (indexer) {\n                // eslint-disable-line array-callback-return\n                if (MEDUSA.config.indexers.config.indexers[indexer].id === parseInt(indexerId, 10)) {\n                    return MEDUSA.config.indexers.config.indexers[indexer].name;\n                }\n            })[0];\n        };\n\n        MEDUSA.config.indexers.nameToIndexerId = function (name) {\n            if (!name) {\n                return '';\n            }\n            return MEDUSA.config.indexers.config.indexers[name];\n        };\n    }).catch(function (error) {\n        log.error(error);\n        alert('Unable to connect to Medusa!'); // eslint-disable-line no-alert\n    });\n}\n\n},{}]},{},[1]);\n"],"file":"core.js"}
\ No newline at end of file
diff --git a/themes/light/templates/home.mako b/themes/light/templates/home.mako
index b6388bd3f0..bc2a9144d0 100644
--- a/themes/light/templates/home.mako
+++ b/themes/light/templates/home.mako
@@ -11,35 +11,38 @@
 <%block name="scripts">
 <script>
 window.app = {};
-const startVue = () => {
-    window.app = new Vue({
-        store,
-        el: '#vue-wrap',
-        metaInfo: {
-            title: 'Home'
-        },
-        data() {
-            return {
-                header: 'Show List'
-            };
-        },
-        computed: Object.assign({
-            layout: {
-                get() {
-                    const { config } = this;
-                    return config.layout.home;
-                },
-                set(layout) {
-                    const { $store } = this;
-                    const page = 'home';
-                    $store.dispatch('setLayout', { page, layout });
-                }
+window.app = new Vue({
+    store,
+    el: '#vue-wrap',
+    metaInfo: {
+        title: 'Home'
+    },
+    data() {
+        return {
+            header: 'Show List'
+        };
+    },
+    computed: Object.assign({
+        layout: {
+            get() {
+                const { config } = this;
+                return config.layout.home;
+            },
+            set(layout) {
+                const { $store } = this;
+                const page = 'home';
+                $store.dispatch('setLayout', { page, layout });
             }
-        }),
-        mounted() {
         }
-    });
-};
+    }),
+    mounted() {
+        const postLoad = () => {
+            // Update VueInViewport
+            window.dispatchEvent(new Event('scroll'));
+        };
+        window.addEventListener('medusa-loaded', postLoad, { once: true });
+    }
+});
 </script>
 </%block>
 <%block name="metas">
diff --git a/themes/light/templates/layouts/main.mako b/themes/light/templates/layouts/main.mako
index ac26d44952..17f8470caf 100644
--- a/themes/light/templates/layouts/main.mako
+++ b/themes/light/templates/layouts/main.mako
@@ -115,18 +115,18 @@
 
         ## Add Vue component x-templates here
         ## @NOTE: These will be usable on all pages
-        <script src="js/lib/vue.js"></script>
-        <script src="js/lib/http-vue-loader.js"></script>
-        <script src="js/lib/vue-async-computed@3.3.0.js"></script>
-        <script src="js/lib/vue-in-viewport-mixin.min.js"></script>
-        <script src="js/lib/vue-router.min.js"></script>
-        <script src="js/lib/vue-meta.min.js"></script>
-        <script src="js/lib/vue-snotify.min.js"></script>
-        <script src="js/lib/vue-js-toggle-button.js"></script>
-        <script src="js/lib/vuex.js"></script>
-        <script src="js/lib/vue-native-websocket-2.0.7.js"></script>
-        <script src="js/notifications.js"></script>
-        <script src="js/store.js"></script>
+        <script src="js/lib/vue.js?${sbPID}"></script>
+        <script src="js/lib/http-vue-loader.js?${sbPID}"></script>
+        <script src="js/lib/vue-async-computed@3.3.0.js?${sbPID}"></script>
+        <script src="js/lib/vue-in-viewport-mixin.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-router.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-meta.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-snotify.min.js?${sbPID}"></script>
+        <script src="js/lib/vue-js-toggle-button.js?${sbPID}"></script>
+        <script src="js/lib/vuex.js?${sbPID}"></script>
+        <script src="js/lib/vue-native-websocket-2.0.7.js?${sbPID}"></script>
+        <script src="js/notifications.js?${sbPID}"></script>
+        <script src="js/store.js?${sbPID}"></script>
         <script>
             Vue.component('app-header', httpVueLoader('js/templates/app-header.vue'));
             Vue.component('scroll-buttons', httpVueLoader('js/templates/scroll-buttons.vue'));
@@ -202,7 +202,7 @@
             }
         </script>
         <%block name="scripts" />
-        <script src="js/router.js"></script>
+        <script src="js/router.js?${sbPID}"></script>
         <script>
             if (!window.app) {
                 console.info('Loading Vue with router since window.app is missing.');
diff --git a/themes/light/templates/testRename.mako b/themes/light/templates/testRename.mako
index 0634c286d1..7d6b51410c 100644
--- a/themes/light/templates/testRename.mako
+++ b/themes/light/templates/testRename.mako
@@ -138,7 +138,7 @@ const startVue = () => {
     <tbody>
 <%
 odd = not odd
-epStr = str(cur_ep_obj.season) + "x" + str(cur_ep_obj.episode)
+epStr = 's{season}e{episode}'.format(season=cur_ep_obj.season, episode=cur_ep_obj.episode)
 epList = sorted([cur_ep_obj.episode] + [x.episode for x in cur_ep_obj.related_episodes])
 if len(epList) > 1:
     epList = [min(epList), max(epList)]
@@ -146,7 +146,7 @@ if len(epList) > 1:
         <tr class="season-${cur_season} ${'good' if curLoc == newLoc else 'wanted'} seasonstyle">
             <td class="col-checkbox">
             % if curLoc != newLoc:
-                <input type="checkbox" class="epCheck" id="${str(cur_ep_obj.season) + 'x' + str(cur_ep_obj.episode)}" name="${str(cur_ep_obj.season) + "x" + str(cur_ep_obj.episode)}" />
+                <input type="checkbox" class="epCheck" id="${epStr}" name="${epStr}" />
             % endif
             </td>
             <td align="center" valign="top" class="nowrap">${"-".join(map(str, epList))}</td>