diff --git a/application/config/packages.php b/application/config/packages.php
index 4b805dd26bb..45adb871952 100644
--- a/application/config/packages.php
+++ b/application/config/packages.php
@@ -104,7 +104,7 @@
         )
     ),
     'adminpanel' => array(
-        'devBaseUrl' => 'assets/packages/adminpanel/build/',
+        //'devBaseUrl' => 'assets/packages/adminpanel/build/',
         'basePath' => 'core.adminpanel.build',
         'coreScriptPosition'=>CClientScript::POS_END,
         'defaultScriptFilePosition' =>CClientScript::POS_END,
diff --git a/application/views/admin/survey/subview/accordion/_presentation_panel.php b/application/views/admin/survey/subview/accordion/_presentation_panel.php
index 8f2f27c95f3..c1c1cf48c3f 100644
--- a/application/views/admin/survey/subview/accordion/_presentation_panel.php
+++ b/application/views/admin/survey/subview/accordion/_presentation_panel.php
@@ -5,385 +5,385 @@
 ?>
 
 <!-- Presentation panel -->
-<div id='presentation' class="tab-pane fade in">
-
-
-    <!-- welcome screen -->
-    <div class="form-group">
-        <label class="col-sm-5 control-label" for='showwelcome'><?php  eT("Show welcome screen:") ; ?></label>
-        <div class="col-sm-7">
-            <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                'name' => 'showwelcome',
-                'value'=> $esrow['showwelcome'] == "Y",
-                'onLabel'=>gT('On'),
-                'offLabel'=>gT('Off')
-                ));
-            ?>
-        </div>
-    </div>
-
-    <!-- Navigation delay -->
-    <div class="form-group">
-        <label class="col-sm-5 control-label" for='navigationdelay'><?php  eT("Navigation delay (seconds):"); ?></label>
-        <div class="col-sm-7">
-            <input type='text' class="form-control" value="<?php echo $esrow['navigationdelay']; ?>" name='navigationdelay' id='navigationdelay' size='12' maxlength='2' onkeypress="return goodchars(event,'0123456789')" />
-        </div>
-    </div>
-
-    <!-- Show [<< Prev] button -->
-    <div class="form-group">
-        <label class="col-sm-5 control-label" for='allowprev'><?php  eT("Allow backward navigation:"); ?></label>
-        <div class="col-sm-7">
-            <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                'name' => 'allowprev',
-                'value'=> $esrow['allowprev'] == "Y",
-                'onLabel'=>gT('On'),
-                'offLabel'=>gT('Off')
-                ));
-            ?>
-        </div>
-    </div>
-
-    <!-- Show question index -->
-    <div class="form-group">
-        <label class="col-sm-5 control-label" for='questionindex'><?php  eT("Show question index / allow jumping:"); ?></label>
-        <div class="col-sm-7">
-
-        <?php $this->widget('yiiwheels.widgets.buttongroup.WhButtonGroup', array(
-                'name' => 'questionindex',
-                'value'=> $esrow['questionindex'] ,
-                'selectOptions'=>array(
-                    0 => gT('Disabled','unescaped'),
-                    1 => gT('Incremental','unescaped'),
-                    2 => gT('Full','unescaped'))
-                ));?>
-        </div>
-    </div>
-
-    <!-- Keyboard-less operation -->
-    <div class="form-group">
-        <label class="col-sm-5 control-label" for='nokeyboard'><?php  eT("Show on-screen keyboard:"); ?></label>
-        <div class="col-sm-7">
-            <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                'name' => 'nokeyboard',
-                'value'=> $esrow['nokeyboard'] == "Y",
-                'onLabel'=>gT('On'),
-                'offLabel'=>gT('Off')
-                ));
-            ?>
-        </div>
-    </div>
-
-    <!-- Show progress bar -->
-    <div class="form-group">
-        <label class="col-sm-5 control-label" for='showprogress'><?php  eT("Show progress bar:"); ?></label>
-        <div class="col-sm-7">
-            <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                'name' => 'showprogress',
-                'value'=> $esrow['showprogress'] == "Y",
-                'onLabel'=>gT('On'),
-                'offLabel'=>gT('Off')
-                ));
-            ?>
-        </div>
-    </div>
-
-    <!-- Participants may print answers -->
-    <div class="form-group">
-        <label class="col-sm-5 control-label" for='printanswers'><?php  eT("Participants may print answers:"); ?></label>
-        <div class="col-sm-7">
-            <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                'name' => 'printanswers',
-                'value'=> $esrow['printanswers'] == "Y",
-                'onLabel'=>gT('On'),
-                'offLabel'=>gT('Off')
-                ));
-            ?>
-        </div>
-    </div>
-
-    <!-- Public statistics -->
-    <div class="form-group">
-        <label class="col-sm-5 control-label" for='publicstatistics'><?php  eT("Public statistics:"); ?></label>
-        <div class="col-sm-7">
-            <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                'name' => 'publicstatistics',
-                'value'=> $esrow['publicstatistics'] == "Y",
-                'onLabel'=>gT('On'),
-                'offLabel'=>gT('Off')
-                ));
-            ?>
-        </div>
-    </div>
-
-    <!-- Show graphs in public statistics -->
-    <div class="form-group">
-        <label class="col-sm-5 control-label" for='publicgraphs'><?php  eT("Show graphs in public statistics:"); ?></label>
-        <div class="col-sm-7">
-            <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                'name' => 'publicgraphs',
-                'value'=> $esrow['publicgraphs'] == "Y",
-                'onLabel'=>gT('On'),
-                'offLabel'=>gT('Off')
-                ));
-            ?>
+<div id='presentation' class="container">
+    <div class="col-sm-12 col-md-6">
+        <!-- Navigation delay -->
+        <div class="form-group">
+            <label class="col-sm-5 control-label" for='navigationdelay'><?php  eT("Navigation delay (seconds):"); ?></label>
+            <div class="col-sm-7">
+                <input type='text' class="form-control" value="<?php echo $esrow['navigationdelay']; ?>" name='navigationdelay' id='navigationdelay' size='12' maxlength='2' onkeypress="return goodchars(event,'0123456789')" />
+            </div>
         </div>
