diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 187226272..7fbd5243c 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -202,7 +202,7 @@ def clean_tags(text):
     """
     Remove Tags from text for display
     """
-    text = text.replace(u'<br />', u'\n')
+    text = text.replace(u'<br>', u'\n')
     text = text.replace(u'{br}', u'\n')
     text = text.replace(u'&nbsp;', u' ')
     for tag in DisplayTags.get_html_tags():
diff --git a/openlp/core/lib/displaytags.py b/openlp/core/lib/displaytags.py
index addab4d75..95ce13bda 100644
--- a/openlp/core/lib/displaytags.py
+++ b/openlp/core/lib/displaytags.py
@@ -111,7 +111,7 @@ class DisplayTags(object):
             u'start html': u'<span style="text-decoration: underline;">',
             u'end tag': u'{/u}', u'end html': u'</span>', u'protected': True})
         base_tags.append({u'desc': translate('OpenLP.DisplayTags', 'Break'),
-            u'start tag': u'{br}', u'start html': u'<br />', u'end tag': u'',
+            u'start tag': u'{br}', u'start html': u'<br>', u'end tag': u'',
             u'end html': u'', u'protected': True})
         DisplayTags.add_html_tags(base_tags)
 
diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index 1f50e0d65..295a6c1ad 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -35,8 +35,10 @@ from openlp.core.lib.theme import BackgroundType, BackgroundGradientType, \
 log = logging.getLogger(__name__)
 
 HTMLSRC = u"""
+<!DOCTYPE html>
 <html>
 <head>
+<meta charset="UTF-8">
 <title>OpenLP Display</title>
 <style>
 *{
@@ -93,7 +95,7 @@ sup {
     top:-0.3em;
 }
 </style>
-<script language="javascript">
+<script>
     var timer = null;
     var video_timer = null;
     var current_video = '1';
@@ -317,10 +319,10 @@ sup {
 %s
 <div id="footer" class="footer"></div>
 <div id="black" class="size"></div>
-<div id="alert" style="visibility:hidden;"></div>
+<div id="alert" style="visibility:hidden"></div>
 </body>
 </html>
-    """
+"""
 
 def build_html(item, screen, alert, islive, background, image=None):
     """
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 4f4a3e4c9..c6cfa2717 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -46,6 +46,28 @@ VERSE = u'The Lord said to {r}Noah{/r}: \n' \
     'r{/pk}{o}e{/o}{pp}n{/pp} of the Lord\n'
 FOOTER = [u'Arky Arky (Unknown)', u'Public Domain', u'CCLI 123456']
 
+HTML_START = u"""
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <style>
+        *{
+            margin: 0;
+            padding: 0;
+            border: 0;
+        }
+        #main {
+            position: absolute;
+            top: 0px;
+            %s %s
+        }
+    </style>
+</head>
+<body>
+    <div id="main">
+"""
+
 HTML_END = u'</div></body></html>'
 
 class Renderer(object):
@@ -219,7 +241,7 @@ class Renderer(object):
         """
         log.debug(u'format slide')
         # Add line endings after each line of text used for bibles.
-        line_end = u'<br />'
+        line_end = u'<br>'
         if item.is_capable(ItemCapabilities.NoLineBreaks):
             line_end = u' '
         # Bibles
@@ -240,8 +262,8 @@ class Renderer(object):
                         pages.extend(self._paginate_slide(lines, line_end))
         new_pages = []
         for page in pages:
-            while page.endswith(u'<br />'):
-                page = page[:-6]
+            while page.endswith(u'<br>'):
+                page = page[:-4]
             new_pages.append(page)
         return new_pages
 
@@ -310,10 +332,7 @@ class Renderer(object):
         self.web.resize(self.page_width, self.page_height)
         self.web_frame = self.web.page().mainFrame()
         # Adjust width and height to account for shadow. outline done in css
-        self.page_shell = u'<html><head><style>' \
-            u'*{margin: 0; padding: 0; border: 0;} '\
-            u'#main {position:absolute; top:0px; %s %s}</style></head><body>' \
-            u'<div id="main">' % \
+        self.page_shell = HTML_START % \
             (build_lyrics_format_css(self.theme_data, self.page_width,
             self.page_height), build_lyrics_outline_css(self.theme_data))
 
@@ -326,13 +345,13 @@ class Renderer(object):
             The text to be fitted on the slide split into lines.
 
         ``line_end``
-            The text added after each line. Either ``u' '`` or ``u'<br />``.
+            The text added after each line. Either ``u' '`` or ``u'<br>``.
         """
         log.debug(u'_paginate_slide - Start')
         formatted = []
         previous_html = u''
         previous_raw = u''
