diff --git a/application/controllers/admin/survey.php b/application/controllers/admin/survey.php
index 468d829ec6c..4416b2d8e31 100644
--- a/application/controllers/admin/survey.php
+++ b/application/controllers/admin/survey.php
@@ -272,7 +272,7 @@ function _generalTabNewSurvey()
             */
             $data['clang'] = $clang;
             $data['owner'] = $owner;
-            return $this->load->view('admin/survey/superview/SuperGeneralNewSurvey_view',$data, true);
+            return $this->load->view('admin/survey/superview/superGeneralNewSurvey_view',$data, true);
     }
         
     function _generalTabEditSurvey($surveyid,$esrow)
@@ -351,7 +351,7 @@ function _generalTabEditSurvey($surveyid,$esrow)
         $data['clang'] = $clang;
         $data['esrow'] = $esrow;
         $data['surveyid'] = $surveyid;
-        return $this->load->view('admin/survey/superview/SuperGeneralEditSurey_view',$data, true); 
+        return $this->load->view('admin/survey/superview/superGeneralEditSurey_view',$data, true); 
         
     }
     
@@ -699,13 +699,14 @@ function _tabPresentationNavigation($esrow)
         $data['showXquestions'] = $showXquestions;
         $data['showgroupinfo'] = $showgroupinfo;
         $data['showqnumcode'] = $showqnumcode;
-        return $this->load->view('admin/survey/superview/SuperPresentation_view',$data, true); 
+        return $this->load->view('admin/survey/superview/superPresentation_view',$data, true); 
         
     }
     
     function _tabPublicationAccess($esrow)
     {
         $clang = $this->limesurvey_lang;
+        /**
         $editsurvey = "<div id='publication'><ul>\n";
 
              //Public Surveys
@@ -738,7 +739,7 @@ function _tabPublicationAccess($esrow)
         }
             $editsurvey .= ">".$clang->gT("No")."</option>\n"
             . "</select></li>\n";
-
+            */
             // Start date
             $dateformatdetails=getDateFormatData($this->session->userdata('dateformat'));
             $startdate='';
@@ -748,10 +749,10 @@ function _tabPublicationAccess($esrow)
                 $datetimeobj = $this->date_time_converter; //new Date_Time_Converter($esrow['startdate'] , "Y-m-d H:i:s");
                 $startdate=$datetimeobj->convert($dateformatdetails['phpdate'].' H:i');
             }
-
+            /**
             $editsurvey .= "<li><label for='startdate'>".$clang->gT("Start date/time:")."</label>\n"
             . "<input type='text' class='popupdatetime' id='startdate' size='20' name='startdate' value=\"{$startdate}\" /></li>\n";
-
+            */
             // Expiration date
             $expires='';
         if (trim($esrow['expires']) != '') {
@@ -760,6 +761,7 @@ function _tabPublicationAccess($esrow)
                 $datetimeobj = $this->date_time_converter; //new Date_Time_Converter($esrow['expires'] , "Y-m-d H:i:s");
                 $expires=$datetimeobj->convert($dateformatdetails['phpdate'].' H:i');
             }
