diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
index 43471d46c06..8055267f5e6 100644
--- a/application/helpers/qanda_helper.php
+++ b/application/helpers/qanda_helper.php
@@ -975,49 +975,64 @@ function do_5pointchoice($ia)
     $checkconditionFunction = "checkconditions";
     $aQuestionAttributes=  getQuestionAttributeValues($ia[0]);
     $id = 'slider'.time().rand(0,100);
-    //$answer = "\n<ul id=\"{$id}\" class=\"list-unstyled answers-list radio-list\">\n";
-    $answer = "\n<div id=\"{$id}\" class=\"answers-list five-point-choice radio-list\">\n";
+
+    $answer = Yii::app()->getController()->renderPartial('/survey/questions/5pointchoice/5pointchoice_header', array('id'=>$id), true);
+
     for ($fp=1; $fp<=5; $fp++)
     {
-        $answer .= "\t<div class=\"col-xs-2 answer-item radio-item\">\n<input class=\"radio\" type=\"radio\" name=\"$ia[1]\" id=\"answer$ia[1]$fp\" value=\"$fp\"";
+        $checkedState = '';
         if ($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]] == $fp)
         {
-            $answer .= CHECKED;
+            //$answer .= CHECKED;
+            $checkedState = ' CHECKED ';
         }
-        $answer .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />\n<label for=\"answer$ia[1]$fp\" class=\"answertext\">$fp</label>\n\t</div>\n";
+
+        $aData = array(
+            'ia' => $ia,
+            'fp' => $fp,
+            'checkedState' => $checkedState,
+            'checkconditionFunction' => $checkconditionFunction,
+        );
+        $answer .= Yii::app()->getController()->renderPartial('/survey/questions/5pointchoice/item_row', $aData, true);
     }
     if ($ia[6] != "Y"  && SHOW_NO_ANSWER == 1) // Add "No Answer" option if question is not mandatory
     {
-        $answer .= "\t<div class=\"col-xs-2 answer-item radio-item noanswer-item\">\n<input class=\"radio\" type=\"radio\" name=\"$ia[1]\" id=\"answer".$ia[1]."NANS\" value=\"\"";
+        $checkedState = '';
         if (!$_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]])
         {
-            $answer .= CHECKED;
+            $checkedState = ' CHECKED ';
         }
-        $answer .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />\n<label for=\"answer".$ia[1]."NANS\" class=\"answertext\">".gT('No answer')."</label>\n\t</div>\n";
+        $aData = array(
+            'ia' => $ia,
+            'checkedState' => $checkedState,
+            'checkconditionFunction' => $checkconditionFunction,
+        );
+        $answer .= Yii::app()->getController()->renderPartial('/survey/questions/5pointchoice/item_noanswer_row', $aData, true);
 
     }
-    $answer .= "</div>\n<input type=\"hidden\" name=\"java$ia[1]\" id=\"java$ia[1]\" value=\"".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]]."\" />\n";
+    $sJavaValue = $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]];
+
     $inputnames[]=$ia[1];
 
     if($aQuestionAttributes['slider_rating']==1){
+        $slider_rating = 1;
         Yii::app()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . 'star-rating.css');
         Yii::app()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts')."star-rating.js");
-        $answer .= "<script type='text/javascript'>\n"
-        . "  <!--\n"
-        ." doRatingStar({$ia[0]});\n"
-        ." -->\n"
-        ."</script>\n";
     }
 
     if($aQuestionAttributes['slider_rating']==2){
+        $slider_rating = 2;
         Yii::app()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . 'slider-rating.css');
         Yii::app()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts')."slider-rating.js");
-        $answer .= "<script type='text/javascript'>\n"
-        . " <!--\n"
-        ." doRatingSlider({$ia[0]});\n"
-        ." -->\n"
-        ."</script>\n";
     }
