diff --git a/common/app/Nav/Nav.jsx b/common/app/Nav/Nav.jsx
index e2a471b668..2e813f8808 100644
--- a/common/app/Nav/Nav.jsx
+++ b/common/app/Nav/Nav.jsx
@@ -217,7 +217,11 @@ export class FCCNav extends React.Component {
                 /> :
                 null
             }
-            <li className='divider-vertical'/>
+            { !shouldShowMapButton &&            
+                <li 
+                  className='divider-vertical'
+                />
+            }
             {
               navLinks.map(
                 this.renderLink.bind(this, true)
diff --git a/common/app/routes/Challenges/views/classic/Show.jsx b/common/app/routes/Challenges/views/classic/Show.jsx
index 713e837533..30deb456ed 100644
--- a/common/app/routes/Challenges/views/classic/Show.jsx
+++ b/common/app/routes/Challenges/views/classic/Show.jsx
@@ -16,7 +16,7 @@ export const mapStateToPanes = addNS(
   state => {
     const panesMap = {
       [types.toggleMap]: 'Map',
-      [types.toggleSidePanel]: 'Side Panel',
+      [types.toggleSidePanel]: 'Lesson',
       [types.toggleClassicEditor]: 'Editor'
     };
 
@@ -29,7 +29,7 @@ export const mapStateToPanes = addNS(
 
 const nameToComponent = {
   Map: _Map,
-  'Side Panel': SidePanel,
+  'Lesson': SidePanel,
   Editor: Editor,
   Preview: Preview
 };