+            /**
             $editsurvey .="<li><label for='expires'>".$clang->gT("Expiry date/time:")."</label>\n"
             . "<input type='text' class='popupdatetime' id='expires' size='20' name='expires' value=\"{$expires}\" /></li>\n";
 
@@ -849,11 +851,23 @@ function _tabPublicationAccess($esrow)
             $editsurvey .= "</ul></div>\n";
         return $editsurvey;
         
+        */
+        $data['clang'] = $clang;
+        $data['esrow'] = $esrow;
+        //$data['surveyid'] = $surveyid;
+        $data['startdate'] = $startdate;
+        $data['expires'] = $expires;
+        //$data['showgroupinfo'] = $showgroupinfo;
+        //$data['showqnumcode'] = $showqnumcode;
+        return $this->load->view('admin/survey/superview/superPublication_view',$data, true); 
+        
     }
     
     function _tabNotificationDataManagement($esrow)
     {
         $clang = $this->limesurvey_lang;
+        
+        /**
         // Notification and Data management TAB
             $editsurvey = "<div id='notification'><ul>\n";
 
@@ -1068,13 +1082,20 @@ function _tabNotificationDataManagement($esrow)
 
         // End Notification and Data management TAB
         $editsurvey .= "</ul></div>\n";
-        return $editsurvey;
+        return $editsurvey; */
+        $data['clang'] = $clang;
+        $data['esrow'] = $esrow;
+        
+        //$data['showqnumcode'] = $showqnumcode;
+        return $this->load->view('admin/survey/superview/superNotification_view',$data, true); 
+        
     }
     
     function _tabTokens($esrow)
     {
         $clang = $this->limesurvey_lang;
         // Tokens TAB
+        /**
         $editsurvey = "<div id='tokens'><ul>\n";
         // Token answers persistence
         $editsurvey .= "<li><label for=''>".$clang->gT("Enable token-based response persistence?")."</label>\n"
@@ -1098,12 +1119,18 @@ function _tabTokens($esrow)
 
         // End Tokens TAB
         $editsurvey .= "</ul></div>\n";
-        return $editsurvey;
+        return $editsurvey; */
+        $data['clang'] = $clang;
+        $data['esrow'] = $esrow;
+        
+        //$data['showqnumcode'] = $showqnumcode;
+        return $this->load->view('admin/survey/superview/superTokens_view',$data, true); 
     }
     
     function _tabImport()
     {
         $clang = $this->limesurvey_lang;
+        /**
         // Import TAB
         $editsurvey = "<div id='import'>\n";
 
@@ -1119,16 +1146,21 @@ function _tabImport()
 
         // End Import TAB
         $editsurvey .= "</div>\n";
-        return $editsurvey;
+        return $editsurvey; */
+        $data['clang'] = $clang;
+        //$data['esrow'] = $esrow;
+        
+        //$data['showqnumcode'] = $showqnumcode;
+        return $this->load->view('admin/survey/superview/superImport_view',$data, true); 
     }
     
     function _tabCopy()
     {
         $clang = $this->limesurvey_lang;
-        
+        /**
         // Copy survey TAB
         $editsurvey = "<div id='copy'>\n";
-
+        
         // Copy survey
         $editsurvey .= "<form class='form30' action='../database/index/insertsurvey' id='copysurveyform' method='post'>\n"
                     . "<ul>\n"
@@ -1153,8 +1185,16 @@ function _tabCopy()
         $editsurvey .= "</div>\n";
                
         return $editsurvey;
+        */
+        
+        $data['clang'] = $clang;
+        //$data['esrow'] = $esrow;
+        
+        //$data['showqnumcode'] = $showqnumcode;
+        return $this->load->view('admin/survey/superview/superCopy_view',$data, true); 
     }
     
+    
     function _tabResourceManagement($surveyid)
     {
         $clang = $this->limesurvey_lang;
@@ -1169,6 +1209,7 @@ function _tabResourceManagement($surveyid)
         if (hasResources($surveyid, 'survey') === false) {
             $disabledIfNoResources = " disabled='disabled'";
         }
+        /**
         // functionality not ported 
         $editsurvey = "<div id='resources'>\n"
             . "<form enctype='multipart/form-data'  class='form30' id='importsurveyresources' name='importsurveyresources' action='../database/index/insertsurvey' method='post' onsubmit='return validatefilename(this,\"".$clang->gT('Please select a file to import!','js')."\");'>\n"
@@ -1187,7 +1228,14 @@ function _tabResourceManagement($surveyid)
 
         // End TAB Uploaded Resources Management
         $editsurvey .= "</div>\n";
-        return $editsurvey;
+        return $editsurvey; */
+        $data['clang'] = $clang;
+        //$data['esrow'] = $esrow;
+        $data['ZIPimportAction'] = $ZIPimportAction;
+        $data['disabledIfNoResources'] = $disabledIfNoResources;
+        $dqata['sCKEditorURL'] = $sCKEditorURL;
+        //$data['showqnumcode'] = $showqnumcode;
+        return $this->load->view('admin/survey/superview/superResourceManagement_view',$data, true); 
         
     }
     