-    </div>
-
-    <!-- Automatically load URL -->
-    <div class="form-group">
-        <label class="col-sm-5 control-label" for='autoredirect'><?php  eT("Automatically load URL when survey complete:"); ?></label>
-        <div class="col-sm-7">
-            <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                'name' => 'autoredirect',
-                'value'=> $esrow['autoredirect'] == "Y",
-                'onLabel'=>gT('On'),
-                'offLabel'=>gT('Off')
-                ));
-            ?>
+        <!-- Show question index -->
+        <div class="form-group">
+            <label class="col-sm-5 control-label" for='questionindex'><?php  eT("Show question index / allow jumping:"); ?></label>
+            <div class="col-sm-7">
+
+            <?php $this->widget('yiiwheels.widgets.buttongroup.WhButtonGroup', array(
+                    'name' => 'questionindex',
+                    'value'=> $esrow['questionindex'] ,
+                    'selectOptions'=>array(
+                        0 => gT('Disabled','unescaped'),
+                        1 => gT('Incremental','unescaped'),
+                        2 => gT('Full','unescaped'))
+                    ));?>
+            </div>
         </div>
-    </div>
+                <!-- showxquestions -->
+        <?php switch($showxquestions):
+                case 'show':  ?>
+
+                    <!-- Show "There are X questions in this survey -->
+                    <div class="form-group">
+                        <label class="col-sm-5 control-label" for="dis_showxquestions"><?php  eT('Show "There are X questions in this survey":'); ?></label>
+                        <div class="col-sm-7">
+                            <input type="hidden" class="form-control"  name="showxquestions" id="" value="1" />
+                            <input type="text" name="dis_showxquestions" id="dis_showxquestions" disabled="disabled" value="<?php  eT('Yes (Forced by the system administrator)'); ?>" />
+                        </div>
+                    </div>
+            <?php break;?>
 
-    <!-- showxquestions -->
-    <?php switch($showxquestions):
-            case 'show':  ?>
+            <?php case 'hide': ?>
 
                 <!-- Show "There are X questions in this survey -->
                 <div class="form-group">
                     <label class="col-sm-5 control-label" for="dis_showxquestions"><?php  eT('Show "There are X questions in this survey":'); ?></label>
                     <div class="col-sm-7">
