diff --git a/src/main/java/com/techlooper/util/DataUtils.java b/src/main/java/com/techlooper/util/DataUtils.java
index 49e489462..b914cffb2 100644
--- a/src/main/java/com/techlooper/util/DataUtils.java
+++ b/src/main/java/com/techlooper/util/DataUtils.java
@@ -34,15 +34,15 @@ public static Set<ChallengeCriteria> defaultChallengeCriterias(Language lang) {
     Set<ChallengeCriteria> defaultCriterias = new HashSet<>();
     if (lang == Language.en) {
       defaultCriterias.add(ChallengeCriteria.ChallengeCriteriaBuilder.challengeCriteria()
-        .withName("default.uiuxIpml").withWeight(20L).build());
+        .withName("UI/UX implemented solution").withWeight(20L).build());
       defaultCriterias.add(ChallengeCriteria.ChallengeCriteriaBuilder.challengeCriteria()
-        .withName("default.creativeSolution").withWeight(20L).build());
+        .withName("Creativity on the proposed solution").withWeight(20L).build());
       defaultCriterias.add(ChallengeCriteria.ChallengeCriteriaBuilder.challengeCriteria()
-        .withName("default.srcQuality").withWeight(20L).build());
+        .withName("Source code quality").withWeight(20L).build());
       defaultCriterias.add(ChallengeCriteria.ChallengeCriteriaBuilder.challengeCriteria()
-        .withName("default.topEdgeTech").withWeight(20L).build());
+        .withName("Usage of top edge technology").withWeight(20L).build());
       defaultCriterias.add(ChallengeCriteria.ChallengeCriteriaBuilder.challengeCriteria()
-        .withName("default.appFunction").withWeight(20L).build());
+        .withName("Application functionality").withWeight(20L).build());
     }
     else {
       defaultCriterias.add(ChallengeCriteria.ChallengeCriteriaBuilder.challengeCriteria()
diff --git a/src/main/webapp/assets/modules/common/feedback/feedback.html b/src/main/webapp/assets/modules/common/feedback/feedback.html
index f091a3580..c34ef49f2 100644
--- a/src/main/webapp/assets/modules/common/feedback/feedback.html
+++ b/src/main/webapp/assets/modules/common/feedback/feedback.html
@@ -16,10 +16,10 @@
           <label class="col-sm-2 control-label" translate="template"></label>
 
           <div class="col-sm-10">
-            <select ng-model="composeEmail.templateId"
+            <selectize ng-model="composeEmail.templateId"
                     config="{maxItems: 1, placeholder: ('exChooseATemplate' | translate)}"
-                    ng-change="loadEmailTemplate()" options="emailTemplates" selectize>
-            </select>
+                    ng-change="loadEmailTemplate()" options="emailTemplates">
+            </selectize>
           </div>
         </div>
         <div class="form-group">
diff --git a/src/main/webapp/assets/modules/common/model/challengeDetail.js b/src/main/webapp/assets/modules/common/model/challengeDetail.js
index 21bea485e..33ae19e65 100644
--- a/src/main/webapp/assets/modules/common/model/challengeDetail.js
+++ b/src/main/webapp/assets/modules/common/model/challengeDetail.js
@@ -32,7 +32,7 @@ techlooper.filter("challengeDetail", function (apiService, $rootScope, jsonValue
 
     challengeDetail.addCriteria = function () {
       challengeDetail.criteria = challengeDetail.criteria || [];
-      challengeDetail.criteria.push({index: challengeDetail.criteria.length++});
+      challengeDetail.criteria.push({index: challengeDetail.criteria.length + 1});
     }
 
     challengeDetail.removeCriteria = function (cri) {