diff --git a/application/controllers/admin/SurveysGroupsController.php b/application/controllers/admin/SurveysGroupsController.php
index 0f5bdd2194e..6602ad7db76 100644
--- a/application/controllers/admin/SurveysGroupsController.php
+++ b/application/controllers/admin/SurveysGroupsController.php
@@ -64,29 +64,23 @@ public function create()
      */
     public function update($id)
     {
-        $model=$this->loadModel($id);
+        $model = $this->loadModel($id);
 
-        // Uncomment the following line if AJAX validation is needed
-        // $this->performAjaxValidation($model);
-
-        if(isset($_POST['SurveysGroups']))
-        {
+        if(isset($_POST['SurveysGroups'])){
             $model->attributes=$_POST['SurveysGroups'];
             if($model->save())
                 $this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/listsurveys').'#surveygroups');
         }
+
         $aData['model'] = $model;
         $oSurveySearch = new Survey('search');
         $oSurveySearch->gsid = $model->gsid;
         $aData['oSurveySearch'] = $oSurveySearch;
 
-        $oTemplateOptions = TemplateConfiguration::getInstanceFromSurveyGroup($model->gsid);
-
-        $oTemplateOptionsReplacement = TemplateConfiguration::model()->findByPk($oTemplateOptions->id);
-        $templateOptionPage           = $oTemplateOptionsReplacement->optionPage;
 
+        $oTemplateOptions           = new TemplateConfiguration();
+        $oTemplateOptions->scenario = 'surveygroup';
         $aData['templateOptionsModel'] = $oTemplateOptions;
-        $aData['templateOptionPage'] = $templateOptionPage;
 
         $this->_renderWrappedTemplate('surveysgroups', 'update', $aData);
     }
diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
index 254a8db454f..d8694b22e18 100644
--- a/application/models/TemplateConfiguration.php
+++ b/application/models/TemplateConfiguration.php
@@ -429,7 +429,13 @@ public function getTypeIcon()
     public function getButtons()
     {
         $sEditorUrl    = Yii::app()->getController()->createUrl('admin/templates/sa/view', array("templatename"=>$this->template_name));
-        $sOptionUrl    = Yii::app()->getController()->createUrl('admin/templateoptions/sa/update', array("id"=>$this->id));
+        if (App()->getController()->action->id == "surveysgroups"){
+            $gisd = Yii::app()->request->getQuery('id', null);
+            $sOptionUrl    = Yii::app()->getController()->createUrl('admin/templateoptions/sa/update', array("id"=>$this->id, "gsid"=>$gisd));
+        }else{
+            $sOptionUrl    = Yii::app()->getController()->createUrl('admin/templateoptions/sa/update', array("id"=>$this->id));
+        }
+
         $sUninstallUrl = Yii::app()->getController()->createUrl('admin/templateoptions/sa/uninstall/', array("templatename"=>$this->template_name));
 
         $sEditorLink = "<a
@@ -463,12 +469,20 @@ class='btn btn-default btn-danger'>
             </a>";
 
 
-        $sButtons = $sEditorLink.'<br><br>'.$OptionLink;
+        if (App()->getController()->action->id == "surveysgroups"){
+            $sButtons = $OptionLink;
+        }else{
+            $sButtons = $sEditorLink.'<br><br>'.$OptionLink;
 
-        if (!$this->isStandard){
-            $sButtons .= '<br><br>'.$sUninstallLink ;
+            if (!$this->isStandard){
+                $sButtons .= '<br><br>'.$sUninstallLink ;
+            }
         }
 
+
+
+
+
         return $sButtons;
     }
 
diff --git a/application/views/admin/surveysgroups/update.php b/application/views/admin/surveysgroups/update.php
index e0076826cc0..ffd48963bf3 100644
--- a/application/views/admin/surveysgroups/update.php
+++ b/application/views/admin/surveysgroups/update.php
@@ -17,7 +17,7 @@
                 )
             )
         )); ?>
-    
+
     <div class="row">
         <ul class="nav nav-tabs" id="surveygrouptabsystem" role="tablist">
             <li class="active"><a href="#surveysInThisGroup"><?php eT('Surveys in this group'); ?></a></li>
@@ -40,7 +40,12 @@
                 <?php $this->renderPartial('./surveysgroups/_form', array('model'=>$model)); ?>
             </div>
             <div id="templateSettingsFortThisGroup" class="tab-pane">
-                <?php $this->renderPartial('./templateoptions/update', array('model'=>$templateOptionsModel, 'templateOptionPage'=>$templateOptionPage)); ?>
+                <?php
+                    if (is_a($templateOptionsModel, 'TemplateConfiguration')){
+                    //    $this->renderPartial('./templateoptions/update', array('model'=>$templateOptionsModel, 'templateOptionPage'=>$templateOptionPage));
+                        $this->renderPartial('./templateoptions/index', array('model'=>$templateOptionsModel, 'bFromSurveyGroup'=>true));
+                    }
+                ?>
             </div>
         </div>
     </div>
diff --git a/application/views/admin/templateoptions/index.php b/application/views/admin/templateoptions/index.php
index 53ab6b9dfbd..3891558fa10 100644
--- a/application/views/admin/templateoptions/index.php
+++ b/application/views/admin/templateoptions/index.php
@@ -5,18 +5,30 @@
 // TODO: rename to template_list.php
 
 ?>
+
+<?php
+    //$bFromSurveyGroup = (isset($bFromSurveyGroup))?$bFromSurveyGroup:false;
+    $bFromSurveyGroup = ($model->scenario == 'surveygroup')?true:false;
+?>
+
 <div class="col-lg-12 list-surveys">
 