-                        <input type="hidden" class="form-control"  name="showxquestions" id="" value="1" />
-                        <input type="text" name="dis_showxquestions" id="dis_showxquestions" disabled="disabled" value="<?php  eT('Yes (Forced by the system administrator)'); ?>" />
+                        <input type="hidden" name="showxquestions" id="" value="0" />
+                        <input type="text" name="dis_showxquestions" id="dis_showxquestions" disabled="disabled" value="<?php  eT('No (Forced by the system administrator)'); ?>" />
                     </div>
                 </div>
-        <?php break;?>
+            <?php break;?>
 
-        <?php case 'hide': ?>
+            <?php default: ?>
 
-            <!-- Show "There are X questions in this survey -->
-            <div class="form-group">
-                <label class="col-sm-5 control-label" for="dis_showxquestions"><?php  eT('Show "There are X questions in this survey":'); ?></label>
-                <div class="col-sm-7">
-                     <input type="hidden" name="showxquestions" id="" value="0" />
-                     <input type="text" name="dis_showxquestions" id="dis_showxquestions" disabled="disabled" value="<?php  eT('No (Forced by the system administrator)'); ?>" />
-                </div>
-            </div>
-        <?php break;?>
-
-        <?php default: ?>
-
-            <!-- Show "There are X questions in this survey" -->
-            <div class="form-group">
-                <label class="col-sm-5 control-label" for="showxquestions"><?php  eT('Show "There are X questions in this survey":'); ?></label>
-                <div class="col-sm-7">
-                    <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                        'name' => 'showxquestions',
-                        'value'=> $esrow['showxquestions'] == "Y",
-                        'onLabel'=>gT('On'),
-                        'offLabel'=>gT('Off')
-                        ));
-                    ?>
+                <!-- Show "There are X questions in this survey" -->
+                <div class="form-group">
+                    <label class="col-sm-5 control-label" for="showxquestions"><?php  eT('Show "There are X questions in this survey":'); ?></label>
+                    <div class="col-sm-7">
+                        <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
+                            'name' => 'showxquestions',
+                            'value'=> $esrow['showxquestions'] == "Y",
+                            'onLabel'=>gT('On'),
+                            'offLabel'=>gT('Off')
+                            ));
+                        ?>
+                    </div>
                 </div>
-            </div>
-        <?php break;?>
-    <?php endswitch ?>
-
-    <?php switch($showgroupinfo):
-            case 'both': ?>
+            <?php break;?>
+        <?php endswitch ?>
+
+        <?php switch($showgroupinfo):
+                case 'both': ?>
+
+                    <!-- Show group name and/or group description -->
+                    <div class="form-group">
+                        <label class="col-sm-5 control-label" for="dis_showgroupinfo"><?php  eT('Show group name and/or group description:'); ?></label>
+                        <div class="col-sm-7">
+                            <input type="hidden" name="showgroupinfo" id="showgroupinfo" value="B" />
+                            <input class="form-control"  type="text" name="dis_showgroupinfo" id="dis_showgroupinfo" disabled="disabled" value="<?php  eT('Show both (Forced by the system administrator)'); ?>" />
+                        </div>
+                    </div>
+            <?php break;?>
+            <?php case 'name': ?>
 
                 <!-- Show group name and/or group description -->
                 <div class="form-group">
                     <label class="col-sm-5 control-label" for="dis_showgroupinfo"><?php  eT('Show group name and/or group description:'); ?></label>
                     <div class="col-sm-7">
-                        <input type="hidden" name="showgroupinfo" id="showgroupinfo" value="B" />
-                        <input class="form-control"  type="text" name="dis_showgroupinfo" id="dis_showgroupinfo" disabled="disabled" value="<?php  eT('Show both (Forced by the system administrator)'); ?>" />
+                        <input type="hidden" name="showgroupinfo" id="showgroupinfo" value="N" />
+                        <input type="text" class="form-control" name="dis_showgroupinfo" id="dis_showgroupinfo" disabled="disabled" value="<?php  eT('Show group name only (Forced by the system administrator)'); ?>" />
                     </div>
                 </div>
-        <?php break;?>
-        <?php case 'name': ?>
-
-            <!-- Show group name and/or group description -->
-            <div class="form-group">
-                <label class="col-sm-5 control-label" for="dis_showgroupinfo"><?php  eT('Show group name and/or group description:'); ?></label>
-                <div class="col-sm-7">
-                    <input type="hidden" name="showgroupinfo" id="showgroupinfo" value="N" />
-                    <input type="text" class="form-control" name="dis_showgroupinfo" id="dis_showgroupinfo" disabled="disabled" value="<?php  eT('Show group name only (Forced by the system administrator)'); ?>" />
-                </div>
-            </div>
-        <?php break;?>
+            <?php break;?>
 
