diff --git a/.circleci/config.yml b/.circleci/config.yml
index abe65e8480..9a24c6244f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -231,14 +231,13 @@ workflows:
             branches:
               only:
                 - develop
-                - auth0-hotfix-v3
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
           filters:
             branches:
               only:                
-                - apollo-site
+                - free
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
diff --git a/__tests__/shared/components/ChallengeTile/__snapshots__/index.jsx.snap b/__tests__/shared/components/ChallengeTile/__snapshots__/index.jsx.snap
index c733309a43..9fe1f038fa 100644
--- a/__tests__/shared/components/ChallengeTile/__snapshots__/index.jsx.snap
+++ b/__tests__/shared/components/ChallengeTile/__snapshots__/index.jsx.snap
@@ -241,9 +241,6 @@ exports[`renders marathon 1`] = `
             </p>
           </div>
         </div>
-        <p
-          className="src-shared-components-ChallengeTile-___style__roles___1V-WA"
-        />
       </div>
     </div>
   </div>
diff --git a/__tests__/shared/components/GUIKit/TextInput/__snapshots__/index.jsx.snap b/__tests__/shared/components/GUIKit/TextInput/__snapshots__/index.jsx.snap
index 1d2c532062..f7c29a7f58 100644
--- a/__tests__/shared/components/GUIKit/TextInput/__snapshots__/index.jsx.snap
+++ b/__tests__/shared/components/GUIKit/TextInput/__snapshots__/index.jsx.snap
@@ -9,6 +9,7 @@ exports[`Default render 1`] = `
     defaultValue=""
     onBlur={[Function]}
     onChange={[Function]}
+    onKeyPress={[Function]}
     placeholder=""
     type="text"
   />
diff --git a/__tests__/shared/components/SubmissionManagement/Submission.jsx b/__tests__/shared/components/SubmissionManagement/Submission.jsx
index db738bc760..3f593267e3 100644
--- a/__tests__/shared/components/SubmissionManagement/Submission.jsx
+++ b/__tests__/shared/components/SubmissionManagement/Submission.jsx
@@ -4,6 +4,7 @@ import Submission from 'components/SubmissionManagement/Submission';
 import TU from 'react-dom/test-utils';
 
 const mockOnDelete = jest.fn();
+const mockOnDownload = jest.fn();
 const mockOnShowDetails = jest.fn();
 
 const rnd = new Rnd();
@@ -12,6 +13,7 @@ test('Snapshot match', () => {
   rnd.render((
     <Submission
       onDelete={mockOnDelete}
+      onDownload={mockOnDownload}
       onShowDetails={mockOnShowDetails}
       showScreeningDetails
       type="develop"
@@ -21,6 +23,7 @@ test('Snapshot match', () => {
   rnd.render((
     <Submission
       onDelete={mockOnDelete}
+      onDownload={mockOnDownload}
       onShowDetails={mockOnShowDetails}
       submissionObject={{
         id: '12345',
@@ -49,6 +52,7 @@ class Wrapper extends React.Component {
 const page = TU.renderIntoDocument((
   <Wrapper
     onDelete={mockOnDelete}
+    onDownload={mockOnDownload}
     onShowDetails={mockOnShowDetails}
     submissionObject={{
       id: '12345',
diff --git a/__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap b/__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap
index 90c1a3249c..eee3e3054e 100644
--- a/__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap
+++ b/__tests__/shared/components/SubmissionManagement/__snapshots__/Submission.jsx.snap
@@ -21,14 +21,17 @@ exports[`Snapshot match 1`] = `
     className="src-shared-components-SubmissionManagement-Submission-___styles__action-col___2M1RY"
   >
     <div>
-      <a>
+      <button
+        onClick={[Function]}
+        type="button"
+      >
         <DownloadIcon
           height="16"
           viewBox="0 0 16 16"
           width="16"
           xmlns="http://www.w3.org/2000/svg"
         />
-      </a>
+      </button>
       <button
         className="src-shared-components-SubmissionManagement-Submission-___styles__delete-icon___2M67z"
         disabled={true}
@@ -81,14 +84,17 @@ exports[`Snapshot match 2`] = `
     className="src-shared-components-SubmissionManagement-Submission-___styles__action-col___2M1RY"
   >
     <div>
-      <a>
+      <button
+        onClick={[Function]}
+        type="button"
+      >
         <DownloadIcon
           height="16"
           viewBox="0 0 16 16"
           width="16"
           xmlns="http://www.w3.org/2000/svg"
         />
-      </a>
+      </button>
       <button
         className="src-shared-components-SubmissionManagement-Submission-___styles__delete-icon___2M67z"
         disabled={true}
diff --git a/package.json b/package.json
index 719076c89e..b13114a3d0 100644
--- a/package.json
+++ b/package.json
@@ -140,7 +140,7 @@
     "supertest": "^3.1.0",
     "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
     "tc-ui": "^1.0.12",
-    "topcoder-react-lib": "1.1.1",
+    "topcoder-react-lib": "1.1.2",
     "topcoder-react-ui-kit": "2.0.1",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",
diff --git a/src/shared/actions/page/challenge-details.js b/src/shared/actions/page/challenge-details.js
index 20faf4c0d8..3312b33bb7 100644
--- a/src/shared/actions/page/challenge-details.js
+++ b/src/shared/actions/page/challenge-details.js
@@ -59,7 +59,7 @@ function setSpecsTabState(state) {
  * @param {Boolean} open
  * @return {Object}
  */
-function toggleCheckpointFeedback(id, open) {
+function toggleCheckpointFeedback(id, open = false) {
   return { id, open };
 }
 
diff --git a/src/shared/components/ChallengeTile/index.jsx b/src/shared/components/ChallengeTile/index.jsx
index c1611df3dd..0dbc7b7a22 100644
--- a/src/shared/components/ChallengeTile/index.jsx
+++ b/src/shared/components/ChallengeTile/index.jsx
@@ -2,6 +2,7 @@
  * Challenge tile.
  */
 /* eslint-env browser */
+import _ from 'lodash';
 import React from 'react';
 import PT from 'prop-types';
 import { Link } from 'react-router-dom';
@@ -74,6 +75,7 @@ class ChallengeTile extends React.Component {
     } = this.props;
 
     const { track, type } = challenge;
+    const roles = _.get(challenge, 'userDetails.roles');
 
     const outStyleName = `challenge tile-view ${track.replace(' ', '-').toLowerCase()}`;
     const extraStyle = {
@@ -307,19 +309,22 @@ class ChallengeTile extends React.Component {
                 ) }
               </div>
 
-              <p styleName="roles">
-                { track !== COMPETITION_TRACKS.DS
+              { !_.isEmpty(roles)
+                && (
+                <p styleName="roles">
+                  { track !== COMPETITION_TRACKS.DS
                   && (
                   <span>
                     <span>
                       Role: &nbsp;
                     </span>
                     <span>
-                      { listRoles(challenge.userDetails.roles) }
+                      { listRoles(roles) }
                     </span>
                   </span>
                   ) }
-              </p>
+                </p>
+                ) }
             </div>
           </div>
         </div>
diff --git a/src/shared/components/Contentful/PasswordScreen/index.jsx b/src/shared/components/Contentful/PasswordScreen/index.jsx
index a323ff6a46..c574520af5 100644
--- a/src/shared/components/Contentful/PasswordScreen/index.jsx
+++ b/src/shared/components/Contentful/PasswordScreen/index.jsx
@@ -21,10 +21,12 @@ export default class PasswordScreen extends React.Component {
 
   onSubmit() {
     const { password } = this.props;
-    const { inputVal } = this.state;
-    this.setState({
-      authorized: password === inputVal,
-      errorMsg: password === inputVal ? '' : 'Password incorrect',
+    this.setState((state) => {
+      const { inputVal } = state;
+      return {
+        authorized: password === inputVal,
+        errorMsg: password === inputVal ? '' : 'Password incorrect',
+      };
     });
   }
 
@@ -41,7 +43,7 @@ export default class PasswordScreen extends React.Component {
       authorized, errorMsg, inputVal,
     } = this.state;
     const {
-      viewPortId, preview, spaceName, environment, baseUrl, title,
+      viewPortId, preview, spaceName, environment, baseUrl, title, btnText, content,
     } = this.props;
     return authorized ? (
       <Viewport
@@ -62,11 +64,24 @@ export default class PasswordScreen extends React.Component {
             onChange={val => this.onPasswordInput(val)}
             errorMsg={errorMsg}
             required
+            type="password"
+            onEnterKey={this.onSubmit}
           />
           <div styleName="cta">
-            <button type="button" styleName="submit" onClick={this.onSubmit} disabled={!inputVal}>SUBMIT</button>
+            <button type="button" styleName="submit" onClick={this.onSubmit} disabled={!inputVal}>{btnText}</button>
           </div>
         </div>
+        {
+          content ? (
+            <Viewport
+              id={content.sys.id}
+              preview={preview}
+              spaceName={spaceName}
+              environment={environment}
+              baseUrl={baseUrl}
+            />
+          ) : null
+        }
       </div>
     );
   }
@@ -78,6 +93,8 @@ PasswordScreen.defaultProps = {
   environment: null,
   baseUrl: '',
   title: 'GET ACCESS WITH PASSWORD',
+  btnText: 'SUBMIT',
+  content: null,
 };
 
 PasswordScreen.propTypes = {
@@ -88,4 +105,6 @@ PasswordScreen.propTypes = {
   environment: PT.string,
   baseUrl: PT.string,
   title: PT.string,
+  btnText: PT.string,
+  content: PT.shape(),
 };
diff --git a/src/shared/components/Contentful/Route.jsx b/src/shared/components/Contentful/Route.jsx
index 18c23943f8..78876bb229 100644
--- a/src/shared/components/Contentful/Route.jsx
+++ b/src/shared/components/Contentful/Route.jsx
@@ -71,6 +71,8 @@ function ChildRoutesLoader(props) {
                         environment={environment}
                         baseUrl={url}
                         title={fields.passwordScreenTitle}
+                        btnText={fields.passwordScreenButtonText}
+                        content={fields.passwordScreenContent}
                       />
                     )
                     ) : <Error404 />
diff --git a/src/shared/components/GUIKit/TextInput/index.jsx b/src/shared/components/GUIKit/TextInput/index.jsx
index a69881350c..519ea50dc6 100644
--- a/src/shared/components/GUIKit/TextInput/index.jsx
+++ b/src/shared/components/GUIKit/TextInput/index.jsx
@@ -17,6 +17,8 @@ function TextInput({
   onChange,
   required,
   size,
+  type,
+  onEnterKey,
 }) {
   const [val, setVal] = useState(value);
   const delayedOnChange = useRef(
@@ -28,7 +30,7 @@ function TextInput({
     <div className="textInputContainer" styleName={`container ${sizeStyle}`}>
       <input
         defaultValue={value}
-        type="text"
+        type={type}
         placeholder={`${placeholder}${placeholder && required ? ' *' : ''}`}
         styleName={`${value || val ? 'haveValue' : ''} ${errorMsg ? 'haveError' : ''}`}
         onChange={(e) => {
@@ -39,6 +41,11 @@ function TextInput({
           delayedOnChange(e.target.value, onChange);
           setVal(e.target.value);
         }}
+        onKeyPress={(e) => {
+          if (e.key === 'Enter') {
+            onEnterKey();
+          }
+        }}
       />
       {label ? (
         <label htmlFor="textBoxInput">
@@ -58,6 +65,8 @@ TextInput.defaultProps = {
   onChange: () => {},
   required: false,
   size: 'lg',
+  type: 'text',
+  onEnterKey: () => {},
 };
 
 TextInput.propTypes = {
@@ -68,6 +77,8 @@ TextInput.propTypes = {
   onChange: PT.func,
   required: PT.bool,
   size: PT.oneOf(['xs', 'lg']),
+  type: PT.string,
+  onEnterKey: PT.func,
 };
 
 export default TextInput;
diff --git a/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx b/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx
index 8ebdbb6725..f9e83ed626 100644
--- a/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx
+++ b/src/shared/components/Leaderboard/ChallengeHistoryModal/index.jsx
@@ -116,7 +116,7 @@ class ChallengeHistoryModal extends Component {
               challengesOrdered.map(challenge => (
                 <tr styleName="row" key={`${challenge['tco_leaderboard.challenge_id'] || challenge.challenge_id}`}>
                   <td styleName="name">
-                    <a href={`${config.URL.BASE}/challenges/${challenge['tco_leaderboard.challenge_id'] || challenge.challenge_id}/`} styleName="link" target="_blank" rel="noopener noreferrer">
+                    <a href={`${config.URL.BASE}/challenges/${challenge['tco_leaderboard.challenge_id'] || challenge['challenge.challenge_id'] || challenge.challenge_id}/`} styleName="link" target="_blank" rel="noopener noreferrer">
                       {challenge.challenge_name || challenge['challenge.challenge_name'] || challenge['tco_leaderboard.challenge_id'] || challenge.challenge_id}
                     </a>
                   </td>
diff --git a/src/shared/components/Leaderboard/LeaderboardTable/index.jsx b/src/shared/components/Leaderboard/LeaderboardTable/index.jsx
index 33c49b62e9..9b46aa65d1 100644
--- a/src/shared/components/Leaderboard/LeaderboardTable/index.jsx
+++ b/src/shared/components/Leaderboard/LeaderboardTable/index.jsx
@@ -65,6 +65,9 @@ export default function LeaderboardTable(props) {
         photoUrl = `${config.CDN.PUBLIC}/avatar/${
           encodeURIComponent(photoUrl)}?size=40`;
       }
+      const fulfillment = competitor['tco_leaderboard.fulfillment']
+        ? (parseFloat(competitor['tco_leaderboard.fulfillment']) * 100).toFixed(2).replace(/[.,]00$/, '')
+        : competitor.fulfillment;
       return (
         <tr key={competitor.rank}>
           <td styleName={`${stylesName}.col-rank`}>{competitor.rank}</td>
@@ -105,7 +108,7 @@ export default function LeaderboardTable(props) {
           </td>
           {
             isCopilot ? (
-              <td styleName={`${stylesName}.col-fulfillment`}>{competitor.fulfillment}</td>
+              <td styleName={`${stylesName}.col-fulfillment`}>{fulfillment}</td>
             ) : null
           }
           <td styleName={`${stylesName}.col-challenges`}>{competitor['tco_leaderboard.challenge_count'] || competitor.challengecount}</td>
@@ -122,7 +125,7 @@ export default function LeaderboardTable(props) {
           }
           {
             isAlgo ? (
-              <td styleName={`${stylesName}.col-points`}>{competitor['srm_tco19.score']}</td>
+              <td styleName={`${stylesName}.col-points`}>{competitor['tco_leaderboard.total_score'] || competitor['srm_tco19.score']}</td>
             ) : null
           }
         </tr>
@@ -141,7 +144,13 @@ export default function LeaderboardTable(props) {
               <th styleName={`${stylesName}.col-fulfillment`}>Fulfillment</th>
             ) : null
           }
-          <th styleName={`${stylesName}.col-challenges`}># of Challenges</th>
+          {
+            isAlgo ? (
+              <th styleName={`${stylesName}.col-challenges`}># of Matches</th>
+            ) : (
+              <th styleName={`${stylesName}.col-challenges`}># of Challenges</th>
+            )
+          }
           <th styleName={`${stylesName}.col-points`}>Points</th>
           {
             isTopGear ? (
diff --git a/src/shared/components/Leaderboard/PodiumSpot/index.jsx b/src/shared/components/Leaderboard/PodiumSpot/index.jsx
index 72fc4869d8..ad1795e42e 100644
--- a/src/shared/components/Leaderboard/PodiumSpot/index.jsx
+++ b/src/shared/components/Leaderboard/PodiumSpot/index.jsx
@@ -107,6 +107,9 @@ export default function PodiumSpot(props) {
   }
   let rootStyle = `${stylesName}.PodiumSpot`;
   if (PODIUM_ITEM_MODIFIER[competitor.rank]) rootStyle += ` ${stylesName}.PodiumSpot--${PODIUM_ITEM_MODIFIER[competitor.rank]}`;
+  const fulfillment = competitor['tco_leaderboard.fulfillment']
+    ? (parseFloat(competitor['tco_leaderboard.fulfillment']) * 100).toFixed(2).replace(/[.,]00$/, '')
+    : competitor.fulfillment;
 
   return (
     <div styleName={rootStyle}>
@@ -175,14 +178,20 @@ export default function PodiumSpot(props) {
         {
           isCopilot ? (
             <div styleName={`${stylesName}.stats`}>
-              <span styleName={`${stylesName}.value`}>{competitor.fulfillment}</span>
+              <span styleName={`${stylesName}.value`}>{fulfillment}</span>
               <span styleName={`${stylesName}.value-title`}>fulfillment</span>
             </div>
           ) : null
         }
         <div styleName={`${stylesName}.stats`}>
           <span styleName={`${stylesName}.value`}>{competitor['tco_leaderboard.challenge_count'] || competitor.challengecount}</span>
-          <span styleName={`${stylesName}.value-title`}>challenges</span>
+          {
+            isAlgo ? (
+              <span styleName={`${stylesName}.value-title`}># of matches</span>
+            ) : (
+              <span styleName={`${stylesName}.value-title`}>challenges</span>
+            )
+          }
         </div>
         <div styleName={`${stylesName}.stats`}>
           <span styleName={`${stylesName}.value`}>{formatPoints(competitor['tco_leaderboard.tco_points'] || competitor.points)}</span>
@@ -207,7 +216,7 @@ export default function PodiumSpot(props) {
         {
           isAlgo ? (
             <div styleName={`${stylesName}.stats`}>
-              <span styleName={`${stylesName}.value`}>{competitor['srm_tco19.score']}</span>
+              <span styleName={`${stylesName}.value`}>{competitor['tco_leaderboard.total_score'] || competitor['srm_tco19.score']}</span>
               <span styleName={`${stylesName}.value-title`}>total score</span>
             </div>
           ) : null
diff --git a/src/shared/components/ProfilePage/Stats/SubTrackChallengeView/index.jsx b/src/shared/components/ProfilePage/Stats/SubTrackChallengeView/index.jsx
index 332374de38..6bd154dc37 100644
--- a/src/shared/components/ProfilePage/Stats/SubTrackChallengeView/index.jsx
+++ b/src/shared/components/ProfilePage/Stats/SubTrackChallengeView/index.jsx
@@ -13,6 +13,7 @@ import shortId from 'shortid';
 import ChallengeTile from 'components/ChallengeTile';
 import SRMTile from 'components/SRMTile';
 import { actions } from 'topcoder-react-lib';
+import { OLD_COMPETITION_TRACKS, COMPETITION_TRACKS } from 'utils/tc';
 import LoadingIndicator from 'components/LoadingIndicator';
 import GalleryModal from './GalleryModal';
 import './style.scss';
@@ -104,6 +105,27 @@ const processPastChallenge = (challenge) => {
     } else {
       cloned.numImages = 0;
     }
+
+    if (!cloned.type) {
+      cloned.type = cloned.subTrack;
+    }
+
+    switch (cloned.track) {
+      case OLD_COMPETITION_TRACKS.DATA_SCIENCE:
+        cloned.track = COMPETITION_TRACKS.DS;
+        break;
+      case OLD_COMPETITION_TRACKS.DESIGN:
+        cloned.track = COMPETITION_TRACKS.DES;
+        break;
+      case OLD_COMPETITION_TRACKS.DEVELOP:
+        cloned.track = COMPETITION_TRACKS.DEV;
+        break;
+      case OLD_COMPETITION_TRACKS.QA:
+        cloned.track = COMPETITION_TRACKS.QA;
+        break;
+      default:
+        break;
+    }
   }
   return cloned;
 };
@@ -421,7 +443,6 @@ function mapDispatchToProps(dispatch) {
       pageNum,
       pageSize,
       refresh,
-      userId,
     ) => {
       const uuid = shortId();
       dispatch(action.getSubtrackChallengesInit(handle, uuid));
@@ -434,7 +455,6 @@ function mapDispatchToProps(dispatch) {
         pageNum,
         pageSize,
         refresh,
-        userId,
       ));
     },
     loadSRM: (handle, tokenV3, pageNum, pageSize, refresh) => {
diff --git a/src/shared/components/Settings/Account/MyAccount/index.jsx b/src/shared/components/Settings/Account/MyAccount/index.jsx
index 33867791f8..b7e688ba22 100644
--- a/src/shared/components/Settings/Account/MyAccount/index.jsx
+++ b/src/shared/components/Settings/Account/MyAccount/index.jsx
@@ -362,8 +362,8 @@ export default class MyAccount extends ConsentComponent {
       newEmail,
       currentEmail,
       btnChangeEmailVisible,
-      btnVerifiEmailVisible,
-      btnVerifiAgainlVisible,
+      // btnVerifiEmailVisible,
+      // btnVerifiAgainlVisible,
       focus,
       hasLength,
       hasLetter,
@@ -377,11 +377,11 @@ export default class MyAccount extends ConsentComponent {
       isMobileView,
       showRePasswordTips,
       rePasswordValid,
-      isValidEmail,
+      // isValidEmail,
       isOpen,
     } = this.state;
 
-    const { updatingPassword, updatingProfile, isEmailConflict = false } = profileState;
+    const { updatingPassword, /* updatingProfile, */ isEmailConflict = false } = profileState;
     const { incorrectPassword } = settingsPageState;
 
     return (
@@ -481,8 +481,13 @@ export default class MyAccount extends ConsentComponent {
                       </div>
                     )
                   }
+                  { /* TEMPORARY DISABLE CHANGE E-MAIL - community-app#5107
                   <div styleName="row">
-                    <div styleName={`button-change-email ${btnChangeEmailVisible ? 'active' : 'hide'}`}>
+                    <div
+                      styleName={
+                        `button-change-email ${btnChangeEmailVisible ? 'active' : 'hide'}`
+                      }
+                    >
                       <PrimaryButton
                         styleName="white-label"
                         onClick={this.onChangeEmail}
@@ -490,7 +495,11 @@ export default class MyAccount extends ConsentComponent {
                         Change Email
                       </PrimaryButton>
                     </div>
-                    <div styleName={`button-verification-email ${btnVerifiEmailVisible ? 'active' : 'hide'}`}>
+                    <div
+                      styleName={
+                        `button-verification-email ${btnVerifiEmailVisible ? 'active' : 'hide'}`
+                      }
+                    >
                       <PrimaryButton
                         styleName="white-label"
                         disabled={!isValidEmail || updatingProfile}
@@ -499,7 +508,11 @@ export default class MyAccount extends ConsentComponent {
                         Send Verification Email
                       </PrimaryButton>
                     </div>
-                    <div styleName={`button-verification-again ${btnVerifiAgainlVisible ? 'active' : 'hide'}`}>
+                    <div
+                      styleName={
+                        `button-verification-again ${btnVerifiAgainlVisible ? 'active' : 'hide'}`
+                      }
+                    >
                       <PrimaryButton
                         styleName="white-label"
                         disabled={!isValidEmail || updatingProfile}
@@ -508,7 +521,11 @@ export default class MyAccount extends ConsentComponent {
                         Send Verification Email Again
                       </PrimaryButton>
                     </div>
-                    <div styleName={`button-cancel-change-email ${btnVerifiEmailVisible ? 'active' : 'hide'}`}>
+                    <div
+                      styleName={
+                        `button-cancel-change-email ${btnVerifiEmailVisible ? 'active' : 'hide'}`
+                      }
+                    >
                       <PrimaryButton
                         styleName="white-label"
                         onClick={this.onCancelVerificationEmail}
@@ -517,6 +534,7 @@ export default class MyAccount extends ConsentComponent {
                       </PrimaryButton>
                     </div>
                   </div>
+                  */}
                 </form>
               ) : (
                 <form name="email-form-default" styleName="form-default" noValidate autoComplete="off">
@@ -582,8 +600,11 @@ export default class MyAccount extends ConsentComponent {
                       </div>
                     )
                   }
+                  {/* TEMPORARY DISABLE CHANGE E-MAIL - community-app#5107
                   <div styleName="row button-group">
-                    <div styleName={`button-change-email ${btnChangeEmailVisible ? 'active' : 'hide'}`}>
+                    <div
+                      styleName={`button-change-email ${btnChangeEmailVisible ? 'active' : 'hide'}`}
+                    >
                       <PrimaryButton
                         styleName="white-label"
                         onClick={this.onChangeEmail}
@@ -591,7 +612,11 @@ export default class MyAccount extends ConsentComponent {
                         Change Email
                       </PrimaryButton>
                     </div>
-                    <div styleName={`button-verification-email ${btnVerifiEmailVisible ? 'active' : 'hide'}`}>
+                    <div
+                      styleName={
+                        `button-verification-email ${btnVerifiEmailVisible ? 'active' : 'hide'}`
+                      }
+                    >
                       <PrimaryButton
                         styleName="white-label"
                         disabled={!isValidEmail || updatingProfile}
@@ -600,7 +625,11 @@ export default class MyAccount extends ConsentComponent {
                         Send Verification Email
                       </PrimaryButton>
                     </div>
-                    <div styleName={`button-verification-again ${btnVerifiAgainlVisible ? 'active' : 'hide'}`}>
+                    <div
+                      styleName={
+                        `button-verification-again ${btnVerifiAgainlVisible ? 'active' : 'hide'}`
+                      }
+                    >
                       <PrimaryButton
                         styleName="white-label"
                         disabled={!isValidEmail || updatingProfile}
@@ -609,7 +638,11 @@ export default class MyAccount extends ConsentComponent {
                         Send Verification Email Again
                       </PrimaryButton>
                     </div>
-                    <div styleName={`button-cancel-change-email ${btnVerifiEmailVisible ? 'active' : 'hide'}`}>
+                    <div
+                      styleName={
+                        `button-cancel-change-email ${btnVerifiEmailVisible ? 'active' : 'hide'}`
+                      }
+                    >
                       <PrimaryButton
                         styleName="white-label"
                         onClick={this.onCancelVerificationEmail}
@@ -618,6 +651,7 @@ export default class MyAccount extends ConsentComponent {
                       </PrimaryButton>
                     </div>
                   </div>
+                  */}
                 </form>
               )
             }
diff --git a/src/shared/components/SubmissionManagement/Submission/index.jsx b/src/shared/components/SubmissionManagement/Submission/index.jsx
index 2c29d62ef8..770b8ffb58 100644
--- a/src/shared/components/SubmissionManagement/Submission/index.jsx
+++ b/src/shared/components/SubmissionManagement/Submission/index.jsx
@@ -14,7 +14,6 @@
 import _ from 'lodash';
 import moment from 'moment';
 import React from 'react';
-import { config } from 'topcoder-react-utils';
 import { COMPETITION_TRACKS, CHALLENGE_STATUS } from 'utils/tc';
 
 import PT from 'prop-types';
@@ -31,12 +30,14 @@ export default function Submission(props) {
     submissionObject,
     showScreeningDetails,
     track,
+    onDownload,
     onDelete,
     onShowDetails,
     status,
     allowDelete,
   } = props;
   const formatDate = date => moment(+new Date(date)).format('MMM DD, YYYY hh:mm A');
+  const onDownloadSubmission = onDownload.bind(1, submissionObject.id);
 
   return (
     <tr styleName="submission-row">
@@ -66,15 +67,12 @@ export default function Submission(props) {
       }
       <td styleName="action-col">
         <div>
-          <a
-            href={
-              track === COMPETITION_TRACKS.DES
-                ? `${config.URL.ONLINE_REVIEW}/review/actions/DownloadContestSubmission?uid=${submissionObject.id}`
-                : submissionObject.download
-            }
+          <button
+            onClick={() => onDownloadSubmission(submissionObject.id)}
+            type="button"
           >
             <DownloadIcon />
-          </a>
+          </button>
           { /*
             TODO: At the moment we just fetch downloads from the legacy
               Topcoder Studio API, and we don't need any JS code to this.
@@ -132,6 +130,7 @@ Submission.propTypes = {
   }),
   showScreeningDetails: PT.bool,
   track: PT.string.isRequired,
+  onDownload: PT.func.isRequired,
   onDelete: PT.func.isRequired,
   onShowDetails: PT.func,
   status: PT.string.isRequired,
diff --git a/src/shared/components/Terms/TermDetails.scss b/src/shared/components/Terms/TermDetails.scss
index 675274ce3b..93ddaf3a90 100644
--- a/src/shared/components/Terms/TermDetails.scss
+++ b/src/shared/components/Terms/TermDetails.scss
@@ -40,6 +40,44 @@
   br + br {
     display: none;
   }
+
+  ol {
+    margin: 0 0 5px;
+    counter-reset: item;
+    font-size: 15px;
+    color: $tc-gray-90;
+    line-height: 25px;
+    display: table;
+
+    li {
+      list-style-type: none;
+      font-weight: 400;
+      counter-increment: item;
+      display: table-row;
+      white-space: normal;
+
+      &::before {
+        display: table-cell;
+        font-weight: 700;
+        text-align: right;
+        content: counter(item) ".";
+        padding: 0 10px 0 0;
+        width: 32px;
+      }
+    }
+  }
+
+  ul {
+    margin: 0 0 5px 20px;
+    font-size: 15px;
+    color: $tc-gray-90;
+    line-height: 25px;
+    list-style: disc outside none;
+
+    li {
+      font-weight: 400;
+    }
+  }
 }
 
 .frame {
diff --git a/src/shared/components/challenge-detail/Checkpoints/index.jsx b/src/shared/components/challenge-detail/Checkpoints/index.jsx
index cc7f5a62c8..a6e1282d5a 100644
--- a/src/shared/components/challenge-detail/Checkpoints/index.jsx
+++ b/src/shared/components/challenge-detail/Checkpoints/index.jsx
@@ -27,7 +27,7 @@ function Checkpoints(props) {
                 document
                   .getElementsByClassName(style['challenge-checkpoint-winners'])[index]
                   .scrollIntoView(true);
-                toggleCheckpointFeedback(index, true);
+                toggleCheckpointFeedback(item.submissionId, true);
               }}
               type="button"
             >
@@ -47,12 +47,12 @@ function Checkpoints(props) {
           }}
         />
         {
-          checkpointResults && checkpointResults.map((item, index) => (
+          checkpointResults && checkpointResults.map(item => (
             <div key={item.submissionId} styleName="challenge-checkpoint-winners">
               <button
                 onClick={(e) => {
                   e.preventDefault();
-                  toggleCheckpointFeedback(index);
+                  toggleCheckpointFeedback(item.submissionId, !item.expanded);
                 }}
                 styleName="challenge-checkpoint-submission"
                 type="button"
diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
index ed61187a59..07d9f4d206 100644
--- a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
+++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
@@ -22,7 +22,6 @@
 /* eslint-disable jsx-a11y/label-has-for */
 
 import _ from 'lodash';
-import { challenge as challengeUtils } from 'topcoder-react-lib';
 import React from 'react';
 import PT from 'prop-types';
 import Select from 'components/Select';
@@ -38,7 +37,6 @@ import DateRangePicker from '../DateRangePicker';
 import style from './style.scss';
 import UiSimpleRemove from '../../Icons/ui-simple-remove.svg';
 
-const Filter = challengeUtils.filter;
 
 export default function FiltersPanel({
   communityFilters,
@@ -328,9 +326,10 @@ export default function FiltersPanel({
                   autoBlur
                   clearable={false}
                   id="review-type-select"
-                  onChange={
-                    value => setFilterState(Filter.setReviewOpportunityType(filterState, value))
-                  }
+                  onChange={(value) => {
+                    const reviewOpportunityType = value === 0 ? undefined : value;
+                    setFilterState({ ..._.clone(filterState), reviewOpportunityType });
+                  }}
                   options={[
                     { label: 'All', value: 0 }, // 0 value deactivates above filter
                     ...Object.entries(REVIEW_OPPORTUNITY_TYPES)
@@ -434,6 +433,7 @@ export default function FiltersPanel({
               endDateStart: null,
               startDateEnd: null,
               status: 'All',
+              reviewOpportunityType: undefined,
             });
             selectCommunity(defaultCommunityId);
             setSearchText('');
diff --git a/src/shared/containers/ContentfulLoader.jsx b/src/shared/containers/ContentfulLoader.jsx
index cf82b0614d..858642d330 100644
--- a/src/shared/containers/ContentfulLoader.jsx
+++ b/src/shared/containers/ContentfulLoader.jsx
@@ -11,7 +11,7 @@ import React from 'react';
 import shortId from 'shortid';
 import qs from 'qs';
 import SSR from 'utils/SSR';
-import { config } from 'topcoder-react-utils';
+import { config, isomorphy } from 'topcoder-react-utils';
 import { connect } from 'react-redux';
 
 // Setting those to infinity to disable maxage and auto refresh
@@ -156,6 +156,10 @@ class ContentfulLoader extends React.Component {
     const b = this.loadContentOnMount(entryIds, 'entries', timeLimit);
     const c = this.loadQueriesOnMount(assetQueries, 'assets', timeLimit);
     const d = this.loadQueriesOnMount(entryQueries, 'entries', timeLimit);
+    if (isomorphy.isClientSide()) {
+      this.handleResize = _.throttle(this.handleResize.bind(this), 250);
+      window.addEventListener('resize', this.handleResize);
+    }
     return Promise.all([...a, ...b, ...c, ...d])
       .then(() => new Promise(resolve => setTimeout(() => resolve(), 100)));
   }
@@ -208,6 +212,18 @@ class ContentfulLoader extends React.Component {
       const ids = toArray(entryQueries).map(query => queryToMd5(query));
       ids.forEach(id => freeQuery(id, 'entries', preview, spaceName, environment));
     }
+
+    if (isomorphy.isClientSide()) {
+      window.removeEventListener('resize', this.handleResize);
+    }
+  }
+
+  /**
+   * On window resize trigger render
+   * for this and all child componets
+   */
+  handleResize() {
+    this.forceUpdate();
   }
 
   /**
diff --git a/src/shared/containers/SubmissionManagement/index.jsx b/src/shared/containers/SubmissionManagement/index.jsx
index 383c2d1050..0e7869781d 100644
--- a/src/shared/containers/SubmissionManagement/index.jsx
+++ b/src/shared/containers/SubmissionManagement/index.jsx
@@ -15,11 +15,13 @@ import PT from 'prop-types';
 import { connect } from 'react-redux';
 import { Modal } from 'topcoder-react-ui-kit';
 import { config } from 'topcoder-react-utils';
-import { actions } from 'topcoder-react-lib';
+import { actions, services } from 'topcoder-react-lib';
 
 import './styles.scss';
 import smpActions from '../../actions/page/submission_management';
 
+const { getService } = services.submissions;
+
 // The container component
 class SubmissionManagementPageContainer extends React.Component {
   componentDidMount() {
@@ -54,7 +56,6 @@ class SubmissionManagementPageContainer extends React.Component {
       isLoadingChallenge,
       mySubmissions,
       onCancelSubmissionDelete,
-      onDownloadSubmission,
       onShowDetails,
       onSubmissionDelete,
       onSubmissionDeleteConfirmed,
@@ -68,7 +69,19 @@ class SubmissionManagementPageContainer extends React.Component {
     const smConfig = {
       onShowDetails,
       onDelete: onSubmissionDelete,
-      onDownload: () => onDownloadSubmission(0, authTokens),
+      onDownload: (challengeType, submissionId) => {
+        const submissionsService = getService(authTokens.tokenV3);
+        submissionsService.downloadSubmission(submissionId)
+          .then((blob) => {
+            const url = window.URL.createObjectURL(new Blob([blob]));
+            const link = document.createElement('a');
+            link.href = url;
+            link.setAttribute('download', `submission-${challengeType}-${submissionId}.zip`);
+            document.body.appendChild(link);
+            link.click();
+            link.parentNode.removeChild(link);
+          });
+      },
       onlineReviewUrl: `${config.URL.ONLINE_REVIEW}/review/actions/ViewProjectDetails?pid=${challengeId}`,
       challengeUrl: `${challengesUrl}/${challengeId}`,
       addSumissionUrl: `${config.URL.BASE}/challenges/${challengeId}/submit`,
diff --git a/src/shared/containers/challenge-detail/index.jsx b/src/shared/containers/challenge-detail/index.jsx
index 3c2efdf568..d088940562 100644
--- a/src/shared/containers/challenge-detail/index.jsx
+++ b/src/shared/containers/challenge-detail/index.jsx
@@ -27,7 +27,6 @@ import Terms from 'containers/Terms';
 import termsActions from 'actions/terms';
 import ChallengeCheckpoints from 'components/challenge-detail/Checkpoints';
 import React from 'react';
-import htmlToText from 'html-to-text';
 import PT from 'prop-types';
 import { connect } from 'react-redux';
 import challengeDetailsActions, { TABS as DETAIL_TABS }
@@ -376,15 +375,8 @@ class ChallengeDetailPageContainer extends React.Component {
       prizesStr = challenge.prizes.map(p => `$${p}`).join('/');
       prizesStr = `[${prizesStr}] - `;
     }
-    const title = challenge.name;
-
-    let description = challenge.description || challenge.detailedRequirements;
-    description = description ? description.slice(0, 256) : '';
-    description = htmlToText.fromString(description, {
-      singleNewLineParagraphs: true,
-      wordwrap: false,
-    });
-    description = description.replace(/\n/g, ' ');
+    const title = 'Topcoder Challenge | Topcoder Community | Topcoder';
+    const description = 'Browse the challenges currently available on Topcoder. Search by type of challenge, then find those of interest to register for and compete in today.';
 
     const results2 = resultsLoadedForChallengeId === _.toString(challengeId)
       ? results : null;
@@ -432,10 +424,10 @@ class ChallengeDetailPageContainer extends React.Component {
             !isEmpty
             && (
               <MetaTags
-                description={description.slice(0, 155)}
+                description={description}
                 image={getOgImage(challenge)}
                 siteName="Topcoder"
-                socialDescription={description.slice(0, 200)}
+                socialDescription={description}
                 socialTitle={`${prizesStr}${title}`}
                 title={title}
               />
@@ -763,6 +755,14 @@ function mapStateToProps(state, props) {
       mySubmissions = _.filter(challenge.submissions, s => (`${s.memberId}` === `${auth.user.userId}`));
     }
   }
+  const { page: { challengeDetails: { feedbackOpen } } } = state;
+  const checkpoints = state.challenge.checkpoints || {};
+  if (feedbackOpen.id && checkpoints.checkpointResults) {
+    checkpoints.checkpointResults = checkpoints.checkpointResults.map(result => ({
+      ...result,
+      expanded: result.submissionId === feedbackOpen.id ? feedbackOpen.open : result.expanded,
+    }));
+  }
   return {
     auth: state.auth,
     challenge,
@@ -773,9 +773,9 @@ function mapStateToProps(state, props) {
     challengeId: String(props.match.params.challengeId),
     challengesUrl: props.challengesUrl,
     challengeTypesMap: state.challengeListing.challengeTypesMap,
-    checkpointResults: (state.challenge.checkpoints || {}).checkpointResults,
+    checkpointResults: checkpoints.checkpointResults,
     checkpointResultsUi: state.page.challengeDetails.checkpoints,
-    checkpoints: state.challenge.checkpoints || {},
+    checkpoints,
     communityId: props.communityId,
     communitiesList: state.tcCommunities.list,
     domain: state.domain,
diff --git a/src/shared/containers/challenge-listing/Listing/index.jsx b/src/shared/containers/challenge-listing/Listing/index.jsx
index 7cc11cfbe1..ab8c52a856 100644
--- a/src/shared/containers/challenge-listing/Listing/index.jsx
+++ b/src/shared/containers/challenge-listing/Listing/index.jsx
@@ -37,8 +37,6 @@ const { mapToBackend } = challengeUtils.filter;
 
 let mounted = false;
 
-const SEO_PAGE_TITLE = 'Topcoder Challenges';
-
 export class ListingContainer extends React.Component {
   componentDidMount() {
     const {
@@ -368,7 +366,6 @@ export class ListingContainer extends React.Component {
       challengesUrl,
       challengeTags,
       communityFilters,
-      communityId,
       communityName,
       defaultCommunityId,
       expanding,
@@ -494,7 +491,8 @@ export class ListingContainer extends React.Component {
     let communityFilter = communityFilters.find(item => item.communityId === selectedCommunityId);
     if (communityFilter) communityFilter = communityFilter.challengeFilter;
 
-    const description = 'Join Topcoder and compete in these challenges, to learn and earn!';
+    const title = 'Topcoder Challenge Listings | Topcoder Community | Topcoder';
+    const description = 'Browse the challenges currently available on Topcoder. Search by type of challenge, then find those of interest to register for and compete in today.';
 
     let banner;
     if (!listingOnly) {
@@ -520,7 +518,7 @@ export class ListingContainer extends React.Component {
           description={description}
           image={ogImage}
           siteName="Topcoder"
-          title={communityId ? `${communityName} Challenges` : SEO_PAGE_TITLE}
+          title={title}
         />
         {banner}
         <ChallengeListing
diff --git a/src/shared/reducers/page/challenge-details.js b/src/shared/reducers/page/challenge-details.js
index 2c19a68b8b..669d3727cf 100644
--- a/src/shared/reducers/page/challenge-details.js
+++ b/src/shared/reducers/page/challenge-details.js
@@ -8,19 +8,8 @@ import { updateQuery } from 'utils/url';
  * @param {Object} state Previous state.
  * @param {Object} action Action.
  */
-function onToggleCheckpointFeedback(state, action) {
-  const { payload: { id, open } } = action;
-  const newCheckpointResults = _.clone(state.checkpoints.checkpointResults);
-  newCheckpointResults[id].expanded = _.isUndefined(open)
-    ? !newCheckpointResults[id].expanded : open;
-  const newCheckpoints = {
-    ...state.checkpoints,
-    checkpointResults: newCheckpointResults,
-  };
-  return {
-    ...state,
-    checkpoints: newCheckpoints,
-  };
+function onToggleCheckpointFeedback(state, { payload }) {
+  return { ...state, feedbackOpen: payload };
 }
 
 /**
@@ -92,7 +81,7 @@ function create(state = {}) {
     [a.submissions.toggleSubmissionTestcase]: toggleSubmissionTestcase,
     [a.submissions.clearSubmissionTestcaseOpen]: clearSubmissionTestcaseOpen,
   }, _.defaults(state, {
-    checkpoints: {},
+    feedbackOpen: {},
     specsTabState: SPECS_TAB_STATES.VIEW,
     submissionHistoryOpen: {},
     submissionTestcaseOpen: {},
diff --git a/src/shared/routes/Topcoder/ChallengeListing.jsx b/src/shared/routes/Topcoder/ChallengeListing.jsx
index 8b6757b933..fe8d857730 100644
--- a/src/shared/routes/Topcoder/ChallengeListing.jsx
+++ b/src/shared/routes/Topcoder/ChallengeListing.jsx
@@ -5,11 +5,11 @@
 
 import _ from 'lodash';
 import LoadingIndicator from 'components/LoadingIndicator';
-// import path from 'path';
+import path from 'path';
 import qs from 'qs';
 import React from 'react';
-// import { StaticRouter } from 'react-router-dom';
-import { AppChunk } from 'topcoder-react-utils';
+import { StaticRouter } from 'react-router-dom';
+import { AppChunk, webpack } from 'topcoder-react-utils';
 
 export default function ChallengeListingRoute() {
   return (
@@ -39,13 +39,14 @@ export default function ChallengeListingRoute() {
       /*
         TODO: Making server-side rendering work demands some more efforts
         with reducers coding.
+      */
       renderServer={(renderProps) => {
-        const p = resolveWeak('containers/challenge-listing/Listing');
-        const ChallengeListing = requireWeak(path.resolve(__dirname, p));
+        const p = webpack.resolveWeak('containers/challenge-listing/Listing');
+        const ChallengeListing = webpack.requireWeak(path.resolve(__dirname, p));
         /* TODO: Choice of currency and prize mode should be moved to
-           * Redux actions / reducers. *//*
-        const query = renderProps.location.search ?
-          qs.parse(renderProps.location.search.slice(1)) : null;
+           * Redux actions / reducers. */
+        const query = renderProps.location.search
+          ? qs.parse(renderProps.location.search.slice(1)) : null;
         const currencyFromUrl = _.get(query, 'currency');
         const prizeMode = currencyFromUrl && `money-${currencyFromUrl}`;
         return (
@@ -61,7 +62,6 @@ export default function ChallengeListingRoute() {
           </StaticRouter>
         );
       }}
-      */
     />
   );
 }
diff --git a/src/shared/utils/tc.js b/src/shared/utils/tc.js
index 8475ee8a05..73a0f84699 100644
--- a/src/shared/utils/tc.js
+++ b/src/shared/utils/tc.js
@@ -11,6 +11,7 @@ import { config, isomorphy } from 'topcoder-react-utils';
 import { tc } from 'topcoder-react-lib';
 
 export const {
+  OLD_COMPETITION_TRACKS,
   COMPETITION_TRACKS,
   CHALLENGE_STATUS,
   REVIEW_OPPORTUNITY_TYPES,