diff --git a/cms/templates/index.html b/cms/templates/index.html
index b5a5b3e6ff..6a29ee2b6d 100644
--- a/cms/templates/index.html
+++ b/cms/templates/index.html
@@ -5,22 +5,6 @@
 <%block name="title">${_("My Courses")}</%block>
 <%block name="bodyclass">is-signedin index dashboard</%block>
 
-<%block name="jsextra">
-
-<script type="text/javascript">
-    $(document).ready(function () {
-
-      // showing/hiding authorship rights UI
-      $('.show-authorshiprights').click(function(e){
-        (e).preventDefault();
-        $(this).closest('.wrapper-authorshiprights').toggleClass('is-shown').find('.ui-toggle-control').toggleClass('current');
-      });
-
-    });
-
-</script>
-</%block>
-
 <%block name="header_extras">
   <script type="text/template" id="new-course-template">
     <section class="new-course">
@@ -61,9 +45,9 @@
         <ul>
           <li class="nav-item">
             % if not disable_course_creation:
-              <a href="#" class="button new-button new-course-button"><i class="icon-plus icon-inline"></i> ${_("New Course")}</a>
-	    % elif settings.MITX_FEATURES.get('STAFF_EMAIL',''):
-	      <a href="mailto:${settings.MITX_FEATURES.get('STAFF_EMAIL','')}">${_("Email staff to create course")}</a>
+              <a href="#" class="button new-button new-course-button"><i class="icon-plus"></i> ${_("New Course")}</a>
+      % elif settings.MITX_FEATURES.get('STAFF_EMAIL',''):
+        <a href="mailto:${settings.MITX_FEATURES.get('STAFF_EMAIL','')}">${_("Email staff to create course")}</a>
             % endif
           </li>
         </ul>
@@ -73,601 +57,37 @@
   </div>
 
   <div class="wrapper-content wrapper">
-
-    <!-- CASE 1: User Logged In + Not Verified -->
-    <!-- ==================== -->
     <section class="content">