-        <?php case 'description': ?>
+            <?php case 'description': ?>
 
-            <!-- Show group name and/or group description -->
-            <div class="form-group">
-                <label class="col-sm-5 control-label" for="dis_showgroupinfo"><?php  eT('Show group name and/or group description:'); ?></label>
-                <div class="col-sm-7">
-                    <input type="text" class="form-control"  name="dis_showgroupinfo" id="dis_showgroupinfo" disabled="disabled" value="<?php  eT('Show group description only (Forced by the system administrator)'); ?>" />
-                    <input type="hidden" name="showgroupinfo" id="showgroupinfo" value="D" />
+                <!-- Show group name and/or group description -->
+                <div class="form-group">
+                    <label class="col-sm-5 control-label" for="dis_showgroupinfo"><?php  eT('Show group name and/or group description:'); ?></label>
+                    <div class="col-sm-7">
+                        <input type="text" class="form-control"  name="dis_showgroupinfo" id="dis_showgroupinfo" disabled="disabled" value="<?php  eT('Show group description only (Forced by the system administrator)'); ?>" />
+                        <input type="hidden" name="showgroupinfo" id="showgroupinfo" value="D" />
+                    </div>
                 </div>
-            </div>
-        <?php break;?>
+            <?php break;?>
 
-        <?php case 'none': ?>
+            <?php case 'none': ?>
 
-            <!-- Show group name and/or group description -->
-            <div class="form-group">
-                <label class="col-sm-5 control-label" for="dis_showgroupinfo"><?php  eT('Show group name and/or group description:'); ?></label>
-                <div class="col-sm-7">
-                    <input type="hidden" name="showgroupinfo" id="showgroupinfo" value="X" />
-                    <input type="text"  class="form-control" name="dis_showgroupinfo" id="dis_showgroupinfo" disabled="disabled" value="<?php  eT('Hide both (Forced by the system administrator)'); ?>" />
+                <!-- Show group name and/or group description -->
+                <div class="form-group">
+                    <label class="col-sm-5 control-label" for="dis_showgroupinfo"><?php  eT('Show group name and/or group description:'); ?></label>
+                    <div class="col-sm-7">
+                        <input type="hidden" name="showgroupinfo" id="showgroupinfo" value="X" />
+                        <input type="text"  class="form-control" name="dis_showgroupinfo" id="dis_showgroupinfo" disabled="disabled" value="<?php  eT('Hide both (Forced by the system administrator)'); ?>" />
 
+                    </div>
                 </div>
-            </div>
-        <?php break;?>
-
-        <?php default: ?>
-            <?php
-                $sel_showgri = array( 'B' => '' , 'D' => '' , 'N' => '' , 'X' => '' );
-                if (isset($esrow['showgroupinfo']))
-                {
-                    $set_showgri = $esrow['showgroupinfo'];
-                    $sel_showgri[$set_showgri] = ' selected="selected"';
-                }
-                if (empty($sel_showgri['B']) && empty($sel_showgri['D']) && empty($sel_showgri['N']) && empty($sel_showgri['X']))
-                    $sel_showgri['C'] = ' selected="selected"';
-            ?>
-
-            <!-- Show group name and/or group description -->
-            <div class="form-group">
-                <label class="col-sm-5 control-label" for="showgroupinfo"><?php  eT('Show group name and/or group description:'); ?></label>
-                <div class="col-sm-7">
-                    <select id="showgroupinfo" name="showgroupinfo"  class="form-control" >
-                        <option value="B"<?php echo $sel_showgri['B']; ?>><?php  eT('Show both'); ?></option>
-                        <option value="N"<?php echo $sel_showgri['N']; ?>><?php  eT('Show group name only'); ?></option>
-                        <option value="D"<?php echo $sel_showgri['D']; ?>><?php  eT('Show group description only'); ?></option>
-                        <option value="X"<?php echo $sel_showgri['X']; ?>><?php  eT('Hide both'); ?></option>
-                    </select>
-                    <?php unset($sel_showgri,$set_showgri); ?>
+            <?php break;?>
+
+            <?php default: ?>
+                <?php
+                    $sel_showgri = array( 'B' => '' , 'D' => '' , 'N' => '' , 'X' => '' );
+                    if (isset($esrow['showgroupinfo']))
+                    {
+                        $set_showgri = $esrow['showgroupinfo'];
+                        $sel_showgri[$set_showgri] = ' selected="selected"';
+                    }
+                    if (empty($sel_showgri['B']) && empty($sel_showgri['D']) && empty($sel_showgri['N']) && empty($sel_showgri['X']))
+                        $sel_showgri['C'] = ' selected="selected"';
+                ?>
+
+                <!-- Show group name and/or group description -->
+                <div class="form-group">
+                    <label class="col-sm-5 control-label" for="showgroupinfo"><?php  eT('Show group name and/or group description:'); ?></label>
+                    <div class="col-sm-7">
+                        <select id="showgroupinfo" name="showgroupinfo"  class="form-control" >
+                            <option value="B"<?php echo $sel_showgri['B']; ?>><?php  eT('Show both'); ?></option>
+                            <option value="N"<?php echo $sel_showgri['N']; ?>><?php  eT('Show group name only'); ?></option>
+                            <option value="D"<?php echo $sel_showgri['D']; ?>><?php  eT('Show group description only'); ?></option>
+                            <option value="X"<?php echo $sel_showgri['X']; ?>><?php  eT('Hide both'); ?></option>
+                        </select>
+                        <?php unset($sel_showgri,$set_showgri); ?>
+                    </div>
                 </div>