diff --git a/application/views/admin/Survey/superview/superCopy_view.php b/application/views/admin/Survey/superview/superCopy_view.php
new file mode 100644
index 00000000000..8c3d4713894
--- /dev/null
+++ b/application/views/admin/Survey/superview/superCopy_view.php
@@ -0,0 +1,22 @@
+<div id='copy'>
+    <form class='form30' action='<?php echo site_url('admin/survey/copy'); ?>' id='copysurveyform' method='post'>
+                    <ul>
+                    <li><label for='copysurveylist'><span class='annotationasterisk'>*</span><?php echo $clang->gT("Select survey to copy:"); ?> </label>
+                    <select id='copysurveylist' name='copysurveylist'>
+                    <?php  echo getsurveylist(false, true); ?> </select> <span class='annotation'><?php echo  $clang->gT("*Required"); ?> </span></li>
+                    <li><label for='copysurveyname'><span class='annotationasterisk'>*</span><?php echo  $clang->gT("New survey title:"); ?> </label>
+                    <input type='text' id='copysurveyname' size='82' maxlength='200' name='copysurveyname' value='' />
+                    <span class='annotation'><?php echo  $clang->gT("*Required"); ?> </span></li>
+                    <li><label for='copysurveytranslinksfields'><?php echo  $clang->gT("Convert resource links and INSERTANS fields?"); ?> </label>
+                    <input id='copysurveytranslinksfields' name="copysurveytranslinksfields" type="checkbox" checked='checked'/></li>
+                    <li><label for='copysurveyexcludequotas'><?php echo $clang->gT("Exclude quotas?") ; ?></label>
+                    <input id='copysurveyexcludequotas' name="copysurveyexcludequotas" type="checkbox" /></li>
+                    <li><label for='copysurveyexcludeanswers'><?php echo  $clang->gT("Exclude answers?"); ?> </label>
+                    <input id='copysurveyexcludeanswers' name="copysurveyexcludeanswers" type="checkbox" /></li>
+                    <li><label for='copysurveyresetconditions'><?php echo  $clang->gT("Reset conditions?") ; ?></label>
+                    <input id='copysurveyresetconditions' name="copysurveyresetconditions" type="checkbox" /></li></ul>
+                    <p><input type='submit' value='<?php echo $clang->gT("Copy survey"); ?>' />
+                    <input type='hidden' name='action' value='copysurvey' /></p></form>
+
+        
+</div>
\ No newline at end of file
diff --git a/application/views/admin/Survey/superview/superImport_view.php b/application/views/admin/Survey/superview/superImport_view.php
new file mode 100644
index 00000000000..e7d57ba8085
--- /dev/null
+++ b/application/views/admin/Survey/superview/superImport_view.php
@@ -0,0 +1,13 @@
+<div id='import'>
+
+        
+        <form enctype='multipart/form-data' class='form30' id='importsurvey' name='importsurvey' action='<?php echo site_url('admin/import/survey'); ?>' method='post' onsubmit='return validatefilename(this,"<?php echo $clang->gT('Please select a file to import!', 'js'); ?> ");'>
+        <ul>
+                    <li><label for='the_file'><?php echo $clang->gT("Select survey structure file (*.lss, *.csv):");  ?> </label>
+                    <input id='the_file' name="the_file" type="file" size="50" /></li>
+                    <li><label for='translinksfields'><?php echo $clang->gT("Convert resource links and INSERTANS fields?"); ?> </label>
+                    <input id='translinksfields' name="translinksfields" type="checkbox" checked='checked'/></li></ul>
+                    <p><input type='submit' value='<?php echo $clang->gT("Import survey"); ?>' />
+                    <input type='hidden' name='action' value='importsurvey' /></p></form>
+
+</div>
\ No newline at end of file
diff --git a/application/views/admin/Survey/superview/superNotification_view.php b/application/views/admin/Survey/superview/superNotification_view.php
new file mode 100644
index 00000000000..b3d51bde3a0
--- /dev/null
+++ b/application/views/admin/Survey/superview/superNotification_view.php
@@ -0,0 +1,215 @@
+<div id='notification'><ul>
+
+
+            
+             <li><label for='emailnotificationto'><?php echo $clang->gT("Send basic admin notification email to:"); ?></label>
+            <input size='70' type='text' value="<?php echo $esrow['emailnotificationto']; ?>" id='emailnotificationto' name='emailnotificationto' />
+            </li>
+
+            
+            <li><label for='emailresponseto'><?php echo $clang->gT("Send detailed admin notification email to:"); ?></label>
+            <input size='70' type='text' value="<?php echo $esrow['emailresponseto']; ?>" id='emailresponseto' name='emailresponseto' />
+            </li>
+
+            
+             <li><label for=''><?php echo $clang->gT("Anonymized responses?"); ?>
+            
+            <script type="text/javascript"><!-- 
+            function alertPrivacy()
+            {
+            if (document.getElementById('tokenanswerspersistence').value == 'Y')
+            {
+            alert('<?php echo $clang->gT("You can't use Anonymized responses when Token-based answers persistence is enabled.","js"); ?>');
+            document.getElementById('anonymized').value = 'N';
+            }
+            else if (document.getElementById('anonymized').value == 'Y')
+            {
+            alert('<?php echo $clang->gT("Warning"); ?>: <?php echo $clang->gT("If you turn on the -Anonymized responses- option and create a tokens table, LimeSurvey will mark your completed tokens only with a 'Y' instead of date/time to ensure the anonymity of your participants.","js"); ?>');
+            }
+            }
+            //--></script></label>
+
+        <?php if ($esrow['active'] == "Y") { ?>
+                 
+                \n 
+        <?php    if ($esrow['anonymized'] == "N") { ?>
+                <?php echo $clang->gT("This survey is NOT anonymous."); ?>
+            <?php } else {
+                echo $clang->gT("Answers to this survey are anonymized."); 
+            } ?>
+                 <font size='1' color='red'>&nbsp;(<?php echo $clang->gT("Cannot be changed"); ?>)
+                </font>
+                 <input type='hidden' name='anonymized' value="<?php echo $esrow['anonymized']; ?>" />
+        <?php } else { ?>
+                 <select id='anonymized' name='anonymized' onchange='alertPrivacy();'>
+                 <option value='Y'
+            <?php if ($esrow['anonymized'] == "Y") { ?>
+                  selected='selected'
+            <?php } ?>
+                ><?php echo $clang->gT("Yes"); ?></option>
+                <option value='N'
+            <?php if ($esrow['anonymized'] != "Y") { ?>
+                  selected='selected'
+            <?php } ?>
+                 ><?php echo $clang->gT("No"); ?></option>
+                </select>
+            <?php } ?>
+             </li>
+
+             
+             <li><label for='datestamp'><?php echo $clang->gT("Date Stamp?"); ?></label>
+        <?php if ($esrow['active'] == "Y") { ?>
+                 \n
+            <?php if ($esrow['datestamp'] != "Y") { 
+                echo $clang->gT("Responses will not be date stamped.");
+            } else {
+                 echo $clang->gT("Responses will be date stamped.");
+            } ?>
+                 <font size='1' color='red'>&nbsp;(<?php echo $clang->gT("Cannot be changed"); ?>)
+                </font>
+                 <input type='hidden' name='datestamp' value="<?php echo $esrow['datestamp']; ?>" />
+        <?php } else { ?>
+                 <select id='datestamp' name='datestamp' onchange='alertPrivacy();'>
+                 <option value='Y'
+            <?php if ($esrow['datestamp'] == "Y") { ?>
+                  selected='selected'
+            <?php } ?>
+                 ><?php echo $clang->gT("Yes"); ?></option>
+                <option value='N'
+            <?php if ($esrow['datestamp'] != "Y") { ?>
+                  selected='selected'
+            <?php } ?>
+                 ><?php echo $clang->gT("No"); ?></option>
+                </select>
+            <?php } ?>
+             </li>
+
+             
+             <li><label for=''><?php echo $clang->gT("Save IP Address?"); ?></label>
+
+        <?php if ($esrow['active'] == "Y") { ?>
+                 \n
+          <?php  if ($esrow['ipaddr'] != "Y") {
+                 echo $clang->gT("Responses will not have the IP address logged.");
+            } else {
+                 echo $clang->gT("Responses will have the IP address logged");
+            } ?>
+                 <font size='1' color='red'>&nbsp;(<?php echo $clang->gT("Cannot be changed"); ?>)
+                </font>
+                 <input type='hidden' name='ipaddr' value='<?php echo $esrow['ipaddr']; ?>' />
+        <?php } else { ?>
+                 <select name='ipaddr'>
+                 <option value='Y'
+            <?php if ($esrow['ipaddr'] == "Y") { ?>
+                  selected='selected'
+            <?php } ?>
+                 ><?php echo $clang->gT("Yes"); ?></option>
+                <option value='N'
+            <?php if ($esrow['ipaddr'] != "Y") { ?>
+                 selected='selected'
+            <?php } ?>
+                 ><?php echo $clang->gT("No"); ?></option>
+                 </select>
+            <?php } ?>
+
+             </li>
+
+            
+             <li><label for=''><?php echo $clang->gT("Save referrer URL?"); ?></label>
+
+        <?php if ($esrow['active'] == "Y") { ?>
+                 \n
+          <?php  if ($esrow['refurl'] != "Y") {
+                echo $clang->gT("Responses will not have their referring URL logged.");
+            } else {
+                echo $clang->gT("Responses will have their referring URL logged.");
+            } ?>
+                 <font size='1' color='red'>&nbsp;(<?php echo $clang->gT("Cannot be changed"); ?>)"
+                 </font>
+                 <input type='hidden' name='refurl' value='<?php echo $esrow['refurl']; ?>' />
+        <?php } else { ?>
+                 <select name='refurl'>
+                 <option value='Y'
+            <?php if ($esrow['refurl'] == "Y") { ?>
+                  selected='selected'
+            <?php } ?>
+                 ><?php echo $clang->gT("Yes"); ?></option>
+                 <option value='N'
+            <?php if ($esrow['refurl'] != "Y") { ?>
+                  selected='selected'
+            <?php } ?>
+                 ><?php echo $clang->gT("No"); ?></option>
+                 </select>
+            <?php } ?>
+             </li>
+            
+
+            
+             <li><label for=''><?php echo $clang->gT("Enable assessment mode?"); ?></label>
+             <select id='assessments' name='assessments'>
+             <option value='Y'
+        <?php if ($esrow['assessments'] == "Y") { ?>
+              selected='selected'
+        <?php } ?>
+             ><?php echo $clang->gT("Yes"); ?></option>
+            <option value='N'
+        <?php if ($esrow['assessments'] == "N") { ?>
+              selected='selected'
+        <?php } ?>
+         ><?php echo $clang->gT("No"); ?></option>
+        </select></li>
+
+             
+             <li><label for=''><?php echo $clang->gT("Allow editing answers after completion?"); ?></label>
+             <select id='alloweditaftercompletion' name='alloweditaftercompletion' onchange="javascript: if (document.getElementById('private').value == 'Y') {alert('<?php echo $clang->gT("This option can't be set if Anonymous answers are used","js"); ?>'); this.value='N';}">
+             <option value='Y'
+            <?php if ($esrow['alloweditaftercompletion'] == "Y") { ?>
+                 selected='selected'
+            <?php } ?>
+             ><?php echo $clang->gT("Yes"); ?></option>
+            <option value='N'
+            <?php if ($esrow['alloweditaftercompletion'] == "N") { ?>  selected='selected' <?php } ?>
+             ><?php echo $clang->gT("No"); ?></option>
+            </select></li>
+
+      
+         <li><label for='savetimings'><?php echo $clang->gT("Save timings?"); ?></label>
+        <?php if ($esrow['active']=="Y")
+        { ?>
+             \n
+           <?php if ($esrow['savetimings'] != "Y") {  echo $clang->gT("Timings will not be saved.");}
+            else { $clang->gT("Timings will be saved.");} ?>
+             <font size='1' color='red'>&nbsp;(<?php echo $clang->gT("Cannot be changed"); ?>)
+             </font>
+             <input type='hidden' name='savetimings' value='<?php echo $esrow['savetimings']; ?>' />
+		<?php }
+		else
+        { ?>
+			 <select id='savetimings' name='savetimings'>
+			 <option value='Y'
+			<?php if (!isset($esrow['savetimings']) || !$esrow['savetimings'] || $esrow['savetimings'] == "Y") { ?> selected='selected' <?php } ?>
+			 ><?php echo $clang->gT("Yes"); ?></option>
+			<option value='N'
+			<?php if (isset($esrow['savetimings']) && $esrow['savetimings'] == "N") { ?>  selected='selected' <?php } ?>
+			 ><?php echo $clang->gT("No"); ?></option>
+			</select>
+			</li>
+		<?php } ?>
+        
+         <li><label for='allowsave'><?php echo $clang->gT("Participant may save and resume later?"); ?></label>
+         <select id='allowsave' name='allowsave'>
+         <option value='Y'
+        <?php if (!$esrow['allowsave'] || $esrow['allowsave'] == "Y") { ?>
+              selected='selected'
+        <?php } ?>
+             ><?php echo $clang->gT("Yes"); ?></option>
+             <option value='N'
+        <?php if ($esrow['allowsave'] == "N") { ?>
+              selected='selected'
+        <?php } ?>
+         ><?php echo $clang->gT("No"); ?></option>
+        </select></li>
+
+
+        
+        </ul></div>
\ No newline at end of file
diff --git a/application/views/admin/Survey/superview/superPublication_view.php b/application/views/admin/Survey/superview/superPublication_view.php
new file mode 100644
index 00000000000..3da933e3cf4
--- /dev/null
+++ b/application/views/admin/Survey/superview/superPublication_view.php
@@ -0,0 +1,142 @@
+<div id='publication'><ul>
+
+             
+            <li><label for='public'><?php echo $clang->gT("List survey publicly:"); ?></label>
+            <select id='public' name='public'>"
+            <option value='Y' 
+        <?php if (!isset($esrow['listpublic']) || !$esrow['listpublic'] || $esrow['listpublic'] == "Y") { ?>
+              selected='selected'
+        <?php } ?>
+             ><?php echo $clang->gT("Yes"); ?></option>
+            <option value='N'
+        <?php if (isset($esrow['listpublic']) && $esrow['listpublic'] == "N") { ?>
+              selected='selected'
+        <?php } ?>
+             ><?php echo $clang->gT("No"); ?></option>
+            </select>
+            </li>
+
+            
+             <li><label for='allowregister'><?php echo $clang->gT("Allow public registration?"); ?></label>
+            <select id='allowregister' name='allowregister'>
+            <option value='Y'
+        <?php if ($esrow['allowregister'] == "Y") { ?>
+              selected='selected'
+        <?php } ?>
+             ><?php echo $clang->gT("Yes"); ?></option>
+            <option value='N'
+        <?php if ($esrow['allowregister'] != "Y") { ?>
+              selected='selected'
+        <?php } ?>
+             ><?php echo $clang->gT("No"); ?></option>
+            </select></li>
+
+            <!--
+            $dateformatdetails=getDateFormatData($this->session->userdata('dateformat'));
+            $startdate='';
+        if (trim($esrow['startdate']) != '') {
+                $items = array($esrow['startdate'] , "Y-m-d H:i:s");
+                $this->load->library('Date_Time_Converter',$items);
+                $datetimeobj = $this->date_time_converter; //new Date_Time_Converter($esrow['startdate'] , "Y-m-d H:i:s");
+                $startdate=$datetimeobj->convert($dateformatdetails['phpdate'].' H:i');
+            } -->
+
+             <li><label for='startdate'><?php echo $clang->gT("Start date/time:"); ?></label>
+            <input type='text' class='popupdatetime' id='startdate' size='20' name='startdate' value="<?php echo $startdate; ?>" /></li>
+
+            <!--// Expiration date
+            $expires='';
+        if (trim($esrow['expires']) != '') {
+                $items = array($esrow['expires'] , "Y-m-d H:i:s");
+                $this->load->library('Date_Time_Converter',$items);
+                $datetimeobj = $this->date_time_converter; //new Date_Time_Converter($esrow['expires'] , "Y-m-d H:i:s");
+                $expires=$datetimeobj->convert($dateformatdetails['phpdate'].' H:i');
+            } -->
+             <li><label for='expires'><?php echo $clang->gT("Expiry date/time:"); ?></label>
+             <input type='text' class='popupdatetime' id='expires' size='20' name='expires' value="<?php echo $expires; ?>" /></li>
+
+            
+             <li><label for=''><?php echo $clang->gT("Set cookie to prevent repeated participation?"); ?></label>
+            <select name='usecookie'>
+            <option value='Y'
+        <?php if ($esrow['usecookie'] == "Y") { ?>
+              selected='selected'
+        <?php } ?>
+             ><?php echo $clang->gT("Yes"); ?></option>
+            <option value='N'
+        <?php if ($esrow['usecookie'] != "Y") { ?>
+              selected='selected'";
+        <?php } ?>
+             ><?php echo $clang->gT("No"); ?></option>
+             </select>
+             </li>
+
+            
+             <li><label for=''><?php echo $clang->gT("Use CAPTCHA for"); ?>:</label>
+             <select name='usecaptcha'>
+             <option value='A'
+        <?php if ($esrow['usecaptcha'] == "A") { ?>
+              selected='selected'
+        <?php } ?>
+             ><?php echo $clang->gT("Survey Access"); ?> / <?php echo $clang->gT("Registration"); ?> / <?php echo$clang->gT("Save & Load"); ?></option>
+            <option value='B'
+        <?php if ($esrow['usecaptcha'] == "B") { ?>
+              selected='selected'
+        <?php } ?>
+
+             ><?php echo $clang->gT("Survey Access"); ?> / <?php echo $clang->gT("Registration"); ?> / ---------</option>
+            <option value='C'
+        <?php if ($esrow['usecaptcha'] == "C") { ?>
+              selected='selected' 
+        <?php } ?>
+
+             ><?php echo $clang->gT("Survey Access"); ?> / ------------ / <?php echo $clang->gT("Save & Load"); ?></option>
+            <option value='D'
+        <?php if ($esrow['usecaptcha'] == "D") { ?>
+              selected='selected'
+        <?php } ?>
+
+             >------------- / <?php echo $clang->gT("Registration"); ?> / <?php echo $clang->gT("Save & Load"); ?></option>
+            <option value='X'
+
+        <?php if ($esrow['usecaptcha'] == "X") { ?>
+              selected='selected'
+        <?php } ?>
+
+             ><?php echo $clang->gT("Survey Access"); ?> / ------------ / ---------</option>
+            <option value='R'
+        <?php if ($esrow['usecaptcha'] == "R") { ?>
+              selected='selected'
+        <?php } ?>
+             >------------- / <?php echo $clang->gT("Registration"); ?> / ---------</option>
+            <option value='S'
+        <?php if ($esrow['usecaptcha'] == "S") { ?>
+              selected='selected'
+        <?php } ?>
+             >------------- / ------------ / <?php echo $clang->gT("Save & Load"); ?></option>
+            <option value='N'
+        <?php if ($esrow['usecaptcha'] == "N") { ?>
+              selected='selected'";
+        <?php } ?>
+             >------------- / ------------ / ---------</option>
+            </select></li>
+
+            
+             <li><label for=''><?php echo $clang->gT("Use HTML format for token emails?"); ?></label>
+            <select name='htmlemail' onchange="alert('<?php echo $clang->gT("If you switch email mode, you'll have to review your email templates to fit the new format","js"); ?>');">
+            <option value='Y'
+        <?php if ($esrow['htmlemail'] == "Y") { ?>
+              selected='selected'
+        <?php } ?>
+             ><?php echo $clang->gT("Yes"); ?></option>
+            <option value='N'
+        <?php if ($esrow['htmlemail'] == "N") { ?>
+              selected='selected'
+        <?php } ?>
+
+             ><?php echo $clang->gT("No"); ?></option>
+            </select></li>
+
+            
+             </ul></div>
+        
\ No newline at end of file
diff --git a/application/views/admin/Survey/superview/superResourceManagement.php b/application/views/admin/Survey/superview/superResourceManagement.php
new file mode 100644
index 00000000000..b180b295005
--- /dev/null
+++ b/application/views/admin/Survey/superview/superResourceManagement.php
@@ -0,0 +1,17 @@
+<div id='resources'>
+            <form enctype='multipart/form-data'  class='form30' id='importsurveyresources' name='importsurveyresources' action='someaction' method='post' onsubmit='return validatefilename(this,"<?php echo $clang->gT('Please select a file to import!','js'); ?>");'>
+            <input type='hidden' name='sid' value='<?php echo $surveyid; ?>' />
+            <input type='hidden' name='action' value='importsurveyresources' />
+            <ul>
+            <li><label>&nbsp;</label>
+            <input type='button' onclick='window.open("<?php echo $sCKEditorURL; ?>/editor/filemanager/browser/default/browser.html?Connector=../../connectors/php/connector.php", "_blank")' value="<?php echo $clang->gT("Browse Uploaded Resources"); ?>" <?php echo $disabledIfNoResources; ?> /></li>
+            <li><label>&nbsp;</label>
+            <input type='button' onclick='window.open("<?php echo $scriptname; ?>?action=exportsurvresources&amp;sid=<?php echo $surveyid; ?>", "_blank")' value="<?php echo $clang->gT("Export Resources As ZIP Archive"); ?>" <?php echo $disabledIfNoResources; ?> /></li>
+            <li><label for='the_file'><?php echo $clang->gT("Select ZIP File:"); ?></label>
+            <input id='the_file' name='the_file' type='file' size='50' /></li>
+            <li><label>&nbsp;</label>
+            <input type='button' value='<?php echo $clang->gT("Import Resources ZIP Archive"); ?>' <?php echo $ZIPimportAction; ?> /></li>
+            </ul></form>
+
+        
+</div>
\ No newline at end of file
diff --git a/application/views/admin/Survey/superview/superTokens_view.php b/application/views/admin/Survey/superview/superTokens_view.php
new file mode 100644
index 00000000000..fbe4cf0c9ed
--- /dev/null
+++ b/application/views/admin/Survey/superview/superTokens_view.php
@@ -0,0 +1,23 @@
+<div id='tokens'><ul>
+        
+         <li><label for=''><?php echo $clang->gT("Enable token-based response persistence?"); ?></label>
+         <select id='tokenanswerspersistence' name='tokenanswerspersistence' onchange="javascript: if (document.getElementById('anonymized').value == 'Y') {alert('<?php echo $clang->gT("This option can't be set if the `Anonymized responses` option is active.","js"); ?>'); this.value='N';}">
+         <option value='Y'
+        <?php if ($esrow['tokenanswerspersistence'] == "Y") { ?>
+              selected='selected'
+        <?php } ?>
+         ><?php echo $clang->gT("Yes"); ?></option>
+         <option value='N'
+        <?php if ($esrow['tokenanswerspersistence'] == "N") { ?>
+              selected='selected'
+        <?php } ?>
+         ><?php echo $clang->gT("No"); ?></option>
+        </select></li>
+
+        
+         <li><label for='tokenlength'><?php echo $clang->gT("Set token length to:"); ?></label>
+         <input type='text' value="<?php echo $esrow['tokenlength']; ?>" name='tokenlength' id='tokenlength' size='12' maxlength='2' onkeypress="return goodchars(event,'0123456789')" />
+         </li>
+
+        
+         </ul></div>
\ No newline at end of file