-      <article class="content-primary" role="main">
-
-        <div class="introduction">
-          <h2 class="title">${_("Thanks for signing up, %(name)s!") % dict(name= user.username)}</h2>
-        </div>
-
-        <div class="notice notice-incontext notice-instruction notice-instruction-verification has-actions">
-          <div class="msg">
-            <h3 class="title">${_('We need to verify your email address')}</h3>
-            <div class="copy">
-              <p>${_('Almost there! In order to complete your sign up we need you verify your $emailaddress email address. An activation message and next steps should be waiting for you there.')}</p>
-
-              <p>${_('Need another copy of the verification email? You can also request another message be sent.')}</p>
-            </div>
-          </div>
-
-          <ul class="list-actions">
-            <li class="action-item">
-              <a href="#" class="action-primary action-request">Re-send verification email message</a>
-            </li>
-          </ul>
-        </div>
-      </article>
-
-      <aside class="content-supplementary" role="complimentary">
-        <div class="bit">
-          <h3 class="title title-3">${_('Need help?')}</h3>
-          <p>${_('Please check your Junk or Spam folders in case our email isn\'t in your INBOX. You can request a new verification email be sent. Still can\'t find the verification email? Request help via the link below.')}</p>
-
-          <nav class="nav-page checklists-current">
-            <ol>
-              <li class="nav-item">
-                <a href="http://help.edge.edx.org/discussion/new" class="show-tender" title="Use our feedback tool, Tender, to share your feedback">Request help with your Studio account</a>
-              </li>
-            </ol>
-          </nav>
-        </div>
-      </aside>
-    </section>
-
-
-
-    <!-- CASE 2: User Logged In + Verified + w/ Authorship Rights -->
-    <!-- ==================== -->
-    <section class="content">
-      <article class="content-primary" role="main">
-        <div class="notice notice-incontext notice-confirmation has-status">
-          <span class="status-indicator"></span>
-          <h3 class="title">${_('Your Account Has Been Verified')}</h3>
-          <div class="copy">
-            <p>${_('Thanks for verifying your edX Studio account.')}</p>
-          </div>
-        </div>
-
-        <div class="introduction">
-          <h2 class="title">${_("Welcome, %(name)s!") % dict(name= user.username)}</h2>
-
-          <div class="copy">
-            <p>${_("You haven't created any courses in Studio yet.")}</p>
-          </div>
-        </div>
-
-        <div class="course-list no-courses">
-        </div>
-
-        <div class="notice notice-incontext notice-instruction notice-instruction-authorshiprights has-actions">
-          <div class="msg">
-            <h3 class="title">${_('Create Your First Course')}</h3>
-            <div class="copy">
-              <p>${_('Your new course is just a click away!')}</p>
-            </div>
-          </div>
-
-          <ul class="list-actions">
-            <li class="action-item">
-              <a href="#" class="action-primary action-create action-create-course new-course-button"><i class="icon-plus icon-inline"></i> ${_('Create Your First Course')}</a>
-            </li>
-          </ul>
-        </div>
-      </article>
-
-      <aside class="content-supplementary" role="complimentary">
-        <div class="bit">
-          <h3 class="title title-3">${_('Need help?')}</h3>
-          <p>${_('If you are new to Studio and having trouble getting started, there are a few things that may be of help:')}</p>
-
-          <nav class="nav-page checklists-current">
-            <ol>
-              <li class="nav-item">
-                <a href="http://files.edx.org/Getting_Started_with_Studio.pdf" title="This is a PDF Document">${_('Get started by reading Studio\'s Documentation')}</a>
-              </li>
-              <li class="nav-item">
-                <a href="http://help.edge.edx.org/discussion/new" class="show-tender" title="Use our feedback tool, Tender, to share your feedback">${_('Request help with Studio')}</a>
-              </li>
-            </ol>
-          </nav>
-        </div>
-      </aside>
-    </section>
-
-
-
-    <!-- CASE 3: User Logged In + w/ Authorship Rights + No Courses -->
-    <!-- ==================== -->
-    <section class="content">
-      <article class="content-primary" role="main">
-        <div class="introduction">
-          <h2 class="title">${_("Welcome, %(name)s!") % dict(name= user.username)}</h2>
-
-          <div class="copy">
-            <p>${_("You haven't created any courses in Studio yet.")}</p>
-          </div>
-        </div>
-
-        <div class="course-list no-courses">
-        </div>
-
-        <div class="notice notice-incontext notice-instruction notice-instruction-authorshiprights has-actions">
-          <div class="msg">
-            <h3 class="title">${_('Create Your First Course')}</h3>
-            <div class="copy">
-              <p>${_('Your new course is just a click away!')}</p>
-            </div>
-          </div>
-
-          <ul class="list-actions">
-            <li class="action-item">
-              <a href="#" class="action-primary action-create action-create-course new-course-button"><i class="icon-plus icon-inline"></i> ${_('Create Your First Course')}</a>
-            </li>
-          </ul>
-        </div>
-      </article>
-
-      <aside class="content-supplementary" role="complimentary">
-        <div class="bit">
-          <h3 class="title title-3">${_('Need help?')}</h3>
-          <p>${_('If you are new to Studio and having trouble getting started, there are a few things that may be of help:')}</p>
-
-          <nav class="nav-page checklists-current">
-            <ol>
-              <li class="nav-item">
-                <a href="http://files.edx.org/Getting_Started_with_Studio.pdf" title="This is a PDF Document">${_('Get started by reading Studio\'s Documentation')}</a>
-              </li>
-              <li class="nav-item">
-                <a href="http://help.edge.edx.org/discussion/new" class="show-tender" title="Use our feedback tool, Tender, to share your feedback">${_('Request help with Studio')}</a>
-              </li>
-            </ol>
-          </nav>
-        </div>
-      </aside>
-    </section>
-
-
-
-
-    <!-- CASE 4: User Logged In + Verified + w/o Authorship Rights + No Request Made -->
-    <!-- ==================== -->
-    <section class="content">
-      <article class="content-primary" role="main">
-        <div class="introduction">
-          <h2 class="title">${_("Welcome, %(name)s!") % dict(name= user.username)}</h2>
-
-          <div class="copy">
-            <p>${_("You haven't created any courses in Studio yet.")}</p>
-          </div>
-        </div>
-
-        <div class="course-list no-courses">
-        </div>
-
-        <div class="wrapper wrapper-authorshiprights">
-          <h3 class="title">
-            <a href="#instruction-authorshiprights" class="ui-toggle-control show-authorshiprights"><span class="label">${_('Becoming a Course Author in Studio')}</span> <i class="icon-remove-sign"></i></a>
-          </h3>
-
-          <div class="notice notice-incontext notice-instruction notice-instruction-authorshiprights ui-toggle-target" id="instruction-authorshiprights">
-            <div class="copy">
-              <p>${_('edX Studio is a hosted solution for our xConsortium partners and selected guests. Courses for which you are a team member appear above for you to edit, while Course Authorship privileges are granted by edX. Our team will evaluate your request and provide you feedback within 24 hours during the work week.')}</p>
-            </div>
-
-            <div class="status status-authorship is-unrequested">
-              <h4 class="title">${_('Your Authorship Request Status:')}</h4>
-
-              <ul class="list-actions">
-                <li class="action-item">
-                  <a href="#" class="action-primary action-request">${_('Request the Ability to Author Courses')}</a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </article>
-
-      <aside class="content-supplementary" role="complimentary">
-        <div class="bit">
-          <h3 class="title title-3">${_('Why don\'t I see any courses yet?')}</h3>
-          <p>${_('In order to use Studio you must be added to an existing course as a team member, or have authorship rights to create your own course.')}</p>
-        </div>
-      </aside>
-    </section>
-
-
-
-    <!-- CASE 4: User Logged In + Verified + w/o Authorship Rights + Request Pending -->
-    <!-- ==================== -->
-    <section class="content">
-      <article class="content-primary" role="main">
-        <div class="introduction">
-          <h2 class="title">${_("Welcome, %(name)s!") % dict(name= user.username)}</h2>
-
-          <div class="copy">
-            <p>${_("You haven't created any courses in Studio yet.")}</p>
-          </div>
-        </div>
-
-        <div class="course-list no-courses">
-        </div>
-
-        <div class="wrapper wrapper-authorshiprights">
-          <h3 class="title">
-            <a href="#instruction-authorshiprights" class="ui-toggle-control show-authorshiprights"><span class="label">${_('Becoming a Course Author in Studio')}</span> <i class="icon-remove-sign"></i></a>
-          </h3>
-
-          <div class="notice notice-incontext notice-instruction notice-instruction-authorshiprights ui-toggle-target" id="instruction-authorshiprights">
-            <div class="copy">
-              <p>${_('edX Studio is a hosted solution for our xConsortium partners and selected guests. Courses for which you are a team member appear above for you to edit, while Course Authorship privileges are granted by edX. Our team will evaluate your request and provide you feedback within 24 hours during the work week.')}</p>
-            </div>
-
-            <div class="status status-authorship has-status is-pending">
-              <h4 class="title">${_('Your Authorship Request Status:')}</h4>
-
-              <dl class="status-update">
-                <dt class="label">${_('Your authorship request is:')}</dt>
-                <dd class="value">
-                  <span class="status-indicator"></span>
-                  <span class="value-formal">${_('Pending')}</span>
-                  <span class="value-description">${_('Your request is currently being reviewed by edX staff and should be updated shortly.')}</span>
-                </dd>
-              </dl>
-            </div>
-          </div>
-        </div>
-      </article>
-
-      <aside class="content-supplementary" role="complimentary">
-        <div class="bit">
-          <h3 class="title title-3">${_('Why don\'t I see any courses yet?')}</h3>
-          <p>${_('In order to use Studio you must be added to an existing course as a team member, or have authorship rights to create your own course.')}</p>
-        </div>
-      </aside>
-    </section>
-
-
-
-    <!-- CASE 4: User Logged In + Verified + w/o Authorship Rights + Request Rejected -->
-    <!-- ==================== -->
-    <section class="content">
-      <article class="content-primary" role="main">
-        <div class="introduction">
-          <h2 class="title">${_("Welcome, %(name)s!") % dict(name= user.username)}</h2>
-
-          <div class="copy">
-            <p>${_("You haven't created any courses in Studio yet.")}</p>
-          </div>
-        </div>
-
-        <div class="course-list no-courses">
-        </div>
-
-        <div class="wrapper wrapper-authorshiprights">
-          <h3 class="title">
-            <a href="#instruction-authorshiprights" class="ui-toggle-control show-authorshiprights"><span class="label">${_('Becoming a Course Author in Studio')}</span> <i class="icon-remove-sign"></i></a>
-          </h3>
-
-          <div class="notice notice-incontext notice-instruction notice-instruction-authorshiprights ui-toggle-target" id="instruction-authorshiprights">
-            <div class="copy">
-              <p>${_('edX Studio is a hosted solution for our xConsortium partners and selected guests. Courses for which you are a team member appear above for you to edit, while Course Authorship privileges are granted by edX. Our team will evaluate your request and provide you feedback within 24 hours during the work week.')}</p>
-            </div>
-
-            <div class="status status-authorship has-status is-rejected">
-              <h4 class="title">${_('Your Authorship Request Status:')}</h4>
-
-              <dl class="status-update">
-                <dt class="label">${_('Your authorship request is:')}</dt>
-                <dd class="value">
-                  <span class="status-indicator"></span>
-                  <span class="value-formal">${_('Rejected')}</span>
-                  <span class="value-description">${_('Your request did not meet the criteria/guidelines specified by edX Staff.')}</span>
-                </dd>
-              </dl>
-            </div>
-          </div>
-        </div>
-      </article>
-
-      <aside class="content-supplementary" role="complimentary">
-        <div class="bit">
-          <h3 class="title title-3">${_('Why don\'t I see any courses yet?')}</h3>
-          <p>${_('In order to use Studio you must be added to an existing course as a team member, or have authorship rights to create your own course.')}</p>
-        </div>
-      </aside>
-    </section>
-
-
-
-    <!-- CASE 5: User Logged In + Verified + w/o Authorship Rights +  Classes (as Staff Access) + No Request Made -->
-    <!-- ==================== -->
-    <section class="content">
-      <article class="content-primary" role="main">
-        <div class="introduction">
-          <h2 class="title">${_("Welcome, %(name)s!") % dict(name= user.username)}</h2>
-
-          <div class="copy">
-            <p>${_("Here are all of the courses you currently have access to in Studio:")}</p>
-          </div>
-        </div>
-
-        <div class="course-list">
-          <div class="my-classes">
-            <ul class="class-list">
-              %for course, url, lms_link in sorted(courses, key=lambda s: s[0].lower() if s[0] is not None else ''):
-              <li>
-                <a class="class-link" href="${url}" class="class-name">
-                  <span class="class-name">${course}</span>
-                </a>
-
-                <a href="${lms_link}" rel="external" class="button view-button view-live-button">View Live</a>
-              </li>
-              %endfor
-            </ul>
-          </div>
-        </div>
-
-        <div class="wrapper wrapper-authorshiprights">
-          <h3 class="title">
-            <a href="#instruction-authorshiprights" class="ui-toggle-control show-authorshiprights"><span class="label">${_('Becoming a Course Author in Studio')}</span> <i class="icon-remove-sign"></i></a>
-          </h3>
-
-          <div class="notice notice-incontext notice-instruction notice-instruction-authorshiprights ui-toggle-target" id="instruction-authorshiprights">
-            <div class="copy">
-              <p>${_('edX Studio is a hosted solution for our xConsortium partners and selected guests. Courses for which you are a team member appear above for you to edit, while Course Authorship privileges are granted by edX. Our team will evaluate your request and provide you feedback within 24 hours during the work week.')}</p>
-            </div>
-
-            <div class="status status-authorship is-unrequested">
-              <h4 class="title">${_('Your Authorship Request Status:')}</h4>
-
-              <ul class="list-actions">
-                <li class="action-item">
-                  <a href="#" class="action-primary action-request">${_('Request the Ability to Author Courses')}</a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </article>
-
-      <aside class="content-supplementary" role="complimentary">
-        <div class="bit">
-          <h3 class="title title-3">${_('Need help?')}</h3>
-          <p>${_('If you are new to Studio and having trouble getting started, there are a few things that may be of help:')}</p>
-
-          <nav class="nav-page checklists-current">
-            <ol>
-              <li class="nav-item">
-                <a href="http://files.edx.org/Getting_Started_with_Studio.pdf" title="This is a PDF Document">${_('Get started by reading Studio\'s Documentation')}</a>
-              </li>
-              <li class="nav-item">
-                <a href="http://help.edge.edx.org/discussion/new" class="show-tender" title="Use our feedback tool, Tender, to share your feedback">${_('Request help with Studio')}</a>
-              </li>
-            </ol>
-          </nav>
-        </div>
-
-        <div class="bit">
-          <h3 class="title title-3">${_('Can I author courses in Studio?')}</h3>
-          <p>${_('In order to create courses in Studio, you must have authorship rights to create your own course.')}</p>
-        </div>
-      </aside>
-    </section>
-
-
-
-    <!-- CASE 5: User Logged In + Verified + w/o Authorship Rights +  Classes (as Staff Access) + Request Pending -->
-    <!-- ==================== -->
-    <section class="content">
-      <article class="content-primary" role="main">
-        <div class="introduction">
-          <h2 class="title">${_("Welcome, %(name)s!") % dict(name= user.username)}</h2>
-
-          <div class="copy">
-            <p>${_("Here are all of the courses you currently have access to in Studio:")}</p>
-          </div>
-        </div>
-
-        <div class="course-list">
-          <div class="my-classes">
-            <ul class="class-list">
-              %for course, url, lms_link in sorted(courses, key=lambda s: s[0].lower() if s[0] is not None else ''):
-              <li>
-                <a class="class-link" href="${url}" class="class-name">
-                  <span class="class-name">${course}</span>
-                </a>
-
-                <a href="${lms_link}" rel="external" class="button view-button view-live-button">View Live</a>
-              </li>
-              %endfor
-            </ul>
-          </div>
-        </div>
-
-        <div class="wrapper wrapper-authorshiprights">
-          <h3 class="title">
-            <a href="#instruction-authorshiprights" class="ui-toggle-control show-authorshiprights"><span class="label">${_('Becoming a Course Author in Studio')}</span> <i class="icon-remove-sign"></i></a>
-          </h3>
-
-          <div class="notice notice-incontext notice-instruction notice-instruction-authorshiprights ui-toggle-target" id="instruction-authorshiprights">
-            <div class="copy">
-              <p>${_('edX Studio is a hosted solution for our xConsortium partners and selected guests. Courses for which you are a team member appear above for you to edit, while Course Authorship privileges are granted by edX. Our team will evaluate your request and provide you feedback within 24 hours during the work week.')}</p>
-            </div>
-
-            <div class="status status-authorship has-status is-pending">
-              <h4 class="title">${_('Your Authorship Request Status:')}</h4>
-
-              <dl class="status-update">
-                <dt class="label">${_('Your authorship request is:')}</dt>
-                <dd class="value">
-                  <span class="status-indicator"></span>
-                  <span class="value-formal">${_('Pending')}</span>
-                  <span class="value-description">${_('Your request is currently being reviewed by edX staff and should be updated shortly.')}</span>
-                </dd>
-              </dl>
-            </div>
-          </div>
-        </div>
-      </article>
-
-      <aside class="content-supplementary" role="complimentary">
-        <div class="bit">
-          <h3 class="title title-3">${_('Need help?')}</h3>
-          <p>${_('If you are new to Studio and having trouble getting started, there are a few things that may be of help:')}</p>
-
-          <nav class="nav-page checklists-current">
-            <ol>
-              <li class="nav-item">
-                <a href="http://files.edx.org/Getting_Started_with_Studio.pdf" title="This is a PDF Document">${_('Get started by reading Studio\'s Documentation')}</a>
-              </li>
-              <li class="nav-item">
-                <a href="http://help.edge.edx.org/discussion/new" class="show-tender" title="Use our feedback tool, Tender, to share your feedback">${_('Request help with Studio')}</a>
-              </li>
-            </ol>
-          </nav>
-        </div>
-
-        <div class="bit">
-          <h3 class="title title-3">${_('Can I author courses in Studio?')}</h3>
-          <p>${_('In order to create courses in Studio, you must have authorship rights to create your own course.')}</p>
-        </div>
-      </aside>
-    </section>
-
-
-
-    <!-- CASE 6: User Logged In + Verified + w/o Authorship Rights +  Classes (as Staff Access) + Request Rejected -->
-    <!-- ==================== -->
-    <section class="content">
-      <article class="content-primary" role="main">
-        <div class="introduction">
-          <h2 class="title">${_("Welcome, %(name)s!") % dict(name= user.username)}</h2>
-
-          <div class="copy">
-            <p>${_("Here are all of the courses you currently have access to in Studio:")}</p>
-          </div>
-        </div>
-
-        <div class="course-list">
-          <div class="my-classes">
-            <ul class="class-list">
-              %for course, url, lms_link in sorted(courses, key=lambda s: s[0].lower() if s[0] is not None else ''):
-              <li>
-                <a class="class-link" href="${url}" class="class-name">
-                  <span class="class-name">${course}</span>
-                </a>
-
-                <a href="${lms_link}" rel="external" class="button view-button view-live-button">View Live</a>
-              </li>
-              %endfor
-            </ul>
-          </div>
-        </div>
-
-        <div class="wrapper wrapper-authorshiprights">
-          <h3 class="title">
-            <a href="#instruction-authorshiprights" class="ui-toggle-control show-authorshiprights"><span class="label">${_('Becoming a Course Author in Studio')}</span> <i class="icon-remove-sign"></i></a>
-          </h3>
-
-          <div class="notice notice-incontext notice-instruction notice-instruction-authorshiprights ui-toggle-target" id="instruction-authorshiprights">
-            <div class="copy">
-              <p>${_('edX Studio is a hosted solution for our xConsortium partners and selected guests. Courses for which you are a team member appear above for you to edit, while Course Authorship privileges are granted by edX. Our team will evaluate your request and provide you feedback within 24 hours during the work week.')}</p>
-            </div>
-
-            <div class="status status-authorship has-status is-rejected">
-              <h4 class="title">${_('Your Authorship Request Status:')}</h4>
-
-              <dl class="status-update">
-                <dt class="label">${_('Your authorship request is:')}</dt>
-                <dd class="value">
-                  <span class="status-indicator"></span>
-                  <span class="value-formal">${_('Rejected')}</span>
-                  <span class="value-description">${_('Your request did not meet the criteria/guidelines specified by edX Staff.')}</span>
-                </dd>
-              </dl>
-            </div>
-          </div>
-        </div>
-      </article>
-
-      <aside class="content-supplementary" role="complimentary">
-        <div class="bit">
-          <h3 class="title title-3">${_('Need help?')}</h3>
-          <p>${_('If you are new to Studio and having trouble getting started, there are a few things that may be of help:')}</p>
-
-          <nav class="nav-page checklists-current">
-            <ol>
-              <li class="nav-item">
-                <a href="http://files.edx.org/Getting_Started_with_Studio.pdf" title="This is a PDF Document">${_('Get started by reading Studio\'s Documentation')}</a>
-              </li>
-              <li class="nav-item">
-                <a href="http://help.edge.edx.org/discussion/new" class="show-tender" title="Use our feedback tool, Tender, to share your feedback">${_('Request help with Studio')}</a>
-              </li>
-            </ol>
-          </nav>
-        </div>
-
-        <div class="bit">
-          <h3 class="title title-3">${_('Can I author courses in Studio?')}</h3>
-          <p>${_('In order to create courses in Studio, you must have authorship rights to create your own course.')}</p>
-        </div>
-      </aside>
-    </section>
-
-
-
-    <!-- CASE 7: User Logged In + Verified + w Authorship Rights +  Classes (as Author + Staff Access) -->
-    <!-- ==================== -->
-    <section class="content">
-      <article class="content-primary" role="main">
-        <div class="introduction">
-          <h2 class="title">${_("Welcome, %(name)s") % dict(name= user.username)}!</h2>
-          <div class="copy">
-            <p>${_("Here are all of the courses you currently have access to in Studio:")}</p>
-          </div>
-        </div>
-
-        <div class="course-list">
-          <div class="my-classes">
-            <ul class="class-list">
-              %for course, url, lms_link in sorted(courses, key=lambda s: s[0].lower() if s[0] is not None else ''):
-              <li>
-                <a class="class-link" href="${url}" class="class-name">
-                  <span class="class-name">${course}</span>
-                </a>
-
-                <a href="${lms_link}" rel="external" class="button view-button view-live-button">View Live</a>
-              </li>
-              %endfor
-            </ul>
-          </div>
-        </div>
-      </article>
-
-      <aside class="content-supplementary" role="complimentary">
-        <div class="bit">
-          <h3 class="title title-3">${_('Need help?')}</h3>
-          <p>${_('If you are new to Studio and having trouble getting started, there are a few things that may be of help:')}</p>
-
-          <nav class="nav-page checklists-current">
-            <ol>
-              <li class="nav-item">
-                <a href="http://files.edx.org/Getting_Started_with_Studio.pdf" title="This is a PDF Document">${_('Get started by reading Studio\'s Documentation')}</a>
-              </li>
-              <li class="nav-item">
-                <a href="http://help.edge.edx.org/discussion/new" class="show-tender" title="Use our feedback tool, Tender, to share your feedback">${_('Request help with Studio')}</a>
-              </li>
-            </ol>
-          </nav>
-        </div>
-      </aside>
+      <div class="introduction">
+        <p class="copy">
+          <strong>${_("Welcome, %(name)s") % dict(name= user.username)}</strong>.
+          ${_("Here are all of the courses you are currently authoring in Studio:")}</p>
+      </div>
     </section>
   </div>
-</%block>
 
-# % if user.is_active:
-# % else:
-# % endif
+  <div class="main-wrapper">
+    <div class="inner-wrapper">
+      <article class="my-classes">
+        % if user.is_active:
+        <ul class="class-list">
+          %for course, url, lms_link in sorted(courses, key=lambda s: s[0].lower() if s[0] is not None else ''):
+          <li>
+            <a class="class-link" href="${url}" class="class-name">
+              <span class="class-name">${course}</span>
+            </a>
+            <a href="${lms_link}" rel="external" class="button view-button view-live-button">View Live</a>
+          </li>
+            %endfor
+        </ul>
+        % else:
+          <div class='warn-msg'>
+            <p>
+            ${_("In order to start authoring courses using edX Studio, please click on the activation link in your email.")}
+            </p>
+          </div>
+        % endif
+      </article>
+    </div>
+  </div>
+</%block>