-            </div>
-        <?php break;?>
+            <?php break;?>
 
-    <?php endswitch ?>
+        <?php endswitch ?>
 
-    <?php switch($showqnumcode):
-            case 'none':  ?>
+        <?php switch($showqnumcode):
+                case 'none':  ?>
+
+                    <!-- Show question number and/or code -->
+                    <div class="form-group">
+                        <label class="col-sm-5 control-label" for="dis_showqnumcode"><?php  eT('Show question number and/or code:'); ?></label>
+                        <div class="col-sm-7">
+                            <input type="hidden" name="showqnumcode" id="showqnumcode" value="X" />
+                            <input type="text" class="form-control" name="dis_showqnumcode" id="dis_showqnumcode" disabled="disabled" value="<?php  eT('Hide both (Forced by the system administrator)'); ?>" />
+                        </div>
+                    </div>
+            <?php break;?>
+
+            <?php case 'number': ?>
 
                 <!-- Show question number and/or code -->
                 <div class="form-group">
                     <label class="col-sm-5 control-label" for="dis_showqnumcode"><?php  eT('Show question number and/or code:'); ?></label>
                     <div class="col-sm-7">
-                        <input type="hidden" name="showqnumcode" id="showqnumcode" value="X" />
-                        <input type="text" class="form-control" name="dis_showqnumcode" id="dis_showqnumcode" disabled="disabled" value="<?php  eT('Hide both (Forced by the system administrator)'); ?>" />
+                        <input type="hidden" name="showqnumcode" id="showqnumcode" value="N" />
+                        <input class="form-control" type="text" name="dis_showqnumcode" id="dis_showqnumcode" disabled="disabled" value="<?php  eT('Show question number only (Forced by the system administrator)') ; ?>" />
+
                     </div>
                 </div>
-        <?php break;?>
+            <?php break;?>
 
-        <?php case 'number': ?>
-
-            <!-- Show question number and/or code -->
-            <div class="form-group">
-                <label class="col-sm-5 control-label" for="dis_showqnumcode"><?php  eT('Show question number and/or code:'); ?></label>
-                <div class="col-sm-7">
-                    <input type="hidden" name="showqnumcode" id="showqnumcode" value="N" />
-                    <input class="form-control" type="text" name="dis_showqnumcode" id="dis_showqnumcode" disabled="disabled" value="<?php  eT('Show question number only (Forced by the system administrator)') ; ?>" />
+            <?php case 'code': ?>
 
+                <!-- Show question number and/or code -->
+                <div class="form-group">
+                    <label class="col-sm-5 control-label" for="dis_showqnumcode"><?php  eT('Show question number and/or code:'); ?></label>
+                    <div class="col-sm-7">
+                        <input type="hidden" name="showqnumcode" id="showqnumcode" value="C" />
+                        <input class="form-control" type="text" name="dis_showqnumcode" id="dis_showqnumcode" disabled="disabled" value="<?php  eT('Show question code only (Forced by the system administrator)'); ?>" />
+                    </div>
                 </div>