+
+    $aData = array(
+        'ia' => $ia,
+        'sJavaValue' => $sJavaValue,
+        'slider_rating' => $slider_rating,
+    );
+    $answer = Yii::app()->getController()->renderPartial('/survey/questions/5pointchoice/5pointchoice_footer', $aData, true);
+
     return array($answer, $inputnames);
 }
 
diff --git a/application/views/survey/questions/5pointchoice/5pointchoice_footer.php b/application/views/survey/questions/5pointchoice/5pointchoice_footer.php
new file mode 100644
index 00000000000..b7ed22fff15
--- /dev/null
+++ b/application/views/survey/questions/5pointchoice/5pointchoice_footer.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * 5 point choice : Footer
+ *
+ * @var $ia
+ * @var $sJavaValue
+ * @var slider_rating
+ */
+?>
+</div>
+<input
+    type="hidden"
+    name="java<?php echo $ia[1];?>"
+    id="java<?php echo $ia[1];?>"
+    value="<?php echo $sJavaValue;?>"
+/>
+<?php if($slider_rating==1):?>
+    <script type='text/javascript'>
+    <!--
+        doRatingStar( <?php echo $ia[0];?> );
+    -->
+    </script>
+<?php elseif($slider_rating==2):?>
+    <script type='text/javascript'>
+    <!--
+        doRatingSlider( <?php echo $ia[0]; ?> );
+    -->
+    </script>
+<?php endif;?>
diff --git a/application/views/survey/questions/5pointchoice/5pointchoice_header.php b/application/views/survey/questions/5pointchoice/5pointchoice_header.php
new file mode 100644
index 00000000000..a8ed31ab36a
--- /dev/null
+++ b/application/views/survey/questions/5pointchoice/5pointchoice_header.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * 5 point choice Html : Header
+ * @var $id
+ */
+?>
+
+<div id="<?php echo $id; ?>" class="answers-list five-point-choice radio-list">
diff --git a/application/views/survey/questions/5pointchoice/item_noanswer_row.php b/application/views/survey/questions/5pointchoice/item_noanswer_row.php
new file mode 100644
index 00000000000..e4d51a1a324
--- /dev/null
+++ b/application/views/survey/questions/5pointchoice/item_noanswer_row.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * 5 point choice Html : item 'no answer' row
+ *
+ * @var $ia
+ * @var $checkedState
+ * @var $checkconditionFunction
+ */
+?>
+
+<div class="col-xs-2 answer-item radio-item noanswer-item">
+    <input
+        class="radio"
+        type="radio"
+        name="<?php echo $ia[1]; ?>"
+        id="answer<?php echo $ia[1]; ?>NANS"
+        value=""
+        <?php echo $checkedState; ?>
+        onclick="<?php echo $checkconditionFunction; ?>(this.value, this.name, this.type);"
+    />
+    <label for="answer<?php echo $ia[1];?>NANS" class="answertext">
+        <?php echo gT('No answer'); ?>
+    </label>
+</div>
diff --git a/application/views/survey/questions/5pointchoice/item_row.php b/application/views/survey/questions/5pointchoice/item_row.php
new file mode 100644
index 00000000000..a1c7ad3e6e8
--- /dev/null
+++ b/application/views/survey/questions/5pointchoice/item_row.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * 5 point choice Html : item row
+ *
+ * @var $ia
+ * @var $fp
+ * @var $checkedState
+ * @var $checkconditionFunction
+ */
+?>
+
+<div class="col-xs-2 answer-item radio-item">
+    <input
+        class="radio"
+        type="radio"
+        name="<?php echo $ia[1]; ?>"
+        id="answer<?php echo $ia[1].$fp; ?>"
+        value="<?php echo $fp;?>"
+        <?php echo $checkedState; ?>
+        onclick="<?php echo $checkconditionFunction; ?>(this.value, this.name, this.type)"
+    />
+    <label for="answer<?php echo $ia[1].$fp; ?>" class="answertext">
+        <?php echo $fp; ?>
+    </label>
+</div>