diff --git a/application/controllers/admin/labels.php b/application/controllers/admin/labels.php
index 523217b81b2..4e01e1e65cd 100644
--- a/application/controllers/admin/labels.php
+++ b/application/controllers/admin/labels.php
@@ -335,14 +335,21 @@ public function process()
             $lid = returnglobal('lid');
 
             if ($action == "updateset")
+            {
                 updateset($lid);
+                Yii::app()->session['flashmessage'] = Yii::app()->lang->gT("Label set properties sucessfully updated.");
+            }
             if ($action == "insertlabelset")
                 $lid = insertlabelset();
             if (($action == "modlabelsetanswers") || ($action == "ajaxmodlabelsetanswers"))
                 modlabelsetanswers($lid);
             if ($action == "deletelabelset")
                 if (deletelabelset($lid))
+                {
+                    Yii::app()->session['flashmessage'] = Yii::app()->lang->gT("Label set sucessfully deleted.");
                     $lid = 0;
+                }
+
 
             if ($lid)
                 $this->getController()->redirect($this->getController()->createUrl("admin/labels/view/lid/" . $lid));
diff --git a/application/controllers/admin/participantsaction.php b/application/controllers/admin/participantsaction.php
index 4545a6ca5a0..63817594a45 100644
--- a/application/controllers/admin/participantsaction.php
+++ b/application/controllers/admin/participantsaction.php
@@ -243,7 +243,7 @@ function attributeControl()
 
     /**
      * Sends the attributes info using JSON encoding
-     * Called after the attribute control grid is loaded
+     * Called after the Attribute management grid is loaded
      * @return JSON encoded string containg sharing information
      */
     function getAttributeInfo_json()
diff --git a/application/controllers/admin/templates.php b/application/controllers/admin/templates.php
index 26116d76390..5614b642824 100644
--- a/application/controllers/admin/templates.php
+++ b/application/controllers/admin/templates.php
@@ -926,7 +926,7 @@ protected function _initialise($templatename, $screenname, $editfile, $showsumma
                     $files[] = array("name" => $qs);
 
                 $myoutput[] = templatereplace("$templatedir/startpage.pstpl", array(), $aData);
-                $myoutput[] = templatereplace("$templatedir/clear.pstpl", array(), $aData);
+                $myoutput[] = templatereplace("$templatedir/clearall.pstpl", array(), $aData);
                 $myoutput[] = templatereplace("$templatedir/endpage.pstpl", array(), $aData);
                 $myoutput[] = "\n";
                 break;
diff --git a/application/models/ParticipantAttributeNames.php b/application/models/ParticipantAttributeNames.php
index ad3b0fa12db..6d50b8b18ed 100644
--- a/application/models/ParticipantAttributeNames.php
+++ b/application/models/ParticipantAttributeNames.php
@@ -110,7 +110,12 @@ function getVisibleAttributes()
 
     function getAllAttributes()
     {
-        return Yii::app()->db->createCommand()->select('{{participant_attribute_names}}.*,{{participant_attribute_names}}_lang.*')->from('{{participant_attribute_names}}')->order('{{participant_attribute_names}}.attribute_id', 'desc')->join('{{participant_attribute_names}}_lang', '{{participant_attribute_names}}_lang.attribute_id = {{participant_attribute_names}}.attribute_id')->where('{{participant_attribute_names}}_lang.lang = "'.Yii::app()->session['adminlang'].'"')->queryAll();
+        return Yii::app()->db->createCommand()->select('{{participant_attribute_names}}.*,{{participant_attribute_names}}_lang.*')
+                                              ->from('{{participant_attribute_names}}')
+                                              ->order('{{participant_attribute_names}}.attribute_id', 'desc')
+                                              ->join('{{participant_attribute_names}}_lang', '{{participant_attribute_names}}_lang.attribute_id = {{participant_attribute_names}}.attribute_id')
+                                              ->where('{{participant_attribute_names}}_lang.lang = "'.Yii::app()->session['adminlang'].'"')
+                                              ->queryAll();
     }
 
     function getAllAttributesValues()
@@ -176,7 +181,7 @@ function storeAttribute($data)
         Yii::app()->db->createCommand()->insert('{{participant_attribute_names}}',$insertnames);
         $attribute_id = Yii::app()->db->getLastInsertID();
         $insertnameslang = array('attribute_id' => intval($attribute_id),
-                                 'attribute_name'=> Yii::app()->db->quoteValue($data['attribute_name']),
+                                 'attribute_name'=> $data['attribute_name'],
                                  'lang' => Yii::app()->session['adminlang']);
         Yii::app()->db->createCommand()->insert('{{participant_attribute_names_lang}}',$insertnameslang);
 
diff --git a/application/views/admin/participants/attributeControl_view.php b/application/views/admin/participants/attributeControl_view.php
index 64b1a26560a..eb385d4d4bc 100644
--- a/application/views/admin/participants/attributeControl_view.php
+++ b/application/views/admin/participants/attributeControl_view.php
@@ -7,7 +7,7 @@
     var attributeEditUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/viewAttribute/aid"); ?>";
 </script>
 
-<div class='header ui-widget-header'><strong><?php $clang->eT("Attribute control"); ?></strong></div>
+<div class='header ui-widget-header'><strong><?php $clang->eT("Attribute management"); ?></strong></div>
 
 <br/>
 
diff --git a/application/views/admin/participants/participantsPanel_view.php b/application/views/admin/participants/participantsPanel_view.php
index d1cad682afe..41f0f6a3d91 100644
--- a/application/views/admin/participants/participantsPanel_view.php
+++ b/application/views/admin/participants/participantsPanel_view.php
@@ -53,9 +53,9 @@
         'style' => 'margin-left:5px',
         'style' => 'margin-right:1px');
 
-    $attributecontrol = array('src' => Yii::app()->getConfig('imageurl') . '/tag_green.png',
-        'alt' => 'Attribute control',
-        'title' => 'Attribute control',
+    $attributecontrol = array('src' => Yii::app()->getConfig('imageurl') . '/tag.png',
+        'alt' => $clang->gT("Attribute management"),
+        'title' => $clang->gT("Attribute management"),
         'width' => 50,
         'height' => 35,
         'style' => 'margin-left:0px',
diff --git a/images/handle-left.png b/images/handle-left.png
deleted file mode 100644
index 489045041d8..00000000000
Binary files a/images/handle-left.png and /dev/null differ
diff --git a/images/handle-right.png b/images/handle-right.png
deleted file mode 100644
index 3052c01d6a8..00000000000
Binary files a/images/handle-right.png and /dev/null differ
diff --git a/images/share.png b/images/share.png
index e4dd12e84d2..a547384d13a 100644
Binary files a/images/share.png and b/images/share.png differ
diff --git a/images/tag.png b/images/tag.png
new file mode 100644
index 00000000000..443b8389895
Binary files /dev/null and b/images/tag.png differ
diff --git a/images/tag_green.png b/images/tag_green.png
deleted file mode 100644
index 4c6c4b9f528..00000000000
Binary files a/images/tag_green.png and /dev/null differ