diff --git a/openlp/core/display/html/display.js b/openlp/core/display/html/display.js
index aafdf7cb3..c684e3e0d 100644
--- a/openlp/core/display/html/display.js
+++ b/openlp/core/display/html/display.js
@@ -295,7 +295,7 @@ var Display = {
    * Checks if the present slide content fits within the slide
   */
   doesContentFit: function () {
-    console.debug("scrollHeight: " + $(".slides")[0].scrollHeight);
+    console.debug("scrollHeight: " + $(".slides")[0].scrollHeight + ", clientHeight: " + $(".slides")[0].clientHeight);
     return $(".slides")[0].clientHeight >= $(".slides")[0].scrollHeight;
   },
   /**
diff --git a/openlp/core/display/render.py b/openlp/core/display/render.py
index 98e91c097..7f6967183 100644
--- a/openlp/core/display/render.py
+++ b/openlp/core/display/render.py
@@ -437,8 +437,8 @@ class Renderer(RegistryBase, LogMixin, RegistryProperties, DisplayWindow):
         self.force_page = False
         for screen in ScreenList():
             if screen.is_display:
-                self.setGeometry(screen.geometry.x(), screen.geometry.y(),
-                                 screen.geometry.width(), screen.geometry.height())
+                self.setGeometry(screen.display_geometry.x(), screen.display_geometry.y(),
+                                 screen.display_geometry.width(), screen.display_geometry.height())
                 break
         # If the display is not show'ed and hidden like this webegine will not render
         self.show()
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index f928f6ecd..b8eede13c 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -164,25 +164,28 @@ class ServiceItem(RegistryProperties):
         # Save rendered pages to this dict. In the case that a slide is used twice we can use the pages saved to
         # the dict instead of rendering them again.
         previous_pages = {}
-        for index, raw_slide in enumerate(self.slides):
+        index = 0
+        for raw_slide in self.slides:
             verse_tag = raw_slide['verse']
-            if verse_tag in previous_pages and previous_pages[verse_tag][1] == raw_slide:
-                page = previous_pages[verse_tag][1]
+            if verse_tag in previous_pages and previous_pages[verse_tag][0] == raw_slide:
+                pages = previous_pages[verse_tag][1]
             else:
-                page = render_tags(raw_slide['text'], self)
-                previous_pages[verse_tag] = (raw_slide, page)
-            rendered_slide = {
-                'title': raw_slide['title'],
-                'text': page,
-                'verse': index,
-            }
-            self._rendered_slides.append(rendered_slide)
-            display_slide = {
-                'title': raw_slide['title'],
-                'text': remove_tags(page),
-                'verse': verse_tag,
-            }
-            self._display_slides.append(display_slide)
+                pages = self.renderer.format_slide(raw_slide['text'], self)
+                previous_pages[verse_tag] = (raw_slide, pages)
+            for page in pages:
+                rendered_slide = {
+                    'title': raw_slide['title'],
+                    'text': render_tags(page),
+                    'verse': index,
+                }
+                self._rendered_slides.append(rendered_slide)
+                display_slide = {
+                    'title': raw_slide['title'],
+                    'text': remove_tags(page),
+                    'verse': verse_tag,
+                }
+                self._display_slides.append(display_slide)
+                index += 1
 
     @property
     def rendered_slides(self):
diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py
index 17a1c05fe..57a680f6b 100644
--- a/openlp/core/ui/settingsform.py
+++ b/openlp/core/ui/settingsform.py
@@ -79,7 +79,7 @@ class SettingsForm(QtWidgets.QDialog, Ui_SettingsDialog, RegistryProperties):
         self.insert_tab(self.screens_tab)
         self.insert_tab(self.themes_tab)
         self.insert_tab(self.advanced_tab)
-        self.insert_tab(self.player_tab)
+        #self.insert_tab(self.player_tab)
         self.insert_tab(self.projector_tab)
         self.insert_tab(self.api_tab)
         for plugin in State().list_plugins():