diff --git a/src/js/app/challenge-details/partials/ng-content-basic-challenge-details.tpl.html b/src/js/app/challenge-details/partials/ng-content-basic-challenge-details.tpl.html
index d8016cd2..54a1db2c 100644
--- a/src/js/app/challenge-details/partials/ng-content-basic-challenge-details.tpl.html
+++ b/src/js/app/challenge-details/partials/ng-content-basic-challenge-details.tpl.html
@@ -95,7 +95,7 @@ <h3><small>$</small><span ng-bind="CD.challenge.prize[j]"></span></h3>
                 </td>
               </tr>
               <tr><!-- Bugfix: Added noPrize class when challenge has no reliability bonus -->
-                <td ng-if="!CD.isDesign" colspan="{{CD.challenge.challengeType == 'Code' ? '2' : ''}}" class="{{ (!CD.challenge.reliabilityBonus || CD.challenge.challengeType === 'Bug Hunt') ? 'noPrize' : ''}}">
+                <td ng-if="!CD.isDesign" colspan="5" class="{{ (!CD.challenge.reliabilityBonus || CD.challenge.challengeType === 'Bug Hunt') ? 'noPrize' : ''}}">
                   <p class="realibilityPara">
                     Reliability Bonus
                     <span ng-if="CD.reliabilityBonus && CD.challenge.challengeType !== 'Bug Hunt'" ng-bind-template="${{CD.challenge.reliabilityBonus}}">
@@ -104,15 +104,9 @@ <h3><small>$</small><span ng-bind="CD.challenge.prize[j]"></span></h3>
                       N/A
                     </span>
                   </p>
-                </td><!-- Bugfix: Added noPrize class when challenge has no DR points -->
-                <td ng-if="!CD.isDesign" colspan="{{CD.challenge.challengeType == 'Code' ? '3' : ''}}" class="{{!CD.challenge.digitalRunPoints ? 'noPrize' : ''}}">
-                  <p class="drPointsPara">DR Points <span ng-bind="CD.challenge.digitalRunPoints ? CD.challenge.digitalRunPoints : 'N/A'"></span></p>
                 </td>
                 </td>
-                <td ng-if="CD.isDesign" colspan="2">
-                  <p class="scPoints"><span ng-bind="CD.challenge.digitalRunPoints ? CD.challenge.digitalRunPoints : ''"></span>{{!CD.challenge.digitalRunPoints ? 'NO' : ''}} STUDIO CUP POINTS</p>
-                </td>
-                <td ng-if="CD.isDesign" colspan="3">
+                <td ng-if="CD.isDesign" colspan="5">
                   <p class="scPoints" ng-if="CD.challenge.numberOfCheckpointsPrizes > 0"><span ng-bind="CD.challenge.numberOfCheckpointsPrizes"></span> CHECKPOINT AWARDS WORTH <span ng-bind-template="${{CD.challenge.topCheckPointPrize}}"></span>
                     EACH</p>
                   <p class="scPoints" ng-if="CD.challenge.numberOfCheckpointsPrizes == 0">NO CHECKPOINT AWARDS</p>
@@ -223,7 +217,7 @@ <h3><small>$</small><span ng-bind="CD.challenge.prize[j]"></span></h3>
                     </td>
                   </tr>
                   <tr>
-                    <td ng-if="!CD.isDesign" colspan="{{CD.challenge.challengeType == 'Code' ? '2' : ''}}">
+                    <td ng-if="!CD.isDesign" colspan="5">
                       <p class="realibilityPara">
                         Reliability Bonus
                         <span ng-if="CD.reliabilityBonus && CD.reliabilityBonus.length > 0">
@@ -234,14 +228,8 @@ <h3><small>$</small><span ng-bind="CD.challenge.prize[j]"></span></h3>
                         </span>
                       </p>
                     </td>
-                    <td ng-if="!CD.isDesign" colspan="{{CD.challenge.challengeType == 'Code' ? '3' : ''}}">
-                      <p class="drPointsPara">DR Points <span ng-bind="CD.challenge.digitalRunPoints ? CD.challenge.digitalRunPoints : 'N/A'"></span></p>
-                    </td>
-                    </td>
-                    <td ng-if="CD.isDesign" colspan="2">
-                        <p class="scPoints"><span ng-bind="CD.challenge.digitalRunPoints ? CD.challenge.digitalRunPoints : 'NO'"></span> STUDIO CUP POINTS</p>
                     </td>
-                    <td ng-if="CD.isDesign" colspan="3">
+                    <td ng-if="CD.isDesign" colspan="5">
                       <p class="scPoints"><span ng-bind="CD.challenge.numberOfCheckpointsPrizes"></span> CHECKPOINT AWARDS WORTH $<span ng-bind="CD.challenge.topCheckPointPrize"></span>
                         EACH</p>
                     </td>
diff --git a/src/js/app/challenges/jsx/build/challenge-grid-view.js b/src/js/app/challenges/jsx/build/challenge-grid-view.js
index ef67e7f3..5f9a5b13 100644
--- a/src/js/app/challenges/jsx/build/challenge-grid-view.js
+++ b/src/js/app/challenges/jsx/build/challenge-grid-view.js
@@ -114,7 +114,7 @@
         return (
         React.createElement("div", {className: "contest "+ trackTag +" trackSD type-" + challenge.challengeCommunity, key: challenge.challengeId}, 
           React.createElement("div", {className: "cgCh"}, 
-            React.createElement("a", {href: challenge.challengeCommunity != 'data' ? "/challenge-details/" +challenge.challengeId+"/?type="+challenge.challengeCommunity : tcconfig.communityURL + '/longcontest/?module=ViewProblemStatement&rd=' + challenge.roundId + '&pm=' + challenge.problemId, className: "contestName"}, 
+            React.createElement("a", {href: challenge.challengeCommunity != 'data' ? "/challenge-details/" +challenge.challengeId+"/?type="+challenge.challengeCommunity : tcconfig.communityURL + '/tc?module=MatchDetails&rd=' + challenge.roundId, className: "contestName"}, 
               React.createElement("img", {alt: "", className: "allContestIco", src: images + '/ico-track-' + challenge.challengeCommunity + '.png'}), 
               React.createElement("span", {className: "gridChallengName"}, challenge.challengeName), 
               React.createElement("img", {alt: "", className: challenge.challengeCommunity != 'data' ? "allContestTCOIco" : "allContestTCOIco ng-hide", src: images + '/tco-flag-' + challenge.challengeCommunity + '.png'}), 
diff --git a/src/js/app/challenges/jsx/src/challenge-grid-view.js b/src/js/app/challenges/jsx/src/challenge-grid-view.js
index a333d76f..b81deeb5 100644
--- a/src/js/app/challenges/jsx/src/challenge-grid-view.js
+++ b/src/js/app/challenges/jsx/src/challenge-grid-view.js
@@ -114,7 +114,7 @@
         return (
         <div className={"contest "+ trackTag +" trackSD type-" + challenge.challengeCommunity} key={challenge.challengeId}>
           <div className="cgCh">
-            <a href={challenge.challengeCommunity != 'data' ? "/challenge-details/" +challenge.challengeId+"/?type="+challenge.challengeCommunity : tcconfig.communityURL + '/longcontest/?module=ViewProblemStatement&rd=' + challenge.roundId + '&pm=' + challenge.problemId} className="contestName">
+            <a href={challenge.challengeCommunity != 'data' ? "/challenge-details/" +challenge.challengeId+"/?type="+challenge.challengeCommunity : tcconfig.communityURL + '/tc?module=MatchDetails&rd=' + challenge.roundId} className="contestName">
               <img alt="" className="allContestIco" src={images + '/ico-track-' + challenge.challengeCommunity + '.png'} />
               <span className="gridChallengName">{challenge.challengeName}</span>
               <img alt="" className={challenge.challengeCommunity != 'data' ? "allContestTCOIco" : "allContestTCOIco ng-hide"} src={images + '/tco-flag-' + challenge.challengeCommunity + '.png'} />
diff --git a/src/js/script-challenges.js b/src/js/script-challenges.js
index af1bcab9..44e668db 100644
--- a/src/js/script-challenges.js
+++ b/src/js/script-challenges.js
@@ -823,7 +823,7 @@ appChallenges = {
                  * generate table row for design past contest type
                  */
                 if (typeof rec.numberOfRegistrants !== "undefined") {
-                    $('.contestName', row).html('<img alt="" class="allContestIco" src="' + stylesheet_dir + '/i/ico-track-data.png" />' + '<a href="' + tcconfig.communityURL + '/longcontest/?module=ViewProblemStatement&rd=' + rec.roundId + '&pm=' + rec.problemId + '">' + rec.fullName + '</a>');
+                    $('.contestName', row).html('<img alt="" class="allContestIco" src="' + stylesheet_dir + '/i/ico-track-data.png" />' + '<a href="' + tcconfig.communityURL + '/tc?module=MatchDetails&rd=' + rec.roundId + '">' + rec.fullName + '</a>');
                     $('.colType', row).html("Marathon");
                     $('.vStartDate', row).html(app.formatDate2(rec.startDate));
                     $('.vEndDate', row).html(app.formatDate2(rec.endDate));
@@ -832,7 +832,7 @@ appChallenges = {
                     $('.colSub', row).html(rec.numberOfSubmissions);
                 } else {
                     //$('.contestName', row).html(rec.fullName);
-                    $('.contestName', row).html('<img alt="" class="allContestIco" src="' + stylesheet_dir + '/i/ico-track-data.png" />' + '<a href="' + tcconfig.communityURL + '/longcontest/?module=ViewProblemStatement&rd=' + rec.roundId + '&pm=' + rec.problemId + '">' + rec.fullName + '</a>');
+                    $('.contestName', row).html('<img alt="" class="allContestIco" src="' + stylesheet_dir + '/i/ico-track-data.png" />' + '<a href="' + tcconfig.communityURL + '/tc?module=MatchDetails&rd=' + rec.roundId + '">' + rec.fullName + '</a>');
                     $('.colType', row).html("Marathon");
                     $('.vStartDate', row).html(app.formatDate2(rec.startDate));
                     $('.vEndDate', row).html(app.formatDate2(rec.endDate));
diff --git a/wp/wp-content/themes/tcs-responsive/ng-page-challenges.php b/wp/wp-content/themes/tcs-responsive/ng-page-challenges.php
index 06596a4d..18410bc2 100644
--- a/wp/wp-content/themes/tcs-responsive/ng-page-challenges.php
+++ b/wp/wp-content/themes/tcs-responsive/ng-page-challenges.php
@@ -480,7 +480,7 @@ class="ngHeaderCell" ng-header-cell>
   </div>
   <div class="colCh" ng-if="row.getProperty('challengeCommunity') === 'data'">
     <div>
-      <a ng-href="//community.topcoder.com/longcontest/?module=ViewProblemStatement&rd={{row.getProperty('roundId')}}&pm={{row.getProperty('problemId')}}" class="contestName">
+      <a ng-href="//community.topcoder.com/tc?module=MatchDetails&rd={{row.getProperty('roundId')}}" class="contestName">
         <img alt="allContestIco" class="allContestIco" ng-src="{{images}}/ico-track-{{row.getProperty('challengeCommunity')}}.png">
         <span ng-cell-text>{{row.getProperty('fullName')}}</span>
         <img alt="allContestTCOIco" class="allContestTCOIco" ng-src="{{images}}/tco-flag-{{row.getProperty('challengeCommunity') != 'data'?row.getProperty('challengeCommunity'):'develop'}}.png" ng-show="contest.contestType != 'data'">