-    <?php $this->renderPartial('super/fullpagebar_view', array(
-        'fullpagebar' => array(
-            'returnbutton'=>array(
-                'url'=>'index',
-                'text'=>gT('Close'),
-            ),
-        )
-    )); ?>
+    <?php
+        if (!$bFromSurveyGroup){
+            $this->renderPartial('super/fullpagebar_view', array(
+            'fullpagebar' => array(
+                'returnbutton'=>array(
+                    'url'=>'index',
+                    'text'=>gT('Close'),
+                    ),
+                )
+            ));
+            echo '<h3>'.gT('Installed templates:').'</h3>';
+        }
+
+
+    ?>
 
-    <h3><?php eT('Installed templates:'); ?></h3>
     <div class="row">
         <div class="col-sm-12 content-right">
 
@@ -75,37 +87,37 @@
         </div>
     </div>
 
-    <?php if (count($model->templatesWithNoDb) > 0):?>
-    <h3><?php eT('Available Templates:'); ?></h3>
-    <div class="row">
-        <div class="col-sm-12 content-right">
+    <?php if (count($model->templatesWithNoDb) > 0 && !$bFromSurveyGroup):?>
+        <h3><?php eT('Available Templates:'); ?></h3>
+        <div class="row">
+            <div class="col-sm-12 content-right">
 
-            <div id="templates_no_db" class="grid-view">
-                <table class="items table">
-                    <thead>
-                        <tr>
-                            <th><?php eT('Preview'); ?></th><th><?php eT('Folder'); ?></th><th><?php eT('Description'); ?></th><th><?php eT('type'); ?></th><th><?php eT('extends'); ?></th><th></th>
-                        </tr>
-                    </thead>
-
-                    <tbody>
-                        <?php foreach ($model->templatesWithNoDb as $oTemplate):?>
-                            <?php // echo $oTemplate; ?>
-                            <tr class="odd">
-                                <td class="col-md-1"><?php echo $oTemplate->preview; ?></td>
-                                <td class="col-md-2"><?php echo $oTemplate->sTemplateName; ?></td>
-                                <td class="col-md-3"><?php echo $oTemplate->config->metadatas->description; ?></td>
-                                <td class="col-md-2"><?php eT('XML template');?></td>
-                                <td class="col-md-2"><?php echo $oTemplate->config->metadatas->extends; ?></td>
-                                <td class="col-md-1"><?php echo $oTemplate->buttons; ?></td>
+                <div id="templates_no_db" class="grid-view">
+                    <table class="items table">
+                        <thead>
+                            <tr>
+                                <th><?php eT('Preview'); ?></th><th><?php eT('Folder'); ?></th><th><?php eT('Description'); ?></th><th><?php eT('type'); ?></th><th><?php eT('extends'); ?></th><th></th>
                             </tr>
-                        <?php endforeach;?>
-                    </tbody>
-                </table>
+                        </thead>
+
+                        <tbody>
+                            <?php foreach ($model->templatesWithNoDb as $oTemplate):?>
+                                <?php // echo $oTemplate; ?>
+                                <tr class="odd">
+                                    <td class="col-md-1"><?php echo $oTemplate->preview; ?></td>
+                                    <td class="col-md-2"><?php echo $oTemplate->sTemplateName; ?></td>
+                                    <td class="col-md-3"><?php echo $oTemplate->config->metadatas->description; ?></td>
+                                    <td class="col-md-2"><?php eT('XML template');?></td>
+                                    <td class="col-md-2"><?php echo $oTemplate->config->metadatas->extends; ?></td>
+                                    <td class="col-md-1"><?php echo $oTemplate->buttons; ?></td>
+                                </tr>
+                            <?php endforeach;?>
+                        </tbody>
+                    </table>
+
+                </div>
 
             </div>
-
         </div>
-    </div>
-<?php endif;?>
+    <?php endif;?>
 </div>
diff --git a/application/views/admin/templateoptions/update.php b/application/views/admin/templateoptions/update.php
index 568ff6d7526..763978f57f2 100644
--- a/application/views/admin/templateoptions/update.php
+++ b/application/views/admin/templateoptions/update.php
@@ -6,7 +6,6 @@
 
 
 
-
 <div class="container">
     <div class="row h1"><?php eT('Update TemplateOptions for '); echo '<em>' . $model->template_name . '</em>'; ?></div>
     <!-- Using bootstrap tabs to differ between just hte options and advanced direct settings -->
@@ -53,19 +52,19 @@
                 ?>
             </div>
             <div role="tabpanel" class="tab-pane" id="advanced">
-            <?php 
+            <?php
                 $actionBaseUrl = 'admin/templateoptions/sa/update/';
                 $actionUrlArray = array('id' => $model->id);
-                
+
                 if($model->sid) {
-                    unset($actionUrlArray['id']); 
-                    $actionUrlArray['sid'] = $model->sid; 
+                    unset($actionUrlArray['id']);
+                    $actionUrlArray['sid'] = $model->sid;
                     $actionUrlArray['surveyd'] = $model->sid;
                     $actionUrlArray['gsid'] = $model->gsid;
                     $actionBaseUrl = 'admin/templateoptions/sa/updatesurvey/';
                     }
                 if($model->gsid) {
-                    unset($actionUrlArray['id']); 
+                    unset($actionUrlArray['id']);
                     $actionBaseUrl = 'admin/templateoptions/sa/updatesurveygroup/';
                     $actionUrlArray['gsid'] = $model->gsid;
                 }
@@ -153,7 +152,7 @@
     if($('.action_update_options_string_form').length > 0){
         var optionObject = {};
         optionObject = JSON.parse($('#TemplateConfiguration_options').val());
-        
+
         $('.action_update_options_string_form').find('.selector_option_value_field').each(function(i,item){
             var itemValue = optionObject[$(item).attr('name')];
             $(item).val(itemValue);