diff --git a/application/extensions/SettingsWidget/SettingsWidget.php b/application/extensions/SettingsWidget/SettingsWidget.php
index 2014c0eb5ae..1d61d748d42 100644
--- a/application/extensions/SettingsWidget/SettingsWidget.php
+++ b/application/extensions/SettingsWidget/SettingsWidget.php
@@ -176,7 +176,7 @@ public function fixMetaData($name,$metaData){
                 ),
                 'help'=> null,
                 'controlOptions'=> array(
-                    'class' => 'default col-sm-7'
+                    'class' => "default"
                 ),
                 'localized'=>false,
             );
@@ -184,6 +184,11 @@ public function fixMetaData($name,$metaData){
 
             // col-sm-X is here for bootsrap 3 when ready
             $metaData['labelOptions']['class'].=" control-label col-sm-5";
+            // Set the witdth of control-option according to existence of label
+            if(!isset($metaData['label']))
+                $metaData['controlOptions']['class']=" col-sm-12";
+            else
+                $metaData['controlOptions']['class']=" col-sm-7";
             $metaData['controlOptions']['class'].=" controls";
 
             if (is_string($metaData['class']))
@@ -228,7 +233,7 @@ public function fixMetaData($name,$metaData){
         public function renderLabel($name,$metaData){
             if(!isset($metaData['label']))
                 return "";
-            if(!in_array($metaData['type'],array('list','boolean')))
+            if(!in_array($metaData['type'],array('list','boolean','logo','link','info')))
                 return CHtml::label($metaData['label'], $name, $metaData['labelOptions']);
             else
                 return CHtml::tag('div',$metaData['labelOptions'], $metaData['label']);
@@ -437,13 +442,10 @@ public function renderLink($name, array $metaData, $form = null)
         {
             $out = '';
             $id = $name;
-            if (isset($metaData['label']))
-            {
-                $out .= CHtml::label($metaData['label'], $id);
-            }
 
             $metaData['class'][] = 'btn';
-            $out .= CHtml::link($metaData['label'], $metaData['link'], array(
+            $metaData['text']=isset($metaData['text'])?$metaData['text']:$metaData['label'];
+            $out .= CHtml::link($metaData['text'], $metaData['link'], array(
                 'id' => $id,
                 'style' => $metaData['style'],
                 'class' => implode(' ', $metaData['class'])
diff --git a/application/extensions/SettingsWidget/assets/settingswidget.css b/application/extensions/SettingsWidget/assets/settingswidget.css
index 48c4f852457..e0da0b85f89 100644
--- a/application/extensions/SettingsWidget/assets/settingswidget.css
+++ b/application/extensions/SettingsWidget/assets/settingswidget.css
@@ -46,13 +46,8 @@ width: 75%;
 .form-horizontal .col-sm-8 {
 width: 66.66666667%;
 }
-
-.settingswidget .setting > label {
-    text-align: right;
-    padding-right: 10px;
-    width: 40%;
-    display: inline-block;
-    vertical-align: top;
+.form-horizontal .col-sm-7 {
+width: 58.33333333%;
 }
 .form-horizontal .col-sm-6 {
 width: 50%;
@@ -72,6 +67,10 @@ width: 16.66666667%;
 .form-horizontal .col-sm-1 {
 width: 8.33333333%;
 }
+.settingswidget .setting > .control-label {
+    text-align: right;
+    vertical-align: top;
+}
 .form-horizontal input[type="text"],.form-horizontal input[type="password"]{
     height:2.4em; /*bootstrap 3: 34px for 14px*/
 }