diff --git a/services/client_project_entities_dao/src/java/main/com/topcoder/clients/model/Client.java b/services/client_project_entities_dao/src/java/main/com/topcoder/clients/model/Client.java
index 0d603ec39..5b3b666b5 100644
--- a/services/client_project_entities_dao/src/java/main/com/topcoder/clients/model/Client.java
+++ b/services/client_project_entities_dao/src/java/main/com/topcoder/clients/model/Client.java
@@ -112,7 +112,7 @@ public class Client extends AuditableEntity {
      * </p>
      */
     @Column(name = "enable_effort_hours")
-    private boolean enableEffortHours;
+    private Boolean enableEffortHours;
 
     /**
      * <p>
@@ -381,7 +381,7 @@ public void setStartDate(Date startDate) {
      *
      * @return whether this client enabled effort hours.
      */
-    public boolean isEffortHoursEnabled() {
+    public Boolean isEffortHoursEnabled() {
         return this.enableEffortHours;
     }
 
@@ -391,7 +391,7 @@ public boolean isEffortHoursEnabled() {
      * @param enableEffortHours
      *            whether this client enabled effort hours.
      */
-    public void setEnableEffortHours(boolean enableEffortHours) {
+    public void setEnableEffortHours(Boolean enableEffortHours) {
         this.enableEffortHours = enableEffortHours;
     }
 }
diff --git a/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java b/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java
index 90c69f239..de0fb86e7 100644
--- a/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java
+++ b/services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java
@@ -2470,45 +2470,45 @@ private SoftwareContestPaymentResult processContestSaleInternal(TCSubject tcSubj
             if (competition.getProjectHeader().getProjectCategory().getProjectType().getId() != ProjectType.STUDIO.getId()) {
                 // software competition
 				if (contest.getProperty(ProjectPropertyType.ADMIN_FEE_PROJECT_PROPERTY_KEY) != null
-				    && !((String)contest.getProperty(ProjectPropertyType.ADMIN_FEE_PROJECT_PROPERTY_KEY)).equals(""))
+				    && !(contest.getProperty(ProjectPropertyType.ADMIN_FEE_PROJECT_PROPERTY_KEY)).equals(""))
 				{
-					totalFee += Double.parseDouble((String) contest.getProperty(ProjectPropertyType.ADMIN_FEE_PROJECT_PROPERTY_KEY));
+					totalFee += Double.parseDouble(contest.getProperty(ProjectPropertyType.ADMIN_FEE_PROJECT_PROPERTY_KEY));
 				}
 
 				if (contest.getProperty(ProjectPropertyType.FIRST_PLACE_COST_PROJECT_PROPERTY_KEY) != null
-				    && !((String)contest.getProperty(ProjectPropertyType.FIRST_PLACE_COST_PROJECT_PROPERTY_KEY)).equals(""))
+				    && !(contest.getProperty(ProjectPropertyType.FIRST_PLACE_COST_PROJECT_PROPERTY_KEY)).equals(""))
 				{
-					totalFee += Double.parseDouble((String) contest.getProperty(ProjectPropertyType.FIRST_PLACE_COST_PROJECT_PROPERTY_KEY));
+					totalFee += Double.parseDouble(contest.getProperty(ProjectPropertyType.FIRST_PLACE_COST_PROJECT_PROPERTY_KEY));
 				}
 
 				if (contest.getProperty(ProjectPropertyType.SECOND_PLACE_COST_PROJECT_PROPERTY_KEY) != null
-				    && !((String)contest.getProperty(ProjectPropertyType.SECOND_PLACE_COST_PROJECT_PROPERTY_KEY)).equals(""))
+				    && !(contest.getProperty(ProjectPropertyType.SECOND_PLACE_COST_PROJECT_PROPERTY_KEY)).equals(""))
 				{
-					totalFee += Double.parseDouble((String) contest.getProperty(ProjectPropertyType.SECOND_PLACE_COST_PROJECT_PROPERTY_KEY));
+					totalFee += Double.parseDouble(contest.getProperty(ProjectPropertyType.SECOND_PLACE_COST_PROJECT_PROPERTY_KEY));
 				}
 
 				if (contest.getProperty(ProjectPropertyType.CHECKPOINT_BONUS_COST_PROJECT_PROPERTY_KEY) != null
-				    && !((String)contest.getProperty(ProjectPropertyType.CHECKPOINT_BONUS_COST_PROJECT_PROPERTY_KEY)).equals(""))
+				    && !(contest.getProperty(ProjectPropertyType.CHECKPOINT_BONUS_COST_PROJECT_PROPERTY_KEY)).equals(""))
 				{
-					totalFee += Double.parseDouble((String) contest.getProperty(ProjectPropertyType.CHECKPOINT_BONUS_COST_PROJECT_PROPERTY_KEY));
+					totalFee += Double.parseDouble(contest.getProperty(ProjectPropertyType.CHECKPOINT_BONUS_COST_PROJECT_PROPERTY_KEY));
 				}
 
 				if (contest.getProperty(ProjectPropertyType.REVIEW_COSTS_PROJECT_PROPERTY_KEY) != null
-				    && !((String)contest.getProperty(ProjectPropertyType.REVIEW_COSTS_PROJECT_PROPERTY_KEY)).equals(""))
+				    && !(contest.getProperty(ProjectPropertyType.REVIEW_COSTS_PROJECT_PROPERTY_KEY)).equals(""))
 				{
-					totalFee += Double.parseDouble((String) contest.getProperty(ProjectPropertyType.REVIEW_COSTS_PROJECT_PROPERTY_KEY));
+					totalFee += Double.parseDouble(contest.getProperty(ProjectPropertyType.REVIEW_COSTS_PROJECT_PROPERTY_KEY));
 				}
 
 				if (contest.getProperty(ProjectPropertyType.SPEC_REVIEW_COSTS_PROJECT_PROPERTY_KEY) != null
-				    && !((String)contest.getProperty(ProjectPropertyType.SPEC_REVIEW_COSTS_PROJECT_PROPERTY_KEY)).equals(""))
+				    && !(contest.getProperty(ProjectPropertyType.SPEC_REVIEW_COSTS_PROJECT_PROPERTY_KEY)).equals(""))
 				{
-					totalFee += Double.parseDouble((String) contest.getProperty(ProjectPropertyType.SPEC_REVIEW_COSTS_PROJECT_PROPERTY_KEY));
+					totalFee += Double.parseDouble(contest.getProperty(ProjectPropertyType.SPEC_REVIEW_COSTS_PROJECT_PROPERTY_KEY));
 				}
 
 				if (contest.getProperty(ProjectPropertyType.RELIABILITY_BONUS_COST_PROJECT_PROPERTY_KEY) != null
-				    && !((String)contest.getProperty(ProjectPropertyType.RELIABILITY_BONUS_COST_PROJECT_PROPERTY_KEY)).equals(""))
+				    && !(contest.getProperty(ProjectPropertyType.RELIABILITY_BONUS_COST_PROJECT_PROPERTY_KEY)).equals(""))
 				{
-					totalFee += Double.parseDouble((String) contest.getProperty(ProjectPropertyType.RELIABILITY_BONUS_COST_PROJECT_PROPERTY_KEY));
+					totalFee += Double.parseDouble(contest.getProperty(ProjectPropertyType.RELIABILITY_BONUS_COST_PROJECT_PROPERTY_KEY));
 				}
 
                 // checkpoint prizes
