diff --git a/modules/bundle.js b/modules/bundle.js
index 24e246f..717231c 100644
--- a/modules/bundle.js
+++ b/modules/bundle.js
@@ -119,6 +119,20 @@ class bundleClass {
         }
     }
 
+    getSlideData(uuid) {
+        let slideData = {};
+
+        for (let slide of this.allSlides) {
+            if (slide.uuid === uuid) {
+                slideData = {
+                    settings: slide,
+                    render: fs.readFileSync("./data/bundles/" + this.name + "/slides/" + slide.uuid + ".png")
+                };
+                return slide;
+            }
+        }
+    }
+
     save() {
         this.sync();
         try {
diff --git a/public/js/display.js b/public/js/display.js
index 9f04163..c17f5fa 100644
--- a/public/js/display.js
+++ b/public/js/display.js
@@ -279,7 +279,7 @@ function nextSlide(data) {
 }
 
 function setBackground(background) {
-    background = "/background/" + background;
+    background = encodeURI("/background/" + background);
     if (serverOptions.isStreaming) return;
 
     var video = document.getElementById("bgvid");
diff --git a/views/admin/dashboard.twig b/views/admin/dashboard.twig
index 75a64f0..cfd772e 100644
--- a/views/admin/dashboard.twig
+++ b/views/admin/dashboard.twig
@@ -213,7 +213,7 @@
             },
             methods: {
                 editBundleProperties: function (bundle) {
-                    window.open("/admin/edit/bundleProperties?bundle=" + bundleName, '_blank', 'width=400,height=800,scrollbars=yes,status=no,location=no');
+                    window.open("/admin/edit/bundleProperties?bundle=" + bundle, '_blank', 'width=400,height=800,scrollbars=yes,status=no,location=no');
                 },
                 editBundleSlides: function (name) {
                     window.open("/admin/edit/bundleSlides?bundle=" + name, '_blank', 'width=400,height=800,scrollbars=yes,status=no,location=no');