-            </div>
-        <?php break;?>
+            <?php break;?>
 
-        <?php case 'code': ?>
+            <?php case 'both': ?>
 
-            <!-- Show question number and/or code -->
-            <div class="form-group">
-                <label class="col-sm-5 control-label" for="dis_showqnumcode"><?php  eT('Show question number and/or code:'); ?></label>
-                <div class="col-sm-7">
-                    <input type="hidden" name="showqnumcode" id="showqnumcode" value="C" />
-                    <input class="form-control" type="text" name="dis_showqnumcode" id="dis_showqnumcode" disabled="disabled" value="<?php  eT('Show question code only (Forced by the system administrator)'); ?>" />
+                <!-- Show question number and/or code -->
+                <div class="form-group">
+                    <label class="col-sm-5 control-label" for="dis_showqnumcode"><?php  eT('Show question number and/or code:'); ?></label>
+                    <div class="col-sm-7">
+                        <input type="hidden" name="showqnumcode" id="showqnumcode" value="B" />
+                        <input class="form-control" type="text" name="dis_showqnumcode" id="dis_showqnumcode" disabled="disabled" value="<?php  eT('Show both (Forced by the system administrator)'); ?>"/>
+                    </div>
                 </div>
-            </div>
-        <?php break;?>
-
-        <?php case 'both': ?>
+            <?php break;?>
+
+            <?php default: ?>
+                <?php
+                    $sel_showqnc = array( 'B' => '' , 'C' => '' , 'N' => '' , 'X' => '' );
+                    if (isset($esrow['showqnumcode'])) {
+                        $set_showqnc = $esrow['showqnumcode'];
+                        $sel_showqnc[$set_showqnc] = ' selected="selected"';
+                    }
+                    if (empty($sel_showqnc['B']) && empty($sel_showqnc['C']) && empty($sel_showqnc['N']) && empty($sel_showqnc['X'])) {
+                        $sel_showqnc['X'] = ' selected="selected"';
+                    };
+                ?>
 
-            <!-- Show question number and/or code -->
-            <div class="form-group">
-                <label class="col-sm-5 control-label" for="dis_showqnumcode"><?php  eT('Show question number and/or code:'); ?></label>
-                <div class="col-sm-7">
-                    <input type="hidden" name="showqnumcode" id="showqnumcode" value="B" />
-                    <input class="form-control" type="text" name="dis_showqnumcode" id="dis_showqnumcode" disabled="disabled" value="<?php  eT('Show both (Forced by the system administrator)'); ?>"/>
-                </div>
-            </div>
-        <?php break;?>
-
-        <?php default: ?>
-            <?php
-                $sel_showqnc = array( 'B' => '' , 'C' => '' , 'N' => '' , 'X' => '' );
-                if (isset($esrow['showqnumcode'])) {
-                    $set_showqnc = $esrow['showqnumcode'];
-                    $sel_showqnc[$set_showqnc] = ' selected="selected"';
-                }
-                if (empty($sel_showqnc['B']) && empty($sel_showqnc['C']) && empty($sel_showqnc['N']) && empty($sel_showqnc['X'])) {
-                    $sel_showqnc['X'] = ' selected="selected"';
-                };
-            ?>
-
-            <!-- Show question number and/or code -->
-            <div class="form-group">
-                <label class="col-sm-5 control-label" for="showqnumcode"><?php  eT('Show question number and/or code:'); ?></label>
-                <div class="col-sm-7">
-                    <select class="form-control" id="showqnumcode" name="showqnumcode">
-                        <option value="B"<?php echo $sel_showqnc['B']; ?>><?php  eT('Show both'); ?></option>
-                        <option value="N"<?php echo $sel_showqnc['N']; ?>><?php  eT('Show question number only'); ?></option>
-                        <option value="C"<?php echo $sel_showqnc['C']; ?>><?php  eT('Show question code only'); ?></option>
-                        <option value="X"<?php echo $sel_showqnc['X']; ?>><?php  eT('Hide both'); ?></option>
-                    </select>
-                    <?php unset($sel_showqnc,$set_showqnc);?>
+                <!-- Show question number and/or code -->
+                <div class="form-group">
+                    <label class="col-sm-5 control-label" for="showqnumcode"><?php  eT('Show question number and/or code:'); ?></label>
+                    <div class="col-sm-7">
+                        <select class="form-control" id="showqnumcode" name="showqnumcode">
+                            <option value="B"<?php echo $sel_showqnc['B']; ?>><?php  eT('Show both'); ?></option>
+                            <option value="N"<?php echo $sel_showqnc['N']; ?>><?php  eT('Show question number only'); ?></option>
+                            <option value="C"<?php echo $sel_showqnc['C']; ?>><?php  eT('Show question code only'); ?></option>
+                            <option value="X"<?php echo $sel_showqnc['X']; ?>><?php  eT('Hide both'); ?></option>
+                        </select>
+                        <?php unset($sel_showqnc,$set_showqnc);?>
+                    </div>
                 </div>
