diff --git a/views/js/controller/creator/templates/itemref-props.tpl b/views/js/controller/creator/templates/itemref-props.tpl
index 24d490642..e82f9f32c 100644
--- a/views/js/controller/creator/templates/itemref-props.tpl
+++ b/views/js/controller/creator/templates/itemref-props.tpl
@@ -135,10 +135,10 @@
     <div class="itemref-item-session-control toggled">
 <!-- assessmentTest/testPart/assessmentSection/sectionPart/itemSessionControl/maxAttempts -->
         <div class="grid-row">
-            <div class="col-5">
+            <div class="col-6">
                 <label for="itemref-max-attempts">{{__ 'Max Attempts'}}</label>
             </div>
-            <div class="col-6">
+            <div class="col-5">
                 <input
                         name="itemref-max-attempts"
                         type="text"
@@ -161,10 +161,10 @@
         {{#if itemSessionShowFeedback}}
             <!-- assessmentTest/testPart/assessmentSection/sectionPart/itemSessionControl/showFeedback -->
             <div class="grid-row pseudo-label-box checkbox-row">
-                <div class="col-5">
+                <div class="col-6">
                     <label for="itemref-show-feedback">{{__ 'Show Feedback'}}</label>
                 </div>
-                <div class="col-6">
+                <div class="col-5">
                     <label>
                         <input type="checkbox" name="itemref-show-feedback" value="true" data-bind="itemSessionControl.showFeedback" data-bind-encoder="boolean" />
                         <span class="icon-checkbox"></span>
@@ -182,10 +182,10 @@
 {{!-- Property not yet available in delivery
 <!-- assessmentTest/testPart/assessmentSection/sectionPart/itemSessionControl/allowReview -->
         <div class="grid-row pseudo-label-box checkbox-row">
-            <div class="col-5">
+            <div class="col-6">
                 <label for="itemref-show-allow-review">{{__ 'Allow Review'}}</label>
             </div>
-            <div class="col-6">
+            <div class="col-5">
                 <label>
                     <input type="checkbox" name="itemref-allow-review" value="true" checked="checked" data-bind="itemSessionControl.allowReview" data-bind-encoder="boolean" />
                     <span class="icon-checkbox"></span>
@@ -203,10 +203,10 @@
 {{!-- Property not yet available in delivery
 <!-- assessmentTest/testPart/assessmentSection/sectionPart/itemSessionControl/showSolution -->
         <div class="grid-row pseudo-label-box checkbox-row">
-            <div class="col-5">
+            <div class="col-6">
                 <label for="itemref-show-solution">{{__ 'Show Solution'}}</label>
             </div>
-            <div class="col-6">
+            <div class="col-5">
                 <label>
                     <input type="checkbox" name="itemref-show-solution" value="true"  data-bind="itemSessionControl.showSolution" data-bind-encoder="boolean" />
                     <span class="icon-checkbox"></span>
@@ -224,10 +224,10 @@
 <!-- assessmentTest/testPart/assessmentSection/sectionPart/itemSessionControl/allowComment -->
         {{#if itemSessionAllowComment}}
             <div class="grid-row pseudo-label-box checkbox-row">
-                <div class="col-5">
+                <div class="col-6">
                     <label for="itemref-allow-comment">{{__ 'Allow Comment'}}</label>
                 </div>
-                <div class="col-6">
+                <div class="col-5">
                     <label>
                         <input type="checkbox" name="itemref-allow-comment" value="true"  data-bind="itemSessionControl.allowComment" data-bind-encoder="boolean" />
                         <span class="icon-checkbox"></span>
@@ -245,10 +245,10 @@
 <!-- assessmentTest/testPart/assessmentSection/sectionPart/itemSessionControl/allowSkipping -->
         {{#if itemSessionAllowSkipping}}
             <div class="grid-row pseudo-label-box checkbox-row">
-                <div class="col-5">
+                <div class="col-6">
                     <label for="itemref-allow-skipping">{{__ 'Allow Skipping'}}</label>
                 </div>
-                <div class="col-6">
+                <div class="col-5">
                     <label>
                         <input type="checkbox" name="itemref-allow-skipping" value="true" checked="checked" data-bind="itemSessionControl.allowSkipping" data-bind-encoder="boolean" />
                         <span class="icon-checkbox"></span>
@@ -266,10 +266,10 @@
         {{#if validateResponsesVisible}}
             <!-- assessmentTest/testPart/assessmentSection/sectionPart/itemSessionControl/validateResponses -->
             <div class="grid-row pseudo-label-box checkbox-row">
-                <div class="col-5">
-                    <label for="itemref-validate-responses">{{__ 'Validate Responses'}}</label>
-                </div>
                 <div class="col-6">
+                    <label for="itemref-validate-responses">{{__ 'Enforce Item Constraints'}}</label>
+                </div>
+                <div class="col-5">
                     <label>
                         <input type="checkbox" name="itemref-validate-responses" value="true" data-bind="itemSessionControl.validateResponses" data-bind-encoder="boolean" />
                         <span class="icon-checkbox"></span>
@@ -278,7 +278,7 @@
                 <div class="col-1 help">
                     <span class="icon-help" data-tooltip="~ .tooltip-content" data-tooltip-theme="info"></span>
                     <div class="tooltip-content">
-                    {{__ "The candidate is not allowed to submit invalid responses."}}
+                    {{__ "Checking this box prevents the test-taker from navigating to other items until the current item constraints, if any, are met. Unchecking this box will allow free navigation even if the responses don't comply with the item constraints set."}}
                     </div>
                 </div>
             </div>
diff --git a/views/js/controller/creator/templates/section-props.tpl b/views/js/controller/creator/templates/section-props.tpl
index f33983caa..b6ab2c2d2 100644
--- a/views/js/controller/creator/templates/section-props.tpl
+++ b/views/js/controller/creator/templates/section-props.tpl
@@ -277,10 +277,10 @@
     <div class="section-item-session-control toggled">
 <!-- assessmentTest/testPart/assessmentSection/itemSessionControl/maxAttempts -->
         <div class="grid-row">
-            <div class="col-5">
+            <div class="col-6">
                 <label for="section-max-attempts">{{__ 'Max Attempts'}}</label>
             </div>
-            <div class="col-6">
+            <div class="col-5">
                 <input
                         id="section-max-attempts"
                         type="text"
@@ -303,10 +303,10 @@
 <!-- assessmentTest/testPart/assessmentSection/itemSessionControl/showFeedback -->
         {{#if itemSessionShowFeedback}}
             <div class="grid-row pseudo-label-box checkbox-row">
-                <div class="col-5">
+                <div class="col-6">
                     <label for="section-show-feedback">{{__ 'Show Feedback'}}</label>
                 </div>
-                <div class="col-6">
+                <div class="col-5">
                     <label>
                         <input type="checkbox" name="section-show-feedback" value="true" data-bind="itemSessionControl.showFeedback" data-bind-encoder="boolean" />
                         <span class="icon-checkbox"></span>
@@ -324,10 +324,10 @@
 {{!-- Property not yet available in delivery
 <!-- assessmentTest/testPart/assessmentSection/itemSessionControl/allowReview -->
         <div class="grid-row pseudo-label-box checkbox-row">
-            <div class="col-5">
+            <div class="col-6">
                 <label for="section-show-allow-review">{{__ 'Allow Review'}}</label>
             </div>
-            <div class="col-6">
+            <div class="col-5">
                 <label>
                     <input type="checkbox" name="section-allow-review" value="true" checked="checked" data-bind="itemSessionControl.allowReview" data-bind-encoder="boolean" />
                     <span class="icon-checkbox"></span>
@@ -345,10 +345,10 @@
 {{!-- Property not yet available in delivery
 <!-- assessmentTest/testPart/assessmentSection/itemSessionControl/showSolution -->
         <div class="grid-row pseudo-label-box checkbox-row">
-            <div class="col-5">
+            <div class="col-6">
                 <label for="section-show-solution">{{__ 'Show Solution'}}</label>
             </div>
-            <div class="col-6">
+            <div class="col-5">
                 <label>
                     <input type="checkbox" name="section-show-solution" value="true"  data-bind="itemSessionControl.showSolution" data-bind-encoder="boolean" />
                     <span class="icon-checkbox"></span>
@@ -366,10 +366,10 @@
 <!-- assessmentTest/testPart/assessmentSection/itemSessionControl/allowComment -->
         {{#if itemSessionAllowComment}}
             <div class="grid-row pseudo-label-box checkbox-row">
-                <div class="col-5">
+                <div class="col-6">
                     <label for="section-allow-comment">{{__ 'Allow Comment'}}</label>
                 </div>
-                <div class="col-6">
+                <div class="col-5">
                     <label>
                         <input type="checkbox" name="section-allow-comment" value="true"  data-bind="itemSessionControl.allowComment" data-bind-encoder="boolean" />
                         <span class="icon-checkbox"></span>
@@ -387,10 +387,10 @@
 <!-- assessmentTest/testPart/assessmentSection/itemSessionControl/allowSkipping -->
         {{#if itemSessionAllowSkipping}}
             <div class="grid-row pseudo-label-box checkbox-row">
-                <div class="col-5">
+                <div class="col-6">
                     <label for="section-allow-skipping">{{__ 'Allow Skipping'}}</label>
                 </div>
-                <div class="col-6">
+                <div class="col-5">
                     <label>
                         <input type="checkbox" name="section-allow-skipping" value="true" checked="checked" data-bind="itemSessionControl.allowSkipping" data-bind-encoder="boolean" />
                         <span class="icon-checkbox"></span>
@@ -408,10 +408,10 @@
         {{#if validateResponsesVisible}}
             <!-- assessmentTest/testPart/assessmentSection/itemSessionControl/validateResponses -->
             <div class="grid-row pseudo-label-box checkbox-row">
-                <div class="col-5">
-                    <label for="section-validate-responses">{{__ 'Validate Responses'}}</label>
-                </div>
                 <div class="col-6">
+                    <label for="section-validate-responses">{{__ 'Enforce Item Constraints'}}</label>
+                </div>
+                <div class="col-5">
                     <label>
                         <input type="checkbox" name="section-validate-responses" value="true" data-bind="itemSessionControl.validateResponses" data-bind-encoder="boolean" />
                         <span class="icon-checkbox"></span>
@@ -420,7 +420,7 @@
                 <div class="col-1 help">
                     <span class="icon-help" data-tooltip="~ .tooltip-content" data-tooltip-theme="info"></span>
                     <div class="tooltip-content">
-                    {{__ "The candidate is not allowed to submit invalid responses."}}
+                    {{__ "Checking this box prevents the test-taker from navigating to other items until the current item constraints, if any, are met. Unchecking this box will allow free navigation even if the responses don't comply with the item constraints set."}}
                     </div>
                 </div>
             </div>
diff --git a/views/js/controller/creator/templates/testpart-props.tpl b/views/js/controller/creator/templates/testpart-props.tpl
index 2ff55e65d..d9f3e274e 100644
--- a/views/js/controller/creator/templates/testpart-props.tpl
+++ b/views/js/controller/creator/templates/testpart-props.tpl
@@ -130,10 +130,10 @@
 
 <!-- assessmentTest/testPart/itemSessionControl/maxAttempts -->
             <div class="grid-row">
-                <div class="col-5">
+                <div class="col-6">
                     <label for="testpart-max-attempts">{{__ 'Max Attempts'}}</label>
                 </div>
-                <div class="col-6">
+                <div class="col-5">
                     <input
                             id="testpart-max-attempts"
                             type="text"
@@ -156,10 +156,10 @@
 <!-- assessmentTest/testPart/itemSessionControl/showFeedback -->
             {{#if itemSessionShowFeedback}}
                 <div class="grid-row pseudo-label-box checkbox-row">
-                    <div class="col-5">
+                    <div class="col-6">
                         <label for="testpart-show-feedback">{{__ 'Show Feedback'}}</label>
                     </div>
-                    <div class="col-6">
+                    <div class="col-5">
                         <label>
                             <input type="checkbox" name="testpart-show-feedback" value="true" data-bind="itemSessionControl.showFeedback" data-bind-encoder="boolean" />
                             <span class="icon-checkbox"></span>
@@ -177,10 +177,10 @@
 {{!-- Property not yet available in delivery
 <!-- assessmentTest/testPart/itemSessionControl/allowReview -->
             <div class="grid-row pseudo-label-box checkbox-row">
-                <div class="col-5">
+                <div class="col-6">
                     <label for="testpart-show-allow-review">{{__ 'Allow Review'}}</label>
                 </div>
-                <div class="col-6">
+                <div class="col-5">
                     <label>
                         <input type="checkbox" name="testpart-allow-review" value="true" checked="checked"  data-bind="itemSessionControl.allowReview" data-bind-encoder="boolean" />
                         <span class="icon-checkbox" />
@@ -198,10 +198,10 @@
 {{!-- Property not yet available in delivery
 <!-- assessmentTest/testPart/itemSessionControl/showSolution -->
             <div class="grid-row pseudo-label-box checkbox-row">
-                <div class="col-5">
+                <div class="col-6">
                     <label for="testpart-show-solution">{{__ 'Show Solution'}}</label>
                 </div>
-                <div class="col-6">
+                <div class="col-5">
                     <label>
                         <input type="checkbox" name="testpart-show-solution" value="true"  data-bind="itemSessionControl.showSolution" data-bind-encoder="boolean"  />
                         <span class="icon-checkbox" />
@@ -219,10 +219,10 @@
 <!-- assessmentTest/testPart/itemSessionControl/allowComment -->
             {{#if itemSessionAllowComment}}
                 <div class="grid-row pseudo-label-box checkbox-row">
-                    <div class="col-5">
+                    <div class="col-6">
                         <label for="testpart-allow-comment">{{__ 'Allow Comment'}}</label>
                     </div>
-                    <div class="col-6">
+                    <div class="col-5">
                         <label>
                             <input type="checkbox" name="testpart-allow-comment" value="true" data-bind="itemSessionControl.allowComment" data-bind-encoder="boolean" />
                             <span class="icon-checkbox"></span>
@@ -240,10 +240,10 @@
 <!-- assessmentTest/testPart/itemSessionControl/allowSkipping -->
             {{#if itemSessionAllowSkipping}}
                 <div class="grid-row pseudo-label-box checkbox-row">
-                    <div class="col-5">
+                    <div class="col-6">
                         <label for="testpart-allow-skipping">{{__ 'Allow Skipping'}}</label>
                     </div>
-                    <div class="col-6">
+                    <div class="col-5">
                         <label>
                             <input type="checkbox" name="testpart-allow-skipping" value="true" checked="checked"  data-bind="itemSessionControl.allowSkipping" data-bind-encoder="boolean"   />
                             <span class="icon-checkbox"></span>
@@ -260,10 +260,10 @@
 
 <!-- assessmentTest/testPart/itemSessionControl/validateResponses -->
             <div class="grid-row pseudo-label-box checkbox-row">
-                <div class="col-5">
-                    <label for="testpart-validate-responses">{{__ 'Validate Responses'}}</label>
-                </div>
                 <div class="col-6">
+                    <label for="testpart-validate-responses">{{__ 'Enforce Item Constraints'}}</label>
+                </div>
+                <div class="col-5">
                     <label>
                         <input type="checkbox" name="testpart-validate-responses" value="true"  data-bind="itemSessionControl.validateResponses" data-bind-encoder="boolean"  />
                         <span class="icon-checkbox"></span>
@@ -272,7 +272,7 @@
                 <div class="col-1 help">
                     <span class="icon-help" data-tooltip="~ .tooltip-content" data-tooltip-theme="info"></span>
                     <div class="tooltip-content">
-                    {{__ "The candidate is not allowed to submit invalid responses."}}
+                    {{__ "Checking this box prevents the test-taker from navigating to other items until the current item constraints, if any, are met. Unchecking this box will allow free navigation even if the responses don't comply with the item constraints set."}}
                     </div>
                 </div>
             </div>