@@ -2523,21 +2523,21 @@ private SoftwareContestPaymentResult processContestSaleInternal(TCSubject tcSubj
                 // studio competition
 
 				if (contest.getProperty(ProjectPropertyType.ADMIN_FEE_PROJECT_PROPERTY_KEY) != null
-				    && !((String)contest.getProperty(ProjectPropertyType.ADMIN_FEE_PROJECT_PROPERTY_KEY)).equals(""))
+				    && !(contest.getProperty(ProjectPropertyType.ADMIN_FEE_PROJECT_PROPERTY_KEY)).equals(""))
 				{
-					totalFee += Double.parseDouble((String) contest.getProperty(ProjectPropertyType.ADMIN_FEE_PROJECT_PROPERTY_KEY));
+					totalFee += Double.parseDouble(contest.getProperty(ProjectPropertyType.ADMIN_FEE_PROJECT_PROPERTY_KEY));
 				}
 
 				if (contest.getProperty(ProjectPropertyType.SPEC_REVIEW_COSTS_PROJECT_PROPERTY_KEY) != null
-				    && !((String)contest.getProperty(ProjectPropertyType.SPEC_REVIEW_COSTS_PROJECT_PROPERTY_KEY)).equals(""))
+				    && !(contest.getProperty(ProjectPropertyType.SPEC_REVIEW_COSTS_PROJECT_PROPERTY_KEY)).equals(""))
 				{
-					totalFee += Double.parseDouble((String) contest.getProperty(ProjectPropertyType.SPEC_REVIEW_COSTS_PROJECT_PROPERTY_KEY));
+					totalFee += Double.parseDouble(contest.getProperty(ProjectPropertyType.SPEC_REVIEW_COSTS_PROJECT_PROPERTY_KEY));
 				}
 
 				if (contest.getProperty(ProjectPropertyType.REVIEW_COSTS_PROJECT_PROPERTY_KEY) != null
-				    && !((String)contest.getProperty(ProjectPropertyType.REVIEW_COSTS_PROJECT_PROPERTY_KEY)).equals(""))
+				    && !(contest.getProperty(ProjectPropertyType.REVIEW_COSTS_PROJECT_PROPERTY_KEY)).equals(""))
 				{
-					totalFee += Double.parseDouble((String) contest.getProperty(ProjectPropertyType.REVIEW_COSTS_PROJECT_PROPERTY_KEY));
+					totalFee += Double.parseDouble(contest.getProperty(ProjectPropertyType.REVIEW_COSTS_PROJECT_PROPERTY_KEY));
 				}
 
                 for (Prize prize : competition.getProjectHeader().getPrizes()) {
@@ -2567,7 +2567,10 @@ private SoftwareContestPaymentResult processContestSaleInternal(TCSubject tcSubj
             double totalCost = totalFee;
             double totalMemberCost = totalFee;
 
-            totalMemberCost = totalMemberCost - Double.parseDouble((String) contest.getProperty(ProjectPropertyType.ADMIN_FEE_PROJECT_PROPERTY_KEY));
+            String adminFee = contest.getProperty(ProjectPropertyType.ADMIN_FEE_PROJECT_PROPERTY_KEY);
+            if (adminFee != null && adminFee.trim().length() != 0) {
+                totalMemberCost = totalMemberCost - Double.parseDouble(adminFee);
+            }
 
             if (paymentData instanceof TCPurhcaseOrderPaymentData) {
 
@@ -5956,7 +5959,7 @@ public SoftwareCompetition getSoftwareContestByProjectId(TCSubject tcSubject, lo
             try {
                 Client client = projectService.getClientByProject(fullProjectData.getProjectHeader().getTcDirectProjectId());
                 if (client != null) {
-                    effortHoursEnabled = client.isEffortHoursEnabled();
+                    effortHoursEnabled = client.isEffortHoursEnabled() == null ? false : client.isEffortHoursEnabled();
                 }
 
             } catch (PersistenceFault e) {
diff --git a/services/project_services/src/java/main/com/topcoder/project/service/impl/ProjectServicesImpl.java b/services/project_services/src/java/main/com/topcoder/project/service/impl/ProjectServicesImpl.java
index 56a2b9eb9..db3b0e5fc 100644
--- a/services/project_services/src/java/main/com/topcoder/project/service/impl/ProjectServicesImpl.java
+++ b/services/project_services/src/java/main/com/topcoder/project/service/impl/ProjectServicesImpl.java
@@ -247,7 +247,7 @@
  * Changes in v1.4.4 (TC Direct Release Assembly 7)
  *  - add method updateContestSale for updating contest sale.
  * </p>
- * 
+ *
  * <p>
  * Version 1.4.4 (TC Direct Replatforming Release 1) Change notes:
  * <ul>
@@ -258,7 +258,7 @@
  * <li>Add {@link #getAllFileTypes()} method.</li>
  * </ul>
  * </p>
- * 
+ *
  * <p>
  * Version 1.4.5 (TC Direct Replatforming Release 2) Change notes:
  * <ul>
@@ -315,7 +315,7 @@
  *     software checkpoint management.
  * </li></ol>
  * </p>
- * 
+ *
  * <p>
  * Version 1.4.10 (Release Assembly - TC Direct Issue Tracking Tab Update Assembly 2 v1.0) change notes:
  *   <ol>
@@ -327,7 +327,7 @@
  * Version 1.4.11 (Module Assembly - TC Cockpit - Studio - Final Fixes Integration Part One Assembly) Change notes:
  *   <ol>
  *     <li>Added {@link #getReviewsByPhase(long, long)} method.</li>
- *     <li>Updated {@link #updateProject(Project, String, com.topcoder.project.phases.Project, Resource[], Date, String)} 
+ *     <li>Updated {@link #updateProject(Project, String, com.topcoder.project.phases.Project, Resource[], Date, String)}
  *     and {@link #createProjectWithTemplate(Project, com.topcoder.project.phases.Project, Resource[], String)} methods
  *     to properly maintain the Approval phase for Studio contests.</li>
  *   </ol>
@@ -442,9 +442,9 @@
  * </p>
  *
  * <p>
- * Version 2.6 (Topcoder - Add effort hours field)
+ * Version 2.6 (Topcoder - Add effort days field)
  * <ul>
- *     <li>Add enable effort hours</li>
+ *     <li>Add enable effort days</li>
  * </ul>
  * </p>
  *
@@ -1839,7 +1839,7 @@ public FullProjectData updateProject(Project projectHeader, String projectHeader
      * @since 1.4.7
      */
     public FullProjectData updateProject(Project projectHeader, String projectHeaderReason,
-                                         com.topcoder.project.phases.Project projectPhases, Resource[] projectResources, 
+                                         com.topcoder.project.phases.Project projectPhases, Resource[] projectResources,
                                          Date regEndDate, Date multiRoundEndDate, Date endDate, String operator) {
         Util.log(logger, Level.INFO, "Enters ProjectServicesImpl#updateProject method.");
 
@@ -2790,7 +2790,7 @@ public FullProjectData createProjectWithTemplate(Project projectHeader, com.topc
             if (regEndDate != null) {
                 adjustPhaseForEndDate(PhaseType.REGISTRATION_PHASE, newProjectPhases, regEndDate);
             }
-            
+
             if (multiRoundEndDate != null) {
                 // multiround phase duration
                 adjustPhaseForEndDate(PhaseType.CHECKPOINT_SUBMISSION_PHASE, newProjectPhases, multiRoundEndDate);
diff --git a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/CommonAction.java b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/CommonAction.java
index e6f9586e7..9681f6d5d 100644
--- a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/CommonAction.java
+++ b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/CommonAction.java
@@ -399,10 +399,10 @@ public String getBillingAccountsForProject() {
                 billingAccount.put("cca", String.valueOf(requireCCAs[i]));
                 // Add enableEffortHours for each billing account
                 Client client = billingAccountsByProject.get(i).getClient();
-                if (client != null) {
-                    billingAccount.put("enableEffortHours", client.isEffortHoursEnabled());
+                if (client != null && client.isEffortHoursEnabled() != null) {
+                    billingAccount.put("enableEffortHours", String.valueOf(client.isEffortHoursEnabled()));
                 } else {
-                    billingAccount.put("enableEffortHours", false);
+                    billingAccount.put("enableEffortHours", "false");
                 }
 
                 result.add(billingAccount);
diff --git a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetContestAction.java b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetContestAction.java
index d9c3b814d..40b39123a 100644
--- a/src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetContestAction.java
+++ b/src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetContestAction.java
@@ -571,10 +571,10 @@ protected void executeAction() throws Exception {
             billingAccount.put("cca", String.valueOf(requireCCAs[i]));
             // Add enableEffortHours for each billing account
             Client client = billingProjects.get(i).getClient();
-            if (client != null) {
-                billingAccount.put("enableEffortHours", client.isEffortHoursEnabled());
+            if (client != null && client.isEffortHoursEnabled() != null) {
+                billingAccount.put("enableEffortHours", String.valueOf(client.isEffortHoursEnabled()));
             } else {
-                billingAccount.put("enableEffortHours", false);
+                billingAccount.put("enableEffortHours", "false");
             }
             billingAccountsForProject.add(billingAccount);
         }
diff --git a/src/web/WEB-INF/contest-details2.jsp b/src/web/WEB-INF/contest-details2.jsp
index bc55e55f8..99d586f79 100644
--- a/src/web/WEB-INF/contest-details2.jsp
+++ b/src/web/WEB-INF/contest-details2.jsp
@@ -135,7 +135,7 @@
                                billingAccounts.push({"id": "<s:property value="id" />",
                             	    "name" : "<s:property value="name" />",
                                   "cca" : "<s:property value="cca" />",
-                                  "enableEffortHours" : "<s:property value="enableEffortHours" />"
+                                  "enableEffortDays" : "<s:property value="enableEffortHours" />"
                                });
                                </s:iterator>
                             </script>
@@ -172,7 +172,7 @@
 </div>
 <!-- End #wrapper -->
 <div class="tooltipArea">
-    <div id="effortHourToolTip" class="tooltipContainer">
+    <div id="effortDaysToolTip" class="tooltipContainer">
         <span class="arrow"></span>
         <div class="tooltipLeft"><div class="tooltipRight"><div class="tooltipBottom">
             <div class="tooltipBottomLeft"><div class="tooltipBottomRight">
@@ -187,7 +187,7 @@
                 </div><!-- End .tooltipCaption -->
 
                 <div class="tooltipContent">
-                    <p>in Equated <strong>offshore hours = onsite hours * 6 + offshore hours</strong></p>
+                    <p>onsite efforts in person days * 6 + offshore efforts in person days</p>
                 </div><!-- End .tooltipContent -->
 
             </div></div>
diff --git a/src/web/WEB-INF/includes/contest/editTab.jsp b/src/web/WEB-INF/includes/contest/editTab.jsp
index a1f087607..3dd6ee35d 100644
--- a/src/web/WEB-INF/includes/contest/editTab.jsp
+++ b/src/web/WEB-INF/includes/contest/editTab.jsp
@@ -163,8 +163,8 @@
             </tr>
             <tr></tr>
             <tr class="effortEstimateRow hide">
-                <td class="first_tab_type"><strong>Effort Hours Estimate</strong></td>
-                <td class="sec_tab_type"><strong>: <span id="rEffortHoursEstimate"></span></strong></td>
+                <td class="first_tab_type"><strong>Estimated Effort<br/>(in Person Days):</strong></td>
+                <td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimate"></span></strong></td>
             </tr>
             <tr></tr>
             <tr>
@@ -342,18 +342,20 @@
                      </div>
                      <br/><br/>
                       <div class="effortEstimateRow">
-                        <span class="name fixWidthName" title="Enter effort hours estimate"><strong>Estimated Effort:&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
-                        <input id="effortHoursEstimate" class="bigin" name="effortHoursEstimate" type="text" value="" />
+                        <span class="name fixWidthName" title="Enter effort days estimate"><strong>Estimated Effort<br/>(in Person Days):&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
+                        <input id="effortDaysEstimate" class="bigin" name="effortDaysEstimate" type="text" value="" />
                       </div>
                      <br/><br/>
                     <span class="name fixWidthName"><strong>Created By</strong></span>
                     <span class ='small_info_spec' id="challegneCreatorLabel"></span>
+                     <div>
+                         <p class="save">
+                             <a href="javascript:;" class="cancel_text">cancel</a>
+                             <a href="javascript:;"><img src="/images/save_change.png" alt="save" class="save_btn" /></a>
+                         </p>
+                    </div>
                  </div>
                  </div>
-                 <p class="save">
-                     <a href="javascript:;" class="cancel_text">cancel</a>
-                     <a href="javascript:;"><img src="/images/save_change.png" alt="save" class="save_btn" /></a>
-                 </p>
                  <div class="clear"></div>
                 </div><!-- End .detailsContent -->
 </div><!-- End .details -->
diff --git a/src/web/WEB-INF/includes/contest/editTabMarathon.jsp b/src/web/WEB-INF/includes/contest/editTabMarathon.jsp
index ee7f667fe..37c8649f2 100644
--- a/src/web/WEB-INF/includes/contest/editTabMarathon.jsp
+++ b/src/web/WEB-INF/includes/contest/editTabMarathon.jsp
@@ -135,8 +135,8 @@
             </tr>
             <tr></tr>
             <tr class="effortEstimateRow hide">
-                <td class="first_tab_type"><strong>Effort Hours Estimate</strong></td>
-                <td class="sec_tab_type"><strong>: <span id="rEffortHoursEstimate"></span></strong></td>
+                <td class="first_tab_type"><strong>Estimated Effort<br/>(in Person Days):</strong></td>
+                <td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimate"></span></strong></td>
             </tr>
             <tr></tr>
             <tr>
@@ -295,8 +295,8 @@
             </div>
             <br /><br />
             <div class="effortEstimateRow">
-             <span class="name fixWidthName" title="Enter effort hours estimate"><strong>Estimated Effort:&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
-             <input id="effortHoursEstimate" class="bigin" name="effortHoursEstimate" type="text" value="" />
+             <span class="name fixWidthName" title="Enter effort days estimate"><strong>Estimated Effort<br/>(in Person Days):&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
+             <input id="effortDaysEstimate" class="bigin" name="effortDaysEstimate" type="text" value="" />
             </div>
             <br/><br/>
             <span class="name fixWidthName"><strong>Created By</strong></span>
diff --git a/src/web/WEB-INF/includes/contest/editTabSoftware.jsp b/src/web/WEB-INF/includes/contest/editTabSoftware.jsp
index b74640bc5..520abfd25 100644
--- a/src/web/WEB-INF/includes/contest/editTabSoftware.jsp
+++ b/src/web/WEB-INF/includes/contest/editTabSoftware.jsp
@@ -88,8 +88,8 @@
   - Version 3.3 (Topcoder - Support Points Prize Type For Challenges):
   - - Add "Points" section.
   -
-  - Version 3.4 (Topcoder - Add effort hours field):
-  - - Add enable effort hours
+  - Version 3.4 (Topcoder - Add effort days field):
+  - - Add enable effort days
 --%>
 <%@ include file="/WEB-INF/includes/taglibs.jsp" %>
 
@@ -185,8 +185,8 @@
             </tr>
             <tr></tr>
             <tr class="effortEstimateRow hide">
-                <td class="first_tab_type"><strong>Effort Hours Estimate</strong></td>
-                <td class="sec_tab_type"><strong>: <span id="rEffortHoursEstimate"></span></strong></td>
+                <td class="first_tab_type"><strong>Estimated Effort<br/>(in Person Days):</strong></td>
+                <td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimate"></span></strong></td>
             </tr>
             <tr></tr>
             <tr>
@@ -369,8 +369,8 @@
           <br/>
 
           <div class="effortEstimateRow">
-            <span class="name fixWidthName" title="Enter effort hours estimate"><strong>Estimated Effort:&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
-            <input id="effortHoursEstimate" class="bigin" name="effortHoursEstimate" type="text" value="" />
+            <span class="name fixWidthName" title="Enter effort days estimate"><strong>Estimated Effort<br/>(in Person Days):&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
+            <input id="effortDaysEstimate" class="bigin" name="effortDaysEstimate" type="text" value="" />
             <br/>
             <br/>
             <br/>
diff --git a/src/web/WEB-INF/includes/launch/contestSelection.jsp b/src/web/WEB-INF/includes/launch/contestSelection.jsp
index 34ba7d279..8d81a028f 100644
--- a/src/web/WEB-INF/includes/launch/contestSelection.jsp
+++ b/src/web/WEB-INF/includes/launch/contestSelection.jsp
@@ -54,8 +54,8 @@
   - Version 2.7 (TOPCODER - SUPPORT TYPEAHEAD FOR TASK ASSIGNEES IN DIRECT APP):
   - - Move task assign member to use magicSuggest
   -
-  - Version 2.8 (Topcoder - Add effort hours field):
-  - - Add enable effort hours
+  - Version 2.8 (Topcoder - Add effort days field):
+  - - Add enable effort days
 --%>
 <%@ include file="/WEB-INF/includes/taglibs.jsp" %>
 
@@ -237,8 +237,8 @@
           </div>
       </div>
       <div class="ms-row effortEstimateRow">
-          <label>Estimated Effort:&nbsp;&nbsp;<a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></label>
-          <input id="effortHoursEstimate" class="text" name="effortHoursEstimate" type="text"/>
+          <label>Estimated Effort<br/>(in Person Days):&nbsp;&nbsp;<a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></label>
+          <input id="effortDaysEstimate" class="text" name="effortDaysEstimate" type="text"/>
       </div>
   </div>
   <!-- end .addNewContest -->
diff --git a/src/web/WEB-INF/includes/launch/orderReview.jsp b/src/web/WEB-INF/includes/launch/orderReview.jsp
index ec387ad0f..ce95d301c 100644
--- a/src/web/WEB-INF/includes/launch/orderReview.jsp
+++ b/src/web/WEB-INF/includes/launch/orderReview.jsp
@@ -15,7 +15,7 @@
   - Version 1.3 - Topcoder - Support Points Prize Type For Challenges
   - - Add "Challenge Points" section.
   -
-  - Version 1.4 (Topcoder - Add effort hours field):
+  - Version 1.4 (Topcoder - Add effort days field):
   - - Add enable effort hours
 --%>
 <%@ include file="/WEB-INF/includes/taglibs.jsp" %>
@@ -59,8 +59,8 @@
 						<td><span id="orStartDate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
 					</tr>
 					<tr class="effortEstimateRow">
-						<th>Effort Hours Estimate :</th>
-						<td><span id="orEffortHoursEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
+						<th>Effort Days Estimate :</th>
+						<td><span id="orEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
 					</tr>
 				</table>
 			</div>
diff --git a/src/web/WEB-INF/includes/launch/orderReviewAlgorithm.jsp b/src/web/WEB-INF/includes/launch/orderReviewAlgorithm.jsp
index 1882df800..b4ceba03b 100644
--- a/src/web/WEB-INF/includes/launch/orderReviewAlgorithm.jsp
+++ b/src/web/WEB-INF/includes/launch/orderReviewAlgorithm.jsp
@@ -8,7 +8,7 @@
   - Version 1.1 - Topcoder - Support Points Prize Type For Challenges
   - - Add "Challenge Points" section.
   -
-  - Version 1.2 (Topcoder - Add effort hours field):
+  - Version 1.2 (Topcoder - Add effort days field):
   - - Add enable effort hours
 --%>
 <%@ include file="/WEB-INF/includes/taglibs.jsp" %>
@@ -48,8 +48,8 @@
 						<td><span id="alorStartDate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
 					</tr>
 					<tr class="effortEstimateRow">
-			      <th>Effort Hours Estimate :</th>
-			      <td><span id="alorEffortHoursEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
+			      <th>Effort Days Estimate :</th>
+			      <td><span id="alorEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
 					</tr>
 				</table>
 			</div>
diff --git a/src/web/WEB-INF/includes/launch/orderReviewSoftware.jsp b/src/web/WEB-INF/includes/launch/orderReviewSoftware.jsp
index 2109256e5..385845c51 100644
--- a/src/web/WEB-INF/includes/launch/orderReviewSoftware.jsp
+++ b/src/web/WEB-INF/includes/launch/orderReviewSoftware.jsp
@@ -20,7 +20,7 @@
   - Version 1.5 - Topcoder - Support Points Prize Type For Challenges
   - - Add "Challenge Points" section.
   -
-  - Version 1.6 (Topcoder - Add effort hours field):
+  - Version 1.6 (Topcoder - Add effort days field):
   - - Add enable effort hours
 --%>
 <%@ include file="/WEB-INF/includes/taglibs.jsp" %>
@@ -60,8 +60,8 @@
 						<td><span id="sworStartDate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
 					</tr>
 					<tr class="effortEstimateRow">
-			      <th>Effort Hours Estimate :</th>
-			      <td><span id="sworEffortHoursEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
+			      <th>Effort Days Estimate :</th>
+			      <td><span id="sworEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
 					</tr>
 				</table>
 			</div>
diff --git a/src/web/WEB-INF/includes/launch/review.jsp b/src/web/WEB-INF/includes/launch/review.jsp
index 966ea1bc8..3a55ef526 100644
--- a/src/web/WEB-INF/includes/launch/review.jsp
+++ b/src/web/WEB-INF/includes/launch/review.jsp
@@ -17,7 +17,7 @@
   - Version 1.4 (Topcoder - Support Points Prize Type For Challenges):
   - - Add "Challenge Points" section.
   -
-  - Version 1.5 (Topcoder - Add effort hours field):
+  - Version 1.5 (Topcoder - Add effort days field):
   - - Add enable effort hours
 --%>
 <%@ include file="/WEB-INF/includes/taglibs.jsp" %>
@@ -68,8 +68,8 @@
             <td><a href="javascript:backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
         </tr>
         <tr class="effortEstimateRow">
-            <th>Effort Hours Estimate :</th>
-            <td><span id="rEffortHoursEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
+            <th>Effort Days Estimate :</th>
+            <td><span id="rEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
               <img src="/images/edit-icon.png" alt="Edit"/></a>
             </td>
         </tr>
diff --git a/src/web/WEB-INF/includes/launch/reviewAlgorithm.jsp b/src/web/WEB-INF/includes/launch/reviewAlgorithm.jsp
index fd1e89932..af1291fd2 100644
--- a/src/web/WEB-INF/includes/launch/reviewAlgorithm.jsp
+++ b/src/web/WEB-INF/includes/launch/reviewAlgorithm.jsp
@@ -11,7 +11,7 @@
   - Version 1.2 (Topcoder - Support Points Prize Type For Challenges):
   - - Add "Challenge Points" section.
   -
-  - Version 1.3 (Topcoder - Add effort hours field):
+  - Version 1.3 (Topcoder - Add effort days field):
   - - Add enable effort hours
 --%>
 <%@ include file="/WEB-INF/includes/taglibs.jsp" %>
@@ -54,8 +54,8 @@
 			<td><a href="javascript:backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
 		</tr>
 		<tr class="effortEstimateRow">
-			<th>Effort Hours Estimate :</th>
-			<td><span id="ralEffortHoursEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
+			<th>Effort Days Estimate :</th>
+			<td><span id="ralEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
 		</tr>
 	</table>
 </div>
diff --git a/src/web/WEB-INF/includes/launch/reviewSoftware.jsp b/src/web/WEB-INF/includes/launch/reviewSoftware.jsp
index 052cee3cc..ae5ddbebe 100644
--- a/src/web/WEB-INF/includes/launch/reviewSoftware.jsp
+++ b/src/web/WEB-INF/includes/launch/reviewSoftware.jsp
@@ -25,8 +25,8 @@
   - Version 1.7 (Topcoder - Support Points Prize Type For Challenges):
   - - Add "Challenge Points" section.
   -
-  - Version 1.8 (Topcoder - Add effort hours field):
-  - - Add enable effort hours
+  - Version 1.8 (Topcoder - Add effort days field):
+  - - Add enable effort days
 --%>
 <%@ include file="/WEB-INF/includes/taglibs.jsp" %>
 
@@ -72,8 +72,8 @@
 			<td><a href="javascript:backOverview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
 		</tr>
 		<tr class="effortEstimateRow">
-			<th>Effort Hours Estimate :</th>
-			<td><span id="rswEffortHoursEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
+			<th>Effort Days Estimate :</th>
+			<td><span id="rswEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
 		</tr>
 	</table>
 </div>
diff --git a/src/web/WEB-INF/launch-contest.jsp b/src/web/WEB-INF/launch-contest.jsp
index eeafbc1de..05e6551f2 100644
--- a/src/web/WEB-INF/launch-contest.jsp
+++ b/src/web/WEB-INF/launch-contest.jsp
@@ -152,7 +152,7 @@
   <!-- End .tooltipContainer -->
 </div>
 <div class="tooltipArea">
-    <div id="effortHourToolTip" class="tooltipContainer">
+    <div id="effortDaysToolTip" class="tooltipContainer">
         <span class="arrow"></span>
         <div class="tooltipLeft"><div class="tooltipRight"><div class="tooltipBottom">
             <div class="tooltipBottomLeft"><div class="tooltipBottomRight">
@@ -167,7 +167,7 @@
                 </div><!-- End .tooltipCaption -->
 
                 <div class="tooltipContent">
-                    <p>in Equated <strong>offshore hours = onsite hours * 6 + offshore hours</strong></p>
+                    <p>onsite efforts in person days * 6 + offshore efforts in person days</p>
                 </div><!-- End .tooltipContent -->
 
             </div></div>
diff --git a/src/web/css/direct/launchcontest.css b/src/web/css/direct/launchcontest.css
index 658d60188..90ee4fd92 100644
--- a/src/web/css/direct/launchcontest.css
+++ b/src/web/css/direct/launchcontest.css
@@ -309,7 +309,7 @@
     margin-left: 14px;
     font-family: "Source Sans Pro", Arial, Helvetica, sans-serif;
     font-size: 14px;
-    line-height: 28px;
+    line-height: 24px;
 }
 
 #launchContestOut.launchCopilotContest .addNewContest label {
@@ -1790,7 +1790,7 @@ a.draft:hover span.right, a.preview:hover span.right {
 }
 
 .overviewData th {
-    width: 110px;
+    width: 130px;
     font-weight: 400;
     text-align: right;
 }
@@ -3256,6 +3256,10 @@ div.ms-group-display .ms-group-div{
     margin-top: 17px;
 }
 
+.effortEstimateRow {
+    height: 50px;
+}
+
 .dropdown-menu {
     position: absolute;
     top: 100%;
@@ -3287,3 +3291,7 @@ div.ms-group-display .ms-group-div{
     width: 401px;
     height: 25px;
 }
+
+span.name.fixWidthName {
+    line-height: 24px;
+}
\ No newline at end of file
diff --git a/src/web/scripts/launch/contestDetail.js b/src/web/scripts/launch/contestDetail.js
index 3370ef154..5d9233e15 100644
--- a/src/web/scripts/launch/contestDetail.js
+++ b/src/web/scripts/launch/contestDetail.js
@@ -19,8 +19,8 @@
  * Version 1.1 (Module Assembly - TC Cockpit Contest Milestone Association 1)
  * - Add support for milestone association with contest in contest detail page.
  *
- * Version 1.2 (Topcoder - Add effort hours field)
- * - Add enable effort hours.
+ * Version 1.2 (Topcoder - Add effort days field)
+ * - Add enable effort days.
  *
  * @author GreatKevin
  * @version 1.2
@@ -337,8 +337,8 @@ function populateTypeSection() {
   $('#challegneCreatorLabel').html(mainWidget.competition.contestData.challengeCreator);
   $('#rChallengeCreator').html(mainWidget.competition.contestData.challengeCreator);
 
-  $('#effortHoursEstimate').html(mainWidget.competition.contestData.projectHeader.properties['Effort Hours Estimate']);
-  $('#rEffortHoursEstimate').html(mainWidget.competition.contestData.projectHeader.properties['Effort Hours Estimate']);
+  $('#effortDaysEstimate').html(mainWidget.competition.contestData.projectHeader.properties['Effort Hours Estimate']);
+  $('#rEffortDaysEstimate').html(mainWidget.competition.contestData.projectHeader.properties['Effort Hours Estimate']);
 
 	if(isBillingEditable()) {
 		$('#billingAccountDivEdit').show();
diff --git a/src/web/scripts/launch/contestDetailSoftware.js b/src/web/scripts/launch/contestDetailSoftware.js
index 35bb4c4bd..cd98eb744 100644
--- a/src/web/scripts/launch/contestDetailSoftware.js
+++ b/src/web/scripts/launch/contestDetailSoftware.js
@@ -143,8 +143,8 @@
  * Version 4.5 (Topcoder - Support Points Prize Type For Challenges)
  * - Add support for points prize type
  *
- * Version 4.6 (Topcoder - Add effort hours field)
- * - Add enable effort hours
+ * Version 4.6 (Topcoder - Add effort days field)
+ * - Add enable effort days
  * @author isv, minhu, pvmagacho, GreatKevin, Veve, GreatKevin, TCSCODER
  * @version 4.6
  */
@@ -188,8 +188,8 @@ $(document).ready(function(){
 
     $.each(billingAccounts, function(key, value) {
     	var _cca = value["cca"] == "true" ? true : false;
-      var _enableEffortHours = value["enableEffortHours"] == "true" ? true : false;
-      $("#billingProjects").append($('<option></option>').val(value["id"]).html(value["name"]).data("cca", _cca).data("enableEffortHours", _enableEffortHours));
+      var _enableEffortDays = value["enableEffortDays"] == "true" ? true : false;
+      $("#billingProjects").append($('<option></option>').val(value["id"]).html(value["name"]).data("cca", _cca).data("enableEffortDays", _enableEffortDays));
     });
 	  /* Optgroup 2 columns fix */
 	  if($('.selectDesing optgroup, .selectDesign .newListOptionTitle').length > 0){
@@ -568,7 +568,7 @@ $(document).ready(function(){
             $("#chkboxCCA").removeAttr('disabled');
         }
 
-        if($(this).find(":selected").data("enableEffortHours")) {
+        if($(this).find(":selected").data("enableEffortDays")) {
           $('.effortEstimateRow').show();
         } else {
           $('.effortEstimateRow').hide();
@@ -609,9 +609,9 @@ $(document).ready(function(){
         }
     });
     $('.effortEstimateRow .helpme').hover(function() {
-        showPopup(this, 'effortHourToolTip');
+        showPopup(this, 'effortDaysToolTip');
     }, function() {
-        $('#effortHourToolTip').hide();
+        $('#effortDaysToolTip').hide();
     });
 });
 
@@ -1322,7 +1322,6 @@ function populateTypeSection() {
     }
     */
 	$('#rContestTypeName').text($("#contestTypes option[value=" + mainWidget.competitionType + mainWidget.softwareCompetition.projectHeader.projectCategory.id +"]").text());
-
   loadReviewScorecardList(null);
 
   $.each(reviewScorecards,function(){
@@ -1438,13 +1437,14 @@ function populateTypeSection() {
         $(".matchRoundId").show();
     }
 
-    var effortHoursEstimate = parseFloat(p['Effort Hours Estimate']);
-    if (!isNaN(effortHoursEstimate) && effortHoursEstimate > 0 ) {
-        $('#rEffortHoursEstimate').text(parseFloat(effortHoursEstimate));
-        $('input[name=effortHoursEstimate]').val(effortHoursEstimate);
+    // change to days
+    var effortDaysEstimate = parseFloat(p['Effort Hours Estimate']) / 24;
+    if (!isNaN(effortDaysEstimate) && effortDaysEstimate > 0 ) {
+        $('#rEffortDaysEstimate').text(parseFloat(effortDaysEstimate));
+        $('input[name=effortDaysEstimate]').val(effortDaysEstimate);
         $('.effortEstimateRow').show();
     } else {
-      $('#rEffortHoursEstimate').text('');
+      $('#rEffortDaysEstimate').text('');
     }
 
     if (mainWidget.softwareCompetition.projectHeader.properties.hasOwnProperty(MM_TYPE)) {
@@ -1586,7 +1586,7 @@ function validateFieldsTypeSection() {
     }
 
     // validate effort hours estimate
-    validateEffortHoursEstimate(errors);
+    validateEffortDaysEstimate(errors);
 
     // do NOT need milestone for First2Finish and CODE contest
     if (categoryId != SOFTWARE_CATEGORY_ID_F2F
@@ -1656,7 +1656,6 @@ function showTypeSectionDisplay() {
 }
 
 function showTypeSectionEdit() {
-
      $("#reviewerEditDiv").hide();
      $("#reviewTypeEditDiv").hide();
 
@@ -1675,12 +1674,12 @@ function showTypeSectionEdit() {
 
      $.each(billingAccounts,function(k, v) {
     	 var _cca = v["cca"] == "true" ? true : false;
-       var _enableEffortHours = value["enableEffortHours"] == "true" ? true : false;
+       var _enableEffortDays = v["enableEffortDays"] == "true" ? true : false;
   	   	if (v["id"] == mainWidget.softwareCompetition.projectHeader.getBillingProject()) {
   		   if (_cca) {
   			   $("#chkboxCCA").attr('disabled','true');
   		   }
-         if(_enableEffortHours) {
+         if(_enableEffortDays) {
            $(".effortEstimateRow").show();
          }
   	   }
@@ -1698,7 +1697,6 @@ function showTypeSectionEdit() {
        $('#copilots').data('customized',true);
     }
 
-
     if(!$('#milestones').data('customized')) {
         $('#milestones').sSelect({ddMaxHeight: '220',yscroll: true});
         $('#milestones').data('customized',true);
@@ -1715,7 +1713,6 @@ function showTypeSectionEdit() {
     }
 
 	 $('#contestTypes').getSetSSValue(mainWidget.competitionType + mainWidget.softwareCompetition.projectHeader.projectCategory.id);
-
     var projectType = mainWidget.competitionType;
     var projectCategoryId = mainWidget.softwareCompetition.projectHeader.projectCategory.id;
     setupReviewerDropdown(projectCategoryId, mainWidget.softwareCompetition.projectHeader.tcDirectProjectId);
@@ -2857,7 +2854,7 @@ function showPrizeSectionEdit() {
             $("#chkboxCCA").removeAttr('disabled');
         }
 
-        if($(this).find(":selected").data("enableEffortHours")) {
+        if($(this).find(":selected").data("enableEffortDays")) {
           $('.effortEstimateRow').show();
         } else {
           $('.effortEstimateRow').hide();
@@ -3637,8 +3634,8 @@ function handleProjectDropDownChange() {
 
     $.each(billingAccounts, function(key, value) {
     	var _cca = value["cca"] == "true" ? true : false;
-      var _enableEffortHours = value["enableEffortHours"] == "true" ? true : false;
-      $("#billingProjects").append($('<option></option>').val(value["id"]).text(value["name"]).data("cca", _cca).data("enableEffortHours", _enableEffortHours));
+      var _enableEffortDays = value["enableEffortHours"] == "true" ? true : false;
+      $("#billingProjects").append($('<option></option>').val(value["id"]).text(value["name"]).data("cca", _cca).data("enableEffortDays", _enableEffortDays));
     });
     $("#chkboxCCA").removeAttr('checked');
     $("#chkboxCCA").removeAttr('disabled');
@@ -3662,7 +3659,7 @@ function handleProjectDropDownChange() {
                 $("#chkboxCCA").removeAttr('disabled');
         }
 
-        if($(this).find(":selected").data("enableEffortHours")) {
+        if($(this).find(":selected").data("enableEffortDays")) {
           $('.effortEstimateRow').show();
         } else {
           $('.effortEstimateRow').hide();
diff --git a/src/web/scripts/launch/main.js b/src/web/scripts/launch/main.js
index 3880b80f2..41bcb2fb6 100644
--- a/src/web/scripts/launch/main.js
+++ b/src/web/scripts/launch/main.js
@@ -133,8 +133,8 @@
  * Version 4.6 (Topcoder - Support Points Prize Type For Challenges)
  * - Add support for points prize type
  *
- * Version 4.7 (Topcoder - Add effort hours field)
- * - Add enable effort hours
+ * Version 4.7 (Topcoder - Add effort days field)
+ * - Add enable effort days
  * @author isv, GreatKevin, bugbuka, GreatKevin, Veve, TCSCODER, TCSASSEMBER
  * @version 4.7
  */
@@ -300,7 +300,7 @@ $(document).ready(function() {
                                   contentType: 'application/json; charset=utf-8',
                                   async: false,
                                   beforeSend: function (xhr) {
-                                      xhr.setRequestHeader("Authorization", "Bearer " + $.cookie(jwtCookieName));
+                                    xhr.setRequestHeader("Authorization", "Bearer " + $.cookie(jwtCookieName));
                                   },
                                   success: function (jsonResult) {
                                     if (jQuery_1_11_1("#groups").magicSuggest().getValue().length > 0){
@@ -1195,8 +1195,9 @@ function saveAsDraftRequest() {
     }
 
     if($(".effortEstimateRow").is(":visible")) {
-      var effortHoursEstimate = $("input[name=effortHoursEstimate]").val();
-      mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'] = effortHoursEstimate;
+      var effortDaysEstimate = $("input[name=effortDaysEstimate]").val().trim();
+      if (effortDaysEstimate.length > 0) effortDaysEstimate *= 24;
+      mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'] = effortDaysEstimate;
     } else {
       mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'] = '';
     }
@@ -3467,18 +3468,18 @@ function validateFileTypes(errors) {
 }
 
 /**
- * Validates effort hours estimate.
+ * Validates effort days estimate.
  * @param errors array of errors
  */
-function validateEffortHoursEstimate(errors) {
-  if($("input[name=effortHoursEstimate]").is(":visible")
-    && $("input[name=effortHoursEstimate]").length > 0
-    && $.trim($("input[name=effortHoursEstimate]").val()).length > 0) {
-      var effortHoursEstimate = $("input[name=effortHoursEstimate]").val();
-      if(!checkNumber(effortHoursEstimate)) {
-          errors.push("The Effort Hours Estimate should be a number");
-      } else if(effortHoursEstimate == 0) {
-        errors.push("The Effort Hours Estimate should be positive");
+function validateEffortDaysEstimate(errors) {
+  if($("input[name=effortDaysEstimate]").is(":visible")
+    && $("input[name=effortDaysEstimate]").length > 0
+    && $.trim($("input[name=effortDaysEstimate]").val()).length > 0) {
+      var effortDaysEstimate = $("input[name=effortDaysEstimate]").val();
+      if(!checkNumber(effortDaysEstimate)) {
+          errors.push("The Effort Days Estimate should be a number");
+      } else if(effortDaysEstimate == 0) {
+        errors.push("The Effort Days Estimate should be positive");
       }
   }
 }
diff --git a/src/web/scripts/launch/pages/orderReview.js b/src/web/scripts/launch/pages/orderReview.js
index 7ff32a23c..5aacdfc79 100644
--- a/src/web/scripts/launch/pages/orderReview.js
+++ b/src/web/scripts/launch/pages/orderReview.js
@@ -51,8 +51,8 @@
  * Version 2.4 (Topcoder - Support Points Prize Type For Challenges)
  * - Add support for points prize type
  *
- * Version 2.5 (Topcoder - Add effort hours field)
- * - Add enable effort hours
+ * Version 2.5 (Topcoder - Add effort days field)
+ * - Add enable effort days
  *
  * @author pvmagacho, GreatKevin, bugbuka, GreatKevin, Veve, GreatKevin
  * @version 2.5
@@ -70,9 +70,11 @@ function updateOrderReviewAlgorithm() {
    $('#alorProject').html($("#projects option[value="+ mainWidget.softwareCompetition.projectHeader.tcDirectProjectId +"]").text());
 
    $('#alorBillingAccount').html((billingProjectId == -1)?"(not selected)":$("#billingProjects option[value="+ billingProjectId +"]").text());
-
-   $('#alorEffortHoursEstimate').html(mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate']);
-
+   if (mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'].toString().length > 0) {
+    $('#alorEffortDaysEstimate').html(mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'] / 24 );
+   } else {
+    $('#alorEffortDaysEstimate').html("");
+   }
    $('#alorStartDate').html(formatDateForReview(mainWidget.softwareCompetition.assetDTO.directjsProductionDate));
 
    //points
@@ -144,7 +146,11 @@ function updateOrderReviewSoftware() {
    $('#sworContestName').html(mainWidget.softwareCompetition.assetDTO.name);
    $('#sworProjectName').html($("#projects option[value="+ mainWidget.softwareCompetition.projectHeader.tcDirectProjectId +"]").text());
    $('#sworBillingAccount').html($("#billingProjects option[value="+ billingProjectId +"]").text());
-   $('#sworEffortHoursEstimate').html(mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate']);
+   if (mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'].toString().length > 0) {
+    $('#sworEffortDaysEstimate').html(mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'] / 24);
+   } else {
+    $('#sworEffortDaysEstimate').html("");
+   }
    $('#sworStartDate').html(formatDateForReview(mainWidget.softwareCompetition.assetDTO.directjsProductionDate));
 
    //points
@@ -296,8 +302,11 @@ function updateOrderReviewStudio() {
 
    $('#orBillingAccount').html((billingProjectId == -1)?"(not selected)":$("#billingProjects option[value="+ billingProjectId +"]").text());
 
-   $('#orEffortHoursEstimate').html(mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate']);
-
+   if (mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'].toString().length > 0) {
+    $('#orEffortDaysEstimate').html(mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'] / 24 );
+   } else {
+    $('#orEffortDaysEstimate').html("");
+   }
    $('#orStartDate').html(formatDateForReview(mainWidget.softwareCompetition.assetDTO.directjsProductionDate));
 
    //points
diff --git a/src/web/scripts/launch/pages/review.js b/src/web/scripts/launch/pages/review.js
index 3651dfb07..9591990e6 100644
--- a/src/web/scripts/launch/pages/review.js
+++ b/src/web/scripts/launch/pages/review.js
@@ -43,7 +43,11 @@ function updateReviewAlgorithm() {
 
    var billingProjectId = mainWidget.softwareCompetition.projectHeader.getBillingProject();
    $('#ralBillingAccount').html((billingProjectId == -1)?"&nbsp;":$("#billingProjects option[value="+ billingProjectId +"]").text());
-   $('#ralEffortHoursEstimate').html(mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate']);
+   if (mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'].toString().length > 0) {
+    $('#ralEffortDaysEstimate').html(mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'] / 24);
+   } else {
+    $('#ralEffortDaysEstimate').html("");
+   }
    $('#ralStartDate').html(formatDateForReview(mainWidget.softwareCompetition.assetDTO.directjsProductionDate));
 
    // to do
@@ -89,9 +93,11 @@ function updateReviewSoftware() {
 
    var billingProjectId = mainWidget.softwareCompetition.projectHeader.getBillingProject();
    $('#rswBillingAccount').html((billingProjectId == -1)?"&nbsp;":$("#billingProjects option[value="+ billingProjectId +"]").text());
-
-   $('#rswEffortHoursEstimate').html(mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate']);
-
+   if (mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'].toString().length > 0) {
+    $('#rswEffortDaysEstimate').html(mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'] / 24);
+   } else {
+    $('#rswEffortDaysEstimate').html("");
+   }
    $('#rswStartDate').html(formatDateForReview(mainWidget.softwareCompetition.assetDTO.directjsProductionDate));
 
    $('#rswDetailedRequirements').html(mainWidget.softwareCompetition.projectHeader.projectSpec.detailedRequirements);
@@ -248,8 +254,11 @@ function updateReviewStudio() {
     } else {
         $("#reviewPage .maxSubmissions").show();
     }
-
-    $('#rEffortHoursEstimate').html(mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate']);
+    if (mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'].toString().length > 0) {
+     $('#rEffortDaysEstimate').html(mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'] / 24);
+    } else {
+     $('#rEffortDaysEstimate').html("");
+    }
 }
 
 /**
diff --git a/src/web/scripts/launch/pages/selection.js b/src/web/scripts/launch/pages/selection.js
index aa749ccdc..e7881b096 100644
--- a/src/web/scripts/launch/pages/selection.js
+++ b/src/web/scripts/launch/pages/selection.js
@@ -58,7 +58,7 @@
  * Version 2.5 (Topcoder - Support Points Prize Type For Challenges)
  * - Add support for points prize type
  *
- * Version 2.6 (Topcoder - Add Effort Hours Field)
+ * Version 2.6 (Topcoder - Add Effort Days Field)
  * - Add support for effort hours estimate
  *
  * @version 2.6
@@ -120,7 +120,7 @@ function initCompetitionSelectionCommonData() {
 	var tcProjectId = parseInt($('select#projects').val());
 	var billingProjectId = parseInt($('select#billingProjects').val());
 	var isMultiRound = hasMultiRound(categoryId) && ('multi' == $('#roundTypes').val());
-  var effortHoursEstimate = $('input#effortHoursEstimate').val();
+  var effortDaysEstimate = $('input#effortDaysEstimate').val().trim();
 
 	// apply category id data
 	var projectCategory = getProjectCategoryById(categoryId);
@@ -143,7 +143,9 @@ function initCompetitionSelectionCommonData() {
   mainWidget.softwareCompetition.projectHeader.setProjectName(contestName);
 
   mainWidget.softwareCompetition.multiRound = isMultiRound;
-  mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'] = effortHoursEstimate;
+  // change to hours
+  if (effortDaysEstimate.length > 0) effortDaysEstimate *= 24;
+  mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'] = effortDaysEstimate;
 }
 
 function validateFieldsContestSelectionAlgorithm() {
@@ -171,7 +173,7 @@ function validateFieldsContestSelectionAlgorithm() {
     errors.push('Marathon match type is required');
    }
 
-   validateEffortHoursEstimate(errors);
+   validateEffortDaysEstimate(errors);
 
    // validate schedule
    if(startDate >= regEndDate) {
@@ -264,7 +266,7 @@ function validateFieldsContestSelectionSoftware() {
         }
     }
 
-    validateEffortHoursEstimate(errors);
+    validateEffortDaysEstimate(errors);
 
     if (regEndDate.getTime() <= startDate.getTime()) {
       errors.push('Registration end date/time should be larger than Start date/time.');
@@ -413,7 +415,7 @@ function validateFieldsContestSelectionStudio() {
        validateDirectProjectMilestone(projectMilestoneId, errors);
    }
 
-   validateEffortHoursEstimate(errors);
+   validateEffortDaysEstimate(errors);
 
    if(isMultiRound) {
       if (checkpointDateHours == 0) {
diff --git a/src/web/scripts/launchcontest.js b/src/web/scripts/launchcontest.js
index b4b9698f0..e63914c27 100644
--- a/src/web/scripts/launchcontest.js
+++ b/src/web/scripts/launchcontest.js
@@ -82,7 +82,7 @@
  * Version 2.12 (Topcoder - Support Points Prize Type For Challenges)
  * - Fix the bug the round info not properly shown/hidden when changing contest type
  *
- * Version 2.13 (Topcoder - Add effort hours field)
+ * Version 2.13 (Topcoder - Add effort days field)
  * - Add support for enable effort hours
  * @author GreatKevin, csy2012, bugbuka, TCSCODER
  * @version 2.13
@@ -385,9 +385,9 @@ $(document).ready(function() {
     });
 
     $('.ms-row.effortEstimateRow .helpme').hover(function() {
-        showPopup(this, 'effortHourToolTip');
+        showPopup(this, 'effortDaysToolTip');
     }, function() {
-        $('#effortHourToolTip').hide();
+        $('#effortDaysToolTip').hide();
     });
 
     $('#assembly_bug_hunt .helpme').hover(function () {
@@ -658,8 +658,8 @@ function handleProjectDropDownChange() {
 
 
     $.each(billingAccounts, function(key, value) {
-
-        $("#billingProjects").append($('<option></option>').val(value["id"]).html(value["name"]).data("cca", (value["cca"] == "true" ? true : false)).data("enableEffortHours", value["enableEffortHours"]));
+        var _enableEffortDays = value["enableEffortHours"] == "true" ? true : false;
+        $("#billingProjects").append($('<option></option>').val(value["id"]).html(value["name"]).data("cca", (value["cca"] == "true" ? true : false)).data("enableEffortDays", _enableEffortDays));
 
         if(value["id"] == $("input[name=CMCBillingID]").val()) {
             CMCBillingExisting = true;
@@ -670,7 +670,7 @@ function handleProjectDropDownChange() {
     $("#billingProjects").val(0);
 
     if(hasCMCBilling && !CMCBillingExisting) {
-        $("#billingProjects").append($('<option></option>').val($("input[name=CMCBillingID]").val()).html($("input[name=CMCBillingName]").val()).data("cca", false).data("enableEffortHours", value["enableEffortHours"]));
+        $("#billingProjects").append($('<option></option>').val($("input[name=CMCBillingID]").val()).html($("input[name=CMCBillingName]").val()).data("cca", false).data("enableEffortDays", value["enableEffortDays"]));
     }
 
     $("#billingProjects").resetSS();
@@ -683,7 +683,7 @@ function handleProjectDropDownChange() {
             $("#lccCheckBox").removeAttr('disabled');
         }
 
-        if($(this).find(":selected").data("enableEffortHours")) {
+        if($(this).find(":selected").data("enableEffortDays")) {
           $('.effortEstimateRow').show();
         } else {
           $('.effortEstimateRow').hide();