-            </div>
-        <?php break;?>
-    <?php endswitch; ?>
+            <?php break;?>
+        <?php endswitch; ?>
+
+        <?php switch($shownoanswer):
+                case 0:  ?>
+
+                    <!-- Show "No answer" -->
+                    <div class="form-group">
+                        <label class="col-sm-5 control-label" for="dis_shownoanswer"><?php  eT('Show "No answer":'); ?></label> <input type="hidden" name="shownoanswer" id="shownoanswer" value="N" />
+                        <div class="col-sm-7">
+                            <input class="form-control" type="text" name="dis_shownoanswer" id="dis_shownoanswer" disabled="disabled" value="<?php  eT('Off (Forced by the system administrator)'); ?>" />
+                        </div>
+                    </div>
+            <?php break;?>
 
-    <?php switch($shownoanswer):
-            case 0:  ?>
+            <?php case 2: ?>
 
                 <!-- Show "No answer" -->
                 <div class="form-group">
-                    <label class="col-sm-5 control-label" for="dis_shownoanswer"><?php  eT('Show "No answer":'); ?></label> <input type="hidden" name="shownoanswer" id="shownoanswer" value="N" />
+                    <label class="col-sm-5 control-label" for="shownoanswer"><?php  eT('Show "No answer":'); ?></label>
                     <div class="col-sm-7">
-                        <input class="form-control" type="text" name="dis_shownoanswer" id="dis_shownoanswer" disabled="disabled" value="<?php  eT('Off (Forced by the system administrator)'); ?>" />
+                        <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
+                            'name' => 'shownoanswer',
+                            'value'=> $esrow['shownoanswer'] == "Y",
+                            'onLabel'=>gT('On'),
+                            'offLabel'=>gT('Off')
+                            ));
+                        ?>
                     </div>
                 </div>
-        <?php break;?>
-
-        <?php case 2: ?>
-
-            <!-- Show "No answer" -->
-            <div class="form-group">
-                <label class="col-sm-5 control-label" for="shownoanswer"><?php  eT('Show "No answer":'); ?></label>
-                <div class="col-sm-7">
-                    <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                        'name' => 'shownoanswer',
-                        'value'=> $esrow['shownoanswer'] == "Y",
-                        'onLabel'=>gT('On'),
-                        'offLabel'=>gT('Off')
-                        ));
-                    ?>
+            <?php break;?>
+
+            <?php default: ?>
+
+                <!-- Show "No answer" -->
+                <div class="form-group">
+                    <label class="col-sm-5 control-label" for="dis_shownoanswer"><?php  eT('Show "No answer":'); ?></label>
+                    <div class="col-sm-7">
+                        <input type="hidden" name="shownoanswer" id="shownoanswer" value="Y" />
+                        <input class="form-control" type="text" name="dis_shownoanswer" id="dis_shownoanswer" disabled="disabled" value="<?php  eT('On (Forced by the system administrator)'); ?>" />
+                    </div>
                 </div>
+            <?php break;?>
+
+        <?php endswitch ?>
+    </div>
+    <div class="col-sm-12 col-md-6">
+        
+        <!-- welcome screen -->
+        <div class="form-group">
+            <label class="col-sm-5 control-label" for='showwelcome'><?php  eT("Show welcome screen:") ; ?></label>
+            <div class="col-sm-7">
+                <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
+                    'name' => 'showwelcome',
+                    'value'=> $esrow['showwelcome'] == "Y",
+                    'onLabel'=>gT('On'),
+                    'offLabel'=>gT('Off')
+                    ));
+                ?>
             </div>