-        separator = u'<br />'
+        separator = u'<br>'
         html_lines = map(expand_tags, lines)
         html = self.page_shell + separator.join(html_lines) + HTML_END
         self.web.setHtml(html)
@@ -357,7 +376,7 @@ class Renderer(object):
             The words to be fitted on the slide split into lines.
 
         ``line_end``
-            The text added after each line. Either ``u' '`` or ``u'<br />``.
+            The text added after each line. Either ``u' '`` or ``u'<br>``.
             This is needed for bibles.
         """
         log.debug(u'_paginate_slide_words - Start')
@@ -434,12 +453,12 @@ class Renderer(object):
             using the binary chop. The elements can contain display tags.
 
         ``separator``
-            The separator for the elements. For lines this is ``u'<br />'`` and
+            The separator for the elements. For lines this is ``u'<br>'`` and
             for words this is ``u' '``.
 
         ``line_end``
             The text added after each "element line". Either ``u' '`` or
-            ``u'<br />``. This is needed for bibles.
+            ``u'<br>``. This is needed for bibles.
         """
         smallest_index = 0
         highest_index = len(html_list) - 1
@@ -459,7 +478,7 @@ class Renderer(object):
             # We found the number of words which will fit.
             if smallest_index == index or highest_index == index:
                 index = smallest_index
-                formatted.append(previous_raw.rstrip(u'<br />') +
+                formatted.append(previous_raw.rstrip(u'<br>') +
                     separator.join(raw_list[:index + 1]))
                 previous_html = u''
                 previous_raw = u''
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 52d5e8e13..e8131cada 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -174,7 +174,7 @@ class ServiceItem(object):
             for slide in self._raw_frames:
                 pages = self.renderer.format_slide(slide[u'raw_slide'], self)
                 for page in pages:
-                    page = page.replace(u'<br />', u'{br}')
+                    page = page.replace(u'<br>', u'{br}')
                     html = expand_tags(cgi.escape(page.rstrip()))
                     self._display_frames.append({
                         u'title': clean_tags(page),
@@ -194,7 +194,7 @@ class ServiceItem(object):
         if self.raw_footer is None:
             self.raw_footer = []
         self.foot_text = \
-            u'<br />'.join([footer for footer in self.raw_footer if footer])
+            u'<br>'.join([footer for footer in self.raw_footer if footer])
 
     def add_from_image(self, path, title):
         """
@@ -462,7 +462,7 @@ class ServiceItem(object):
         elif not start and end:
             return end
         else:
-            return u'%s <br />%s' % (start, end)
+            return u'%s <br>%s' % (start, end)
 
     def update_theme(self, theme):
         """
diff --git a/openlp/core/ui/printserviceform.py b/openlp/core/ui/printserviceform.py
index 2bbf2ab56..f50237619 100644
--- a/openlp/core/ui/printserviceform.py
+++ b/openlp/core/ui/printserviceform.py
@@ -240,7 +240,7 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
                     translate('OpenLP.ServiceManager', 'Notes: '), p,
                     classId=u'itemNotesTitle')
                 notes = self._addElement(u'span',
-                    item.notes.replace(u'\n', u'<br />'), p,
+                    item.notes.replace(u'\n', u'<br>'), p,
                     classId=u'itemNotesText')
         # Add play length of media files.
         if item.is_media() and self.metaDataCheckBox.isChecked():
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index f6c069525..2d695c852 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -968,7 +968,7 @@ class ServiceManager(QtGui.QWidget):
             if item[u'service_item'] \
                 .is_capable(ItemCapabilities.AllowsVariableStartTime):
                 tips.append(item[u'service_item'].get_media_time())
-            treewidgetitem.setToolTip(0, u'<br />'.join(tips))
+            treewidgetitem.setToolTip(0, u'<br>'.join(tips))
             treewidgetitem.setData(0, QtCore.Qt.UserRole,
                 QtCore.QVariant(item[u'order']))
             treewidgetitem.setSelected(item[u'selected'])
