diff --git a/src/views/conference/2018/index/index.jsx b/src/views/conference/2018/index/index.jsx
index 554bcaa9a..0e7272ac3 100644
--- a/src/views/conference/2018/index/index.jsx
+++ b/src/views/conference/2018/index/index.jsx
@@ -1,6 +1,5 @@
 var FormattedDate = require('react-intl').FormattedDate;
 var FormattedMessage = require('react-intl').FormattedMessage;
-var FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage;
 var React = require('react');
 var render = require('../../../../lib/render.jsx');
 
@@ -21,7 +20,9 @@ var ConferenceSplash = React.createClass({
                     <div className='title-banner-image mod-2018'></div>
                     <h1 className='title-banner-h1 mod-2018'>
                         <center>
-                          <FormattedHTMLMessage id='conference-2018.title' />
+                            <FormattedMessage id='conference-2018.title' />
+                            <br />
+                            <FormattedMessage id='conference-2018.subtitle' />
                         </center>
                     </h1>
                     <h3 className='title-banner-h3 mod-2018'>
@@ -31,7 +32,10 @@ var ConferenceSplash = React.createClass({
                 <div className='inner'>
                     <section className='conf2018-panel mod-desc'>
                         <p className='conf2018-panel-desc'>
-                            <FormattedHTMLMessage id='conference-2018.desc' />
+                            <FormattedMessage id='conference-2018.desc1' />
+                            <br />
+                            <br />
+                            <FormattedMessage id='conference-2018.desc2' />
                         </p>
                         <table className='conf2018-panel-details'>
                             <tbody>
@@ -77,20 +81,31 @@ var ConferenceSplash = React.createClass({
                     </section>
                     <section className='conf2018-panel'>
                         <p className='conf2018-panel-desc'>
-                            <FormattedHTMLMessage id='conference-2018.sessionDesc' />
+                            <FormattedMessage id='conference-2018.sessionDesc' />
                         </p>
                         <p className='conf2018-panel-session'>
                             <p className='conf2018-panel-session'>
-                                <FormattedHTMLMessage id='conference-2018.sessionItem1' />
+                                <b>
+                                    <FormattedMessage id='conference-2018.sessionItem1Title' />
+                                </b>{' '}
+                                <FormattedMessage id='conference-2018.sessionItem1Desc' />
                             </p>
                             <p className='conf2018-panel-session'>
-                                <FormattedHTMLMessage id='conference-2018.sessionItem2' />
+                                <b>
+                                    <FormattedMessage id='conference-2018.sessionItem2Title' />
+                                </b>{' '}
+                                <FormattedMessage id='conference-2018.sessionItem2Desc' />
                             </p>
                             <p className='conf2018-panel-session'>
-                                <FormattedHTMLMessage id='conference-2018.sessionItem3' />
-                            </p>
+                                <b>
+                                    <FormattedMessage id='conference-2018.sessionItem3Title' />
+                                </b>{' '}
+                                <FormattedMessage id='conference-2018.sessionItem3Desc' />                            </p>
                             <p className='conf2018-panel-session'>
-                                <FormattedHTMLMessage id='conference-2018.sessionItem4' />
+                                <b>
+                                    <FormattedMessage id='conference-2018.sessionItem4Title' />
+                                </b>{' '}
+                                <FormattedMessage id='conference-2018.sessionItem4Desc' />
                             </p>
                         </p>
                         <a className='button mod-2018-panel' href='https://docs.google.com/forms/d/e/1FAIpQLSd7SkuQ-dfW-P3aArSQokK9GkKAUKufTVBHod_ElNIiFE9iBQ/viewform?usp=sf_link'>
@@ -111,7 +126,14 @@ var ConferenceSplash = React.createClass({
                     </section>
                     <section className='conf2018-panel mod-questions'>
                         <p className='conf2018-panel-desc'>
-                            <FormattedHTMLMessage id='conference-2018.questions' />
+                            <FormattedMessage
+                                id='conference-2018.questions'
+                                values={{
+                                    emailLink: <a href='mailto:conference@scratch.mit.edu'>
+                                        conference@scratch.mit.edu
+                                    </a>
+                                }}
+                            />
                         </p>
                     </section>
                 </div>
diff --git a/src/views/conference/2018/index/l10n.json b/src/views/conference/2018/index/l10n.json
index fcf03baf8..1b27667b9 100644
--- a/src/views/conference/2018/index/l10n.json
+++ b/src/views/conference/2018/index/l10n.json
@@ -1,5 +1,6 @@
 {
-    "conference-2018.title": "Scratch Conference 2018 <br/> The Next Generation",
+    "conference-2018.title": "Scratch Conference 2018",
+    "conference-2018.subtitle": "The Next Generation",
     "conference-2018.dateDesc": "July 26-28, 2018 | Cambridge, MA, USA",
     "conference-2018.dateDescMore": " (with opening reception the evening of July 25)",
     "conference-2018.locationDetails": "MIT Media Lab, Cambridge, MA",
@@ -8,13 +9,18 @@
     "conference-2018.date": "When:",
     "conference-2018.location": "Where:",
 
-    "conference-2018.desc": "Join us for the Scratch@MIT conference, a playful gathering of educators, researchers, developers, and other members of the worldwide Scratch community.<br /> <br />We're planning a very participatory conference, with an entire day of hands-on workshops and lots of opportunities for peer-to-peer discussion and collaboration.",
+    "conference-2018.desc1": "Join us for the Scratch@MIT conference, a playful gathering of educators, researchers, developers, and other members of the worldwide Scratch community.",
+    "conference-2018.desc2": "We're planning a very participatory conference, with an entire day of hands-on workshops and lots of opportunities for peer-to-peer discussion and collaboration.",
 
     "conference-2018.sessionDesc": "Interested in offering a session? We invite four types of proposals:",
-    "conference-2018.sessionItem1": "<b>Poster/demonstration (90 minutes)</b>. Show off your project in an exhibition setting, alongside other presenters. You will be provided with display space for a poster and table space for a computer or handouts.",
-    "conference-2018.sessionItem2": "<b>Hands-on workshop (90 minutes)</b>. Engage participants in hands-on activities, highlighting new ways of creating and collaborating with Scratch.",
-    "conference-2018.sessionItem3": "<b>Interactive panel (60 minutes)</b>. Discuss a Scratch-related topic in a panel with three or more people. Your proposal should describe how you will engage the audience during the session.",
-    "conference-2018.sessionItem4": "<b>Ignite talk (5 minutes)</b>. Share what you've been doing in a short, lively presentation.",
+    "conference-2018.sessionItem1Title": "Poster/demonstration (90 minutes).",
+    "conference-2018.sessionItem1Desc": "Show off your project in an exhibition setting, alongside other presenters. You will be provided with display space for a poster and table space for a computer or handouts.",
+    "conference-2018.sessionItem2Title": "Hands-on workshop (90 minutes).",
+    "conference-2018.sessionItem2Desc": "Engage participants in hands-on activities, highlighting new ways of creating and collaborating with Scratch.",
+    "conference-2018.sessionItem3Title": "Interactive panel (60 minutes).",
+    "conference-2018.sessionItem3Desc": "Discuss a Scratch-related topic in a panel with three or more people. Your proposal should describe how you will engage the audience during the session.",
+    "conference-2018.sessionItem4Title": "Ignite talk (5 minutes).",
+    "conference-2018.sessionItem2Desc": "Share what you've been doing in a short, lively presentation.",
 
     "conference-2018.proposal": " Submit Your Proposal",
     "conference-2018.proposalDeadline": "Deadline for proposals: February 5",
@@ -24,5 +30,5 @@
     "conference-2018.registrationEarly": "Early Bird Registration (March 1-May 1): $200",
     "conference-2018.registrationStandard": "Standard Registration (after May 1): $300",
 
-    "conference-2018.questions": "Questions? Contact the Scratch Team at <a href='mailto:conference@scratch.mit.edu'>conference@scratch.mit.edu</a>"
+    "conference-2018.questions": "Questions? Contact the Scratch Team at {emailLink}"
 }