-        <?php break;?>
+        </div>
 
-        <?php default: ?>
+        <!-- Show [<< Prev] button -->
+        <div class="form-group">
+            <label class="col-sm-5 control-label" for='allowprev'><?php  eT("Allow backward navigation:"); ?></label>
+            <div class="col-sm-7">
+                <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
+                    'name' => 'allowprev',
+                    'value'=> $esrow['allowprev'] == "Y",
+                    'onLabel'=>gT('On'),
+                    'offLabel'=>gT('Off')
+                    ));
+                ?>
+            </div>
+        </div>
 
-            <!-- Show "No answer" -->
-            <div class="form-group">
-                <label class="col-sm-5 control-label" for="dis_shownoanswer"><?php  eT('Show "No answer":'); ?></label>
-                <div class="col-sm-7">
-                      <input type="hidden" name="shownoanswer" id="shownoanswer" value="Y" />
-                       <input class="form-control" type="text" name="dis_shownoanswer" id="dis_shownoanswer" disabled="disabled" value="<?php  eT('On (Forced by the system administrator)'); ?>" />
-                </div>
+
+        <!-- Keyboard-less operation -->
+        <div class="form-group">
+            <label class="col-sm-5 control-label" for='nokeyboard'><?php  eT("Show on-screen keyboard:"); ?></label>
+            <div class="col-sm-7">
+                <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
+                    'name' => 'nokeyboard',
+                    'value'=> $esrow['nokeyboard'] == "Y",
+                    'onLabel'=>gT('On'),
+                    'offLabel'=>gT('Off')
+                    ));
+                ?>
             </div>
-        <?php break;?>
+        </div>
 
-    <?php endswitch ?>
+        <!-- Show progress bar -->
+        <div class="form-group">
+            <label class="col-sm-5 control-label" for='showprogress'><?php  eT("Show progress bar:"); ?></label>
+            <div class="col-sm-7">
+                <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
+                    'name' => 'showprogress',
+                    'value'=> $esrow['showprogress'] == "Y",
+                    'onLabel'=>gT('On'),
+                    'offLabel'=>gT('Off')
+                    ));
+                ?>
+            </div>
+        </div>
+        <!-- Participants may print answers -->
+        <div class="form-group">
+            <label class="col-sm-5 control-label" for='printanswers'><?php  eT("Participants may print answers:"); ?></label>
+            <div class="col-sm-7">
+                <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
+                    'name' => 'printanswers',
+                    'value'=> $esrow['printanswers'] == "Y",
+                    'onLabel'=>gT('On'),
+                    'offLabel'=>gT('Off')
+                    ));
+                ?>
+            </div>
+        </div>
+
+        <!-- Public statistics -->
+        <div class="form-group">
+            <label class="col-sm-5 control-label" for='publicstatistics'><?php  eT("Public statistics:"); ?></label>
+            <div class="col-sm-7">
+                <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
+                    'name' => 'publicstatistics',
+                    'value'=> $esrow['publicstatistics'] == "Y",
+                    'onLabel'=>gT('On'),
+                    'offLabel'=>gT('Off')
+                    ));
+                ?>
+            </div>
+        </div>
+
+        <!-- Show graphs in public statistics -->
+        <div class="form-group">
+            <label class="col-sm-5 control-label" for='publicgraphs'><?php  eT("Show graphs in public statistics:"); ?></label>
+            <div class="col-sm-7">
+                <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
+                    'name' => 'publicgraphs',
+                    'value'=> $esrow['publicgraphs'] == "Y",
+                    'onLabel'=>gT('On'),
+                    'offLabel'=>gT('Off')
+                    ));
+                ?>
+            </div>
+        </div>
+    
+        <!-- Automatically load URL -->
+        <div class="form-group">
+            <label class="col-sm-5 control-label" for='autoredirect'><?php  eT("Automatically load URL when survey complete:"); ?></label>
+            <div class="col-sm-7">
+                <?php $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
+                    'name' => 'autoredirect',
+                    'value'=> $esrow['autoredirect'] == "Y",
+                    'onLabel'=>gT('On'),
+                    'offLabel'=>gT('Off')
+                    ));
+                ?>
+            </div>
+        </div>
     